My failed attempt to rebalance Alchemy. The major changes where:

diff -udprBb --exclude=*.o --exclude=*.raw p/lib/core/s_aux.lua 1/lib/core/s_aux.lua
--- p/lib/core/s_aux.lua        Wed Mar  5 20:00:24 2003
+++ 1/lib/core/s_aux.lua        Thu Apr 17 14:23:27 2003
@@ -668,6 +668,11 @@ function get_stick_charges(spl)
         return __tmp_spells[spl].stick.charge[1] + randint(__tmp_spells[spl].stick.charge[2]);
 end
 
+-- Get the maximum number of charges
+function get_stick_max_charges(spl)
+        return __tmp_spells[spl].stick.charge[1] + __tmp_spells[spl].stick.charge[2];
+end
+
 -- Get activation desc
 function get_activation_desc(spl)
         local turns
diff -udprBb --exclude=*.o --exclude=*.raw p/lib/edit/al_info.txt 1/lib/edit/al_info.txt
--- p/lib/edit/al_info.txt      Thu Jan 23 20:00:37 2003
+++ 1/lib/edit/al_info.txt      Thu Apr 24 16:21:49 2003
@@ -81,7 +81,7 @@ I:80:1:2:LITE
 
 #SV_FOOD_PARANOIA                 2
 I:80:2:1:LIFE
-I:80:2:4:KNOWLEDGE
+I:80:2:8:MANA
 I:80:2:4:CONFUSION
 
 #SV_FOOD_CONFUSION                3
@@ -91,8 +91,7 @@ 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
+I:80:4:1:MAGIC
 
 #SV_FOOD_PARALYSIS                5
 I:80:5:1:LIFE
@@ -104,8 +103,8 @@ I:80:6:4:POISON
 I:80:6:4:FORCE
 
 #SV_FOOD_SICKNESS                 7
-I:80:7:8:LIFE
-I:80:7:1:POISON
+I:80:7:1:LIFE
+I:80:7:8:POISON
 
 #SV_FOOD_STUPIDITY                8
 I:80:8:1:LIFE
@@ -114,18 +113,15 @@ 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:MANA
 I:80:9:4:KNOWLEDGE
 
 #SV_FOOD_UNHEALTH                10
-I:80:10:8:LIFE
-I:80:10:1:FORCE
-I:80:10:1:POISON
+I:80:10:1:LIFE
+I:80:10:8: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
@@ -140,6 +136,7 @@ I:80:13:2:DARKNESS
 #SV_FOOD_CURE_PARANOIA           14
 I:80:14:1:LIFE
 I:80:14:1:TIME
+I:80:14:8:MANA
 
 #SV_FOOD_CURE_CONFUSION          15
 I:80:15:1:LIFE
@@ -179,485 +176,674 @@ I:80:19:4:TIME
 
 #***************************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.
+#A:Group:Sub-Group:level:xp
 #F:object flag to be set
 #D:Description of flag
-#x:Description of activation (instead of description of flag, see below)
+# Group of flags (hard coded, determines which screen they appear on)
+# Sub-Group (determines which are bunched together for XP calculations)
+# level Minimum skill level to be able to manipulate this flags
+# xp required experience
+# Note: 'object flag to be set' is the flag name from a_info.txt, 
+
+#O:tval:sval:pval:pval?
 #d:Description of required item
 #p:Description of required item (plural, optional. Illegal if pval != 1)
+#f:Monster Race flags
+# Optional lines: describes the item the alchemist must use up to set this flag
+#  tval is required, sval=-1 for don't care
+#  pval is the MINIMUM pval
+#  pval? is either 0 or 1, set to 1 if it's a pval-dependant flag.
+#  Note:for tval=TV_CORPSE, sval=corpse type, pval=monster idx,
+#  pval can = 0 for any corpse, or for the f: line
+#       'monster_race_flag' is any flag from r_info.txt, seperated be a space.
+
+#x:Description of activation (instead of description of flag, see below)
 #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
+#
+#These are some flags that, for one reason or another, aren't included.
+#F:FAST_CAST
+#F:CAPACITY
+#F:CHARGING
+#F:CHEAPNESS
+#F:FOUNTIAN
+#F:ANTIMAGIC_50
+#F:ANTIMAGIC_30
+#F:ANTIMAGIC_20
+#F:ANTIMAGIC_10
+#F:EASY_USE
+#F:ACTIVATE_NO_WEILD
+#Clones Monsters
+#F:CLONE
+#Sensitive to fire
+#F:SENS_FIRE
 
+#Revised: added the following flags:
+#MANA, SPELL
+#BLESSED, NEVER_BLOW, RES_MORGUL
+#IM_NETHER
+#SPELL_CONTAIN, CLIMB, MAGIC_BREATH, WATER_BREATH
+#DRAIN_MANA
 
-A:1:45:24:1:1:40:5000
+
+A:1:1:40:5000
+O:45:24:1:1
 F:STR
 D:Add to Strength
 d:Ring of Strength
 p:Rings of Strength
 
-A:1:45:25:1:1:43:5000
+A:1:1:43:5000
+O:45:25:1:1
 F:INT
 D:Add to Intelligence
 d:Ring of Intelligence
 p:Rings of Intelligence
 
-A:1:40:28:1:1:46:5000
+A:1:1:46:5000
+O:40:28:1:1
 F:WIS
 D:Add to Wisdom
 d:Amulet of Wisdom
 p:Amulets of Wisdom
 
-A:1:45:26:1:1:46:5000
+A:1:1:46:5000
+O:45:26:1:1
 F:DEX
 D:Add to Dexterity
 d:Ring of Dexterity
 p:Rings of Dexterity
 
-A:1:45:27:1:1:42:5000
+A:1:1:42:5000
+O:45:27:1:1
 F:CON
 D:Add to Constitution
 d:Ring of Constitution
 p:Rings of Constitution
 
-A:1:40:2:0:1:30:5000
+A:1:1:30:5000
+O:40:2:0:1
 F:CHR
 D:Add to Charisma
 d:Amulet of Adornment
 p:Amulets of Adornment
 
-A:1:45:10:0:0:32:1000
+A:1:6:32:1000
+O:45:10:0:0
 F:SUST_STR
 D:Sustain Strength
 d:Ring of Sustain Strength
 
-A:1:45:11:0:0:34:1000
+A:1:6:34:1000
+O:45:11:0:0
 F:SUST_INT
 D:Sustain Intelligence
 d:Ring of Sustain Intelligence
 
-A:1:45:12:0:0:28:1000
+A:1:6:28:1000
+O:45:12:0:0
 F:SUST_WIS
 D:Sustain Wisdom
 d:Ring of Sustain Wisdom
 
-A:1:45:14:0:0:36:1000
+A:1:6:36:1000
+O:45:14:0:0
 F:SUST_DEX
 D:Sustain Dexterity
 d:Ring of Sustain Dexterity
 
-A:1:45:13:0:0:36:1000
+A:1:6:36:1000
+O:45:13:0:0
 F:SUST_CON
 D:Sustain Constitution
 d:Ring of Sustain Constitution
 
-A:1:45:15:0:0:25:1000
+A:1:6:25:1000
+O:45:15:0:0
 F:SUST_CHR
 D:Sustain Charisma
 d:Ring of Sustain Charisma
 
-A:1:45:31:1:1:40:50000
+A:1:7:40:50000
+O:45:31:1:1
 F:SPEED
 D:Speed
 d:Ring of Speed
 p:Rings of Speed
 
-A:1:45:49:1:1:38:150000
+A:1:7:38:150000
+O:45:49:1:1
 F:BLOWS
 D:Extra Attacks
 d:Ring of Extra Attacks
 p:Rings of Extra Attacks
 
-A:1:30:2:0:1:32:5000
+A:1:8:32:5000
+O:30:2:0:1
 F:STEALTH
 D:Stealthy
 d:Left Insole from an Used Soft Boot
 p:Left Insoles from Used Soft Boots
 
-A:1:36:1:0:1:29:2000
+A:1:8:29:2000
+O:36:1:0:1
 F:SEARCH
 D:Adds to Searching
 d:Filthy Rag
 p:Filthy Rags
 
-A:1:39:1:0:1:6:1000
+A:1:8:6:1000
+O:39:1:0:1
 F:INFRA
 D:Helps Infravision
 d:Brass Lantern
 p:Brass Lanterns
 
-A:1:9:-1:5:1:30:1000
+A:1:8:30:1000
+O:9:-1:5:1
 F:LUCK
 D:Lucky
 d:Rabbit's Left Forefoot
 p:Rabbit's Left Forefeet
 
-A:1:20:4:0:1:25:30000
+A:1:8:25:30000
+O:20:4:0:1
 F:TUNNEL
 D:Aids in digging
 d:Pick
 p:Picks
 
-A:1:9:1:0:1:30:5000
+A:1:7:30:50000
+O:9:1:0:1
 F:LIFE
 f:TROLL
 D:Multiplies Life
 d:Troll's Heart
 p:Troll's Hearts
 
-A:2:71:8:0:0:20:15000
+A:1:7:45:50000
+O:9:1:449:1
+F:MANA
+D:Multiply Mana
+d:The hand of a mage
+p:Mages hands
+
+A:1:7:45:50000
+O:9:1:638:1
+F:SPELL
+D:Add to spell power
+d:the brain of a sorcerer
+p:Sorcerer's Brains
+
+A:2:2:20:15000
+O:71:8:0:0
 F:INVIS
 D:Invisibility
 d:Potion of Invisibility
 
-A:2:71:8:0:0:20:4000
+A:2:2:20:4000
+O:71:8:0:0
 F:SEE_INVIS
 D:See Invisible
 d:Potion of Invisibility
 
-A:2:5:0:0:0:20:30000
+A:2:2:20:30000
+O:5:0:0:0
 F:FREE_ACT
 D:Free Action
 d:Iron Spike
 
-A:2:34:5:0:0:38:90000
+A:2:2:38:90000
+O:34:5:0:0
 F:REFLECT
 D:Reflection
 d:Large Metal Shield
 
-A:2:9:1:644:0:20:30000
+A:2:2:20:30000
+O:9:1:644:0
 F:SH_FIRE
 D:Aura of Fire
 d:Lungs from an Ancient Red Dragon
 
-A:2:9:1:601:0:25:30000
+A:2:2:25:30000
+O:9:1:601:0
 F:SH_ELEC
 D:Aura of Lightning
 d:Lungs from an Ancient Blue Dragon
 
-A:2:39:2:0:0:8:1000
+A:2:2:8:1000
+O:39:2:0:0
 F:LITE1
 D:Light
 d:Everburning Torch
 
-A:2:39:3:0:0:20:10000
+A:2:2:20:10000
+O:39:3:0:0
 F:LITE2
 D:Bright Light
 d:Dwarven Lantern
 
-A:2:39:4:0:0:40:100000
+A:2:2:40:100000
+O:39:4:0:0
 F:LITE3
 D:Sunlight
 d:Feanorian Lamp
 
-A:2:38:-1:0:0:40:200000
+A:2:2:40:200000
+O:38:-1:0:0
 F:FLY
 D:Flight
 d:Suit of Dragon Armour (any colour)
 
-A:2:9:-1:862:0:50:10000000
+A:2:2:50:10000000
+O:9:-1:0:0
 F:AUTO_ID
 D:Automatically IDs
-d:Morgoth's Testicles
+d:Unique summoner of powerful dragons
+f:S_HI_DRAGON UNIQUE
 
-A:2:40:14:0:0:29:2000
+A:2:2:29:2000
+O:40:14:0:0
 F:NO_TELE
 D:Anti-Teleportation
 d:Teleport Inhibiting Amulet
 
-A:2:40:13:0:0:34:2000
+A:2:2:34:2000
+O:40:13:0:0
 F:NO_MAGIC
 D:Anti-Magic
 d:Magic Inhibiting Amulet
 
-A:2:71:62:0:0:50:100000
+A:2:2:50:100000
+O:71:62:0:0
 F:WRAITH
 D:Wraith Form
 d:Potion of Invulnerability
 
-A:2:71:33:0:0:15:1000
+A:2:2:15:1000
+O:71:33:0:0
 F:FEATHER
 D:Levitation
 d:Potion of Berserk Strength
 
-A:2:80:37:0:0:20:10000
+A:2:2:20:10000
+O:80:37:0:0
 F:SLOW_DIGEST
 D:Slow Digestion
 d:Lembas Wafer
 
-A:2:80:10:0:0:32:20000
+A:2:2:32:20000
+O:80:10:0:0
 F:REGEN
 D:Regenerate
 d:Mushroom of Unhealth
 
-A:2:80:3:0:0:12:20000
+A:2:2:12:20000
+O:80:3:0:0
 F:TELEPORT
 D:Teleport
 d:Mushroom of Confusion
 
-A:3:21:2:0:1:30:20000
+A:2:2:47:500000
+O:9:1:0:0
+F:CLIMB
+D:Mountian Climbing
+d:A unique Orc's corpse
+f:ORC UNIQUE
+
+A:2:2:30:50000
+O:111:-1:0:0
+F:SPELL_CONTAIN
+D:Contain a spell
+d:Any spellbook
+
+A:2:2:47:500000
+O:9:1:847:0
+F:MAGIC_BREATH
+D:Breath anywhere
+d:Great wyrm of power tongue
+
+A:2:2:40:50000
+O:9:1:775:0
+F:WATER_BREATH
+D:Breath underwater
+d:Eye of a Powerful kraken
+
+A:3:3:30:20000
+O:21:2:0:1
 F:CRIT
 D:Extra Critical Hits
 d:Whip
 p:Whips
 
-A:3:23:30:0:0:30:30000
+A:3:3:30:30000
+O:23:30:0:0
 F:WOUNDING
 D:Wounds Monsters
 d:Blade of Chaos
 
-A:3:66:18:0:1:26:6000
+#Necromancer, Sorcerer, Dark elven socrerer, Patriarch, Cult Leader
+# and/or LOTS of uniques
+A:3:3:26:6000
+O:9:-1:0:1
 F:VAMPIRIC
 D:Vampiric
-d:Rod Tip of Drain Life
+d:Summoner of undead
+f:S_UNDEAD
 
-A:3:9:1:0:0:16:2000
+A:3:3:16:2000
+O:9:1:0:0
 F:SLAY_ANIMAL
 f:ANIMAL
 D:Slay Animal
 d:Dead Animal's Body
 
-A:3:9:-1:0:0:25:2000
+A:3:3:25:2000
+O:9:-1:0:0
 F:SLAY_EVIL
 f:EVIL
 D:Slay Evil
 d:Evil Dead Thing's Remains
 
-A:3:9:-1:0:0:30:2000
+A:3:3:30:2000
+O:9:-1:0:0
 F:SLAY_UNDEAD
 f:UNDEAD
 D:Slay Undead
 d:Remains of Undead Monster
 
-A:3:9:1:0:0:40:1500
+A:3:3:40:1500
+O:9:1:0:0
 F:SLAY_DEMON
 f:DEMON
 D:Slay Demon
 d:Demon's Corpse
 
-A:3:9:1:0:0:10:700
+A:3:3:10:700
+O:9:1:0:0
 F:SLAY_ORC
 f:ORC
 D:Slay Orc
 d:Dead Orc
 
-A:3:9:1:0:0:16:700
+A:3:3:16:700
+O:9:1:0:0
 F:SLAY_TROLL
 f:TROLL
 D:Slay Troll
 d:Dead Troll
 
-A:3:9:1:0:0:25:900
+A:3:3:25:900
+O:9:1:0:0
 F:SLAY_GIANT
 f:GIANT
 D:Slay Giant
 d:Dead Giant
 
-A:3:9:1:0:0:33:2000
+A:3:3:33:2000
+O:9:1:0:0
 F:SLAY_DRAGON
 f:DRAGON
 D:Slay Dragon
 d:Dead Dragon (any size will do)
 
-A:3:9:-1:593:0:41:5000
+A:3:3:41:5000
+O:9:-1:593:0
 F:KILL_DRAGON
 D:*Slay* Dragon
 d:Mature Multi-Hued Dragon's Remains
 
-A:3:9:-1:0:0:41:90000
+A:3:3:41:90000
+O:9:-1:0:0
 F:KILL_UNDEAD
 f:S_HI_UNDEAD
 D:*Slay* Undead
-d:Dead Summoner of Greater Undead
+d:Summoner of Greater Undead
 
-A:3:9:-1:996:0:41:90000
+A:3:3:41:90000
+O:9:-1:0:0
 F:KILL_DEMON
 D:*Slay* Demon
-d:Lesser Balrog's Corpse
+d:Summoner of demons
+f:S_DEMON
 
-A:3:0:0:0:0:36:20000
+A:3:3:36:20000
 F:VORPAL
 D:Vorpal
 
-A:3:0:0:0:0:40:90000
+A:3:3:40:90000
 F:IMPACT
 D:Earthquakes
 
-A:3:0:0:0:0:3:2000
+A:3:3:3:2000
 F:BRAND_POIS
 D:Poison Brand
 
-A:3:0:0:0:0:12:2000
+A:3:3:12:2000
 F:BRAND_ACID
 D:Acid Brand
 
-A:3:0:0:0:0:10:2000
+A:3:3:10:2000
 F:BRAND_ELEC
 D:Lightning Brand
 
-A:3:0:0:0:0:6:2000
+A:3:3:6:2000
 F:BRAND_FIRE
 D:Fire Brand
 
-A:3:0:0:0:0:8:2000
+A:3:3:8:2000
 F:BRAND_COLD
 D:Frost Brand
 
-A:3:0:0:0:0:30:3000
+A:3:3:30:3000
 F:XTRA_MIGHT
 D:Extra Might (Bows Only)
 
-A:3:0:0:0:0:35:3000
+A:3:3:35:3000
 F:XTRA_SHOTS
 D:Extra Shots (Bows Only)
 
-A:4:9:1:624:0:49:500000
+A:3:3:30:30000
+O:9:1:241:0
+F:BLESSED
+D:Blessed by the Gods
+d:a druid's pancreas
+
+A:3:3:40:-40000
+O:45:0:0:0
+F:NEVER_BLOW
+D:Can't attack with this weapon
+d:A ring of Woe
+
+A:3:3:45:500000
+O:45:5:0:0
+F:RES_MORGUL
+D:Resist destruction by Morgul
+d:A ring of power
+
+
+A:4:9:49:500000
+O:9:1:624:0
 F:IM_ACID
 D:Immune to Acid
 d:Ancient Black Dragon's Foreskin
 
-A:4:9:1:601:0:50:500000
+A:4:9:50:500000
+O:9:1:601:0
 F:IM_ELEC
 D:Immune to Lightning
 d:Ancient Blue Dragon's Foreskin
 
-A:4:9:1:644:0:49:500000
+A:4:9:49:500000
+O:9:1:644:0
 F:IM_FIRE
 D:Immune to Fire
 d:Ancient Red Dragon's Foreskin
 
-A:4:9:1:617:0:50:500000
+A:4:9:50:500000
+O:9:1:617:0
 F:IM_COLD
 D:Immune to Cold
 d:Ancient White Dragon's Foreskin
 
-A:4:40:8:0:0:30:30000
+#This is monster 1050, which is one of the monster's called 'Spirit'
+A:4:9:50:500000
+O:9:1:1050:0
+F:IM_NETHER
+D:Immune to Nether
+d:The Corpse of a Wyrm's Ghost
+
+A:4:4:30:30000
+O:40:8:0:0
 F:HOLD_LIFE
 D:Hold Life
 d:Amulet of the Magi
 
-A:4:45:17:0:0:12:10000
+A:4:10:12:10000
+O:45:17:0:0
 F:RES_ACID
 D:Resist Acid
 d:Ring of Acid
 
-A:4:45:56:0:0:15:10000
+A:4:10:15:10000
+O:45:56:0:0
 F:RES_ELEC
 D:Resist Lightning
 d:Ring of Lightning
 
-A:4:71:30:0:0:13:10000
+A:4:10:13:10000
+O:71:30:0:0
 F:RES_FIRE
 D:Resist Fire
 d:Potion of Resist Heat
 
-A:4:71:31:0:0:14:10000
+A:4:10:14:10000
+O:71:31:0:0
 F:RES_COLD
 D:Resist Cold
 d:Potion of Resist Cold
 
-A:4:71:27:0:0:25:30000
+A:4:10:25:30000
+O:9:-1:0:0
 F:RES_POIS
 D:Resist Poison
-d:Potion of Cure Poison
+d:Powerful spider's poison
+f:FORCE_MAXHP SPIDER
 
-A:4:45:38:0:0:26:10000
+A:4:4:26:10000
+O:9:-1:515:0
 F:RES_FEAR
 D:Resist Fear
-d:Ring of Fear Resistance
+d:Friendly slime covered centipede
 
-A:4:45:39:0:0:31:60000
+A:4:4:31:60000
+O:9:-1:496:0
 F:RES_LITE
 D:Resist Light
-d:Ring of Light and Darkness Resistance
+d:Troll from beneath the ground
 
-A:4:45:39:0:0:31:60000
+A:4:4:31:60000
+O:23:32:0:0
 F:RES_DARK
 D:Resist Darkness
-d:Ring of Light and Darkness Resistance
+d:shadow blade
 
-A:4:45:47:0:0:30:30000
+A:4:4:30:30000
+O:9:-1:0:0
 F:RES_BLIND
 D:Resist Blindness
-d:Ring of Blindness Resistance
+d:hand that blinds
+f:BLIND
 
-A:4:45:43:0:0:30:30000
+A:4:4:30:30000
+O:9:-1:0:0
 F:RES_CONF
 D:Resist Confusion
-d:Ring of Confusion Resistance
+d:Corpse of a confused monster
+f:RAND_50 RAND_25
 
-A:4:45:42:0:0:30:60000
+A:4:4:30:60000
+O:9:-1:0:0
 F:RES_SOUND
 D:Resist Sound
-d:Ring of Sound Resistance
+d:Loud monster
+f:SHRIEK
 
-A:4:45:44:0:0:30:60000
+A:4:4:30:60000
+O:35:3:0:0
 F:RES_SHARDS
 D:Resist Shards
-d:Ring of Shard Resistance
+d:piece of fur
 
-A:4:45:40:0:0:30:60000
+#Physics teacher: ONLY undead that drops a corpse
+A:4:4:30:60000
+O:7:0:0:0
 F:RES_NETHER
 D:Resist Nether
-d:Ring of Nether Resistance
+d:box that cannot hold anything
 
-A:4:45:41:0:0:30:60000
+A:4:4:30:60000
+O:9:-1:0:0
 F:RES_NEXUS
 D:Resist Nexus
-d:Ring of Nexus Resistance
+f:RES_NEXU
+d:something nexus resistant
 
-A:4:45:46:0:0:30:60000
+#Chaos hound
+A:4:4:30:60000
+O:9:1:779:0
 F:RES_CHAOS
 D:Resist Chaos
-d:Ring of Chaos Resistance
+d:Chaos elementals corpse
 
-A:4:45:45:0:0:30:60000
+#disenchanter eye, 104
+#disenchater beast, 399
+#Mim, Betrayer of Turin
+A:4:4:30:60000
+O:9:-1:0:0
 F:RES_DISEN
+f:RES_DISE
 D:Resist Disenchantment
-d:Ring of Disenchantment Resistance
+d:disenchantment resisting monster
 
-A:5:9:1:0:0:50:-100000
+A:5:0:50:-100000
+O:9:1:0:0
 F:TEMPORARY
 D:Temporary Item
 d:Corpse, any corpse
 
-A:5:36:1:0:0:10:-2000
+A:5:0:10:-2000
+O:36:1:0:0
 F:AUTO_CURSE
 D:Self-Cursing
 d:Filthy Rag
 
-A:5:80:40:0:0:45:-10000
+A:5:0:45:-100000
+O:80:40:0:0
 F:BLACK_BREATH
 D:Causes the Black Breath
 d:Sprig of Athelas
 
-A:5:70:15:0:0:40:-5000
+A:5:0:40:-500000
+O:70:15:0:0
 F:TY_CURSE
-D:Ancient Curse
+D:Wierd Ancient Curse
 d:Scroll of *Remove Curse*
 
-A:5:0:0:0:0:40:-5000
+A:5:0:40:-50000
 F:DRAIN_EXP
 D:Drains your Experience
 
-A:5:0:0:0:0:30:-5000
+A:5:0:30:-50000
 F:AGGRAVATE
 D:Aggravates Monsters
 
-A:5:70:14:0:0:30:-500
+A:5:0:30:-500
+O:70:14:0:0
 F:CURSED
 D:Curse
 d:Scroll of Remove Curse
@@ -666,84 +852,132 @@ d:Scroll of Remove Curse
 # 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:40:-10000
+O:70:15:0:0
+D:Heavy Curse
+F:HEAVY_CURSE
+d:Scroll of *Remove Curse*
 
-A:5:0:0:0:0:50:-5000
+A:5:0:50:-50000
 F:PERMA_CURSE
 D:Permanently Cursed
 
-A:5:0:0:0:0:35:-2000
+A:5:0:35:-20000
 F:CURSE_NO_DROP
 D:Can't be Dropped
 
-A:5:0:0:0:0:45:-5000
+A:5:0:45:-50000
 F:DRAIN_HP
 D:Drains your Hit Points
 
-A:5:0:0:0:0:20:-50000
+A:5:0:40:-50000
+O:111:0:0:0
+F:DRAIN_MANA
+D:Drains Mana
+d:A tome of magical energy
+
+A:5: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
+A:5:0:40:500000
+O:9:1:32:0
 F:ESP_ALL
 D:Telepathy
 d:Formerly Floating Eye
 
-A:5:0:0:0:0:25:3000
+A:5:5:25:3000
+O:9:-1:0:0
 F:ESP_ORC
 D:Sense Orcs
+f:ORC
+d:Orc's brain
 
-A:5:0:0:0:0:25:3000
+A:5:5:25:3000
+O:9:-1:0:0
 F:ESP_TROLL
+f:TROLL
 D:Sense Trolls
+d:Troll's brain
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_DRAGON
 D:Sense Dragons
+f:POWERFUL DRAGON
+d:Older dragon's brain
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_GIANT
+f:GIANT
 D:Sense Giants
+d:Gaint's brain
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_DEMON
+f:DEMON
 D:Sense Demons
+d:piece of a demon
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_UNDEAD
 D:Sense Undead
+d:dead thing
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_EVIL
 D:Sense Evil
+f:EVIL
+d:something evil
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_ANIMAL
 D:Sense Animals
+f:ANIMAL
+d:something natural
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_THUNDERLORD
 D:Sense Thunderlords
+f:THUNDERLORD
+d:Dead thunderlord
 
-A:5:0:0:0:0:25:5000
+#Note: No angel leaves a corpse, and the only
+# thing that leaves a corpse that can summon angels
+# is knights templar, and some NASTY uniques.
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_GOOD
 D:Sense Good
+f:GOOD
+d:Dead good thing
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_NONLIVING
 D:Sense Nonliving
+f:NONLIVING
+d:remains of something that was never alive
 
-A:5:0:0:0:0:25:5000
+A:5:5:25:5000
+O:9:-1:0:0
 F:ESP_UNIQUE
 D:Sense Unique Monsters
+f:UNIQUE
+d:dead named monster
 
-A:5:0:0:0:0:25:2000
+A:5:5:25:2000
+O:9:-1:0:0
 F:ESP_SPIDER
 D:Sense Spiders
+f:SPIDER
+d:spider venom
 
 
 #***************************Activations for artifacts***********************
@@ -759,17 +993,15 @@ D:Sense Spiders
 #   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.
+# Note that the order in which they appear in this file is the same order
+#   in which they'll be displayed.
 #
 #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)
+#x:Flag name (from defines.h, from init1.c, without the ACT_ prefix in defines.h)
 #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
@@ -783,7 +1015,6 @@ D:Sense Spiders
 #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
@@ -794,14 +1025,25 @@ D:Sense Spiders
 #define ACT_CURE_700             86
 #define ACT_CURE_1000            87  
 
-#define ACT_LIGHT               111
+#define ACT_MUT                 166
+A:0:0:25:10000
+O:71:10:0:0
+x:MUT
+d:Potion of corruption
+
 
 #define ACT_SUNLIGHT              1
-A:0:70:15:0:0:40:40000
+A:0:0:25:10000
+O:71:10:0:0
 x:SUNLIGHT
-D:Sunlight
 d:Brass Lantern
 
+#define ACT_LIGHT               111
+A:0:0:25:10000
+O:39:0:0:0
+x:LIGHT
+d:Torch
+
 #define ACT_MAP_LIGHT           112
 #define ACT_DETECT_ALL          113
 #define ACT_DETECT_XTRA         114
@@ -812,88 +1054,108 @@ d:Brass Lantern
 
 
 #define ACT_BO_MISS_1             2
-A:0:0:0:0:0:20:4000
+A: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
+A: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
+A: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
+A: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
+A: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
+A: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
+A: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
+A: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
+A:0:0:45:450000
 x:BR_ELEC
-D:Breath 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       
+A:0:0:45:450000
+x:BR_ACID
 #define ACT_BO_COLD_1           6
+#define ACT_BA_COLD_1           8
 #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       
+A:0:0:45:450000
+x:BR_COLD
 #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       
+A:0:0:45:450000
+x:BR_ACID
 #define ACT_BA_POIS_1           3
 #define ACT_BA_POIS_4           179          
 #define ACT_BR_POIS             188       
+A:0:0:45:450000
+x:BR_POIS
 #define ACT_BR_MANY             189       
+A:0:0:47:450000
+x:BR_MANY
 #define ACT_BR_CONF             190       
+A:0:0:47:450000
+x:BR_CONF
 #define ACT_BR_SOUND            191        
+A:0:0:47:450000
+x:BR_SOUND
 #define ACT_BR_CHAOS            192        
+A:0:0:49:900000
+x:BR_CHAOS
 #define ACT_BR_SHARD            193        
+A:0:0:47:500000
+x:BR_SHARD
 #define ACT_BR_BALANCE          194          
+A:0:0:47:500000
+x:BR_BALANCE
 #define ACT_BR_LIGHT            195        
+A:0:0:45:450000
+x:BR_LIGHT
 #define ACT_BR_POWER            196        
+A:0:0:50:700000
+x:BR_POWER
+#define ACT_CALL_CHAOS          21
+A:0:0:50:700000
+x:BR_CHAOS
 #define ACT_ROCKET              22
-A:0:0:0:0:0:50:40000
+A:0:0:50:700000
 x:ROCKET
-D:Fire a Rocket
+#define ACT_DISP_EVIL           23
+#define ACT_DISP_GOOD           25
+#define ACT_DRAIN_1             10
+#define ACT_DRAIN_2             13
+#define ACT_VAMPIRE_1           14
+#define ACT_VAMPIRE_2           20
 
 #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
@@ -920,10 +1182,6 @@ D:Fire a Rocket
 #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
@@ -990,6 +1248,8 @@ D:Fire a Rocket
 #define ACT_NIGHT               107          
 #define ACT_ORCHAST             108            
 
+
+# These are 'bad' activations - Don't bother implementing, I think.
 #define ACT_DEATH               127
 #define ACT_RUINATION           128
 #define ACT_DESTRUC             129
@@ -1107,6 +1367,10 @@ I:40:28:2:CONFUSION
 #can be thrown for much damage, and are thus an integral part of
 #the alchemist's arsenal.
 
+#Added the potion of explosion for low-level alchemists
+#SV_POTION_EXPLOSION
+I:71:64:1:EXPLOSION
+
 #SV_POTION_DETONATIONS
 I:71:22:6:EXPLOSION
 
@@ -1650,7 +1914,6 @@ I:55:12:1:EXTRALIFE
 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
@@ -1666,13 +1929,13 @@ I:55:19:1:TELEPORT
 #Wish
 I:55:20:99:MAGIC
 #Mana
-I:55:21:1:MANA
+I:55:21:8:MANA
 
 
 #********************Wands*****************
 
 #MannaThrust
-I:65:3:4:MANA
+I:65:3:1:MANA
 
 #FireFlash
 I:65:4:1:FIRE
@@ -1684,7 +1947,6 @@ 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
@@ -1695,13 +1957,14 @@ 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
+#DIG (of thrain) an artifact that seems to apear many times in many places.
+I:65:26:1:FORCE
 
 #Stone Prison
 I:65:12:3:FORCE
@@ -1813,6 +2076,12 @@ I:45:47:8:LITE
 #Ring of Accuracy
 I:45:28:1:LITE
 
+#Ring of Woe
+I:45:0:1:LIFE
+
+#Ring of Aggravate Monster
+I:45:1:1:CONFUSION
+
 #Ring of Searching
 I:45:23:4:LITE
 I:45:23:3:KNOWLEDGE
@@ -1913,11 +2182,13 @@ 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:9:2:MAGIC
 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:10:2:MAGIC
+I:1:11:4:MAGIC         },/*of Permanence*/
 I:1:11:6:ACID          },/*of Permanence*/
 I:1:11:6:COLD          },/*of Permanence*/
 I:1:11:6:FIRE          },/*of Permanence*/
@@ -1934,13 +2205,18 @@ 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:20:1:MAGIC
 I:1:21:12:FORCE                },/*of Reflection*/
+I:1:21:1:MAGIC
 I:1:22:8:LIGHTNING             },/*of Electricity*/
 I:1:23:4:DARKNESS              },/*of the Noldor*/
+I:1:23:1:MAGIC
 I:1:24:4:KNOWLEDGE             },/*of Intelligence*/
+I:1:24:1:MAGIC
 I:1:25:4:KNOWLEDGE             },/*of Wisdom*/
 I:1:26:4:KNOWLEDGE             },/*of Beauty*/
 I:1:27:12:KNOWLEDGE            },/*of the Magi*/
+I:1:27:1:MAGIC
 I:1:28:12:EXPLOSION            },/*of Might*/
 I:1:29:4:MANA          },/*of Lordliness*/
 I:1:30:8:KNOWLEDGE             },/*of Seeing*/
@@ -1949,11 +2225,13 @@ 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:35:1:MAGIC
 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:40:1:MAGIC
 I:1:41:4:FORCE         },/*of Protection*/
 I:1:42:4:DARKNESS              },/*of Stealth*/
 I:1:43:4:ACID          },/*of Aman*/
@@ -1961,67 +2239,99 @@ 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:43:1:MAGIC
 I:1:44:8:FIRE          },/*of Immolation*/
+I:1:44:1:MAGIC
 I:1:48:8:LIGHTNING             },/*of Electricity*/
+I:1:48:1:MAGIC
 I:1:49:1:FORCE         },/*of Free Action*/
+I:1:49:1:MAGIC
 I:1:50:4:FORCE         },/*of Slaying*/
 I:1:50:4:LITE          },/*of Slaying*/
+I:1:50:1:MAGIC
 I:1:51:4:LIGHTNING             },/*of Agility*/
 I:1:52:4:EXPLOSION             },/*of Power*/
+I:1:52:1:MAGIC
 I:1:54:2:DARKNESS              },/*of Charming*/
 I:1:57:3:DARKNESS              },/*of Levitation*/
+I:1:57:1:MAGIC
 I:1:58:3:DARKNESS              },/*of Stealth*/
+I:1:58:1:MAGIC
 I:1:59:3:DARKNESS              },/*of Free Action*/
+I:1:59:1:MAGIC
 I:1:60:5:TIME          },/*of Speed*/
+I:1:61:5:MAGIC
 I:1:61:2:DARKNESS              },/*of Dwarvish Endurance*/
 I:1:61:2:EXPLOSION             },/*of Dwarvish Endurance*/
+I:1:61:1:MAGIC
 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:65:1:MAGIC
+I:1:66:3: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:67:1:MAGIC
 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:69:1:MAGIC
 I:1:70:2:TIME          },/*of Extra Attacks*/
+I:1:70:1:MAGIC
 I:1:71:4:FORCE         },/*of Slaying*/
 I:1:71:4:LITE          },/*of Slaying*/
+I:1:71:1:MAGIC
 I:1:72:4:EXPLOSION             },/*of Spinning*/
 I:1:72:4:LIGHTNING             },/*of Spinning*/
+I:1:72:1:MAGIC
 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:78:1:MAGIC
 I:1:79:4:FORCE         },/*Sharp*/
+I:1:79:1:MAGIC
 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:82:1:MAGIC
 I:1:83:8:CHAOS         },/*of Slay Undead*/
+I:1:83:1:MAGIC
 I:1:84:8:CHAOS         },/*of Slay Demon*/
+I:1:84:1:MAGIC
 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:88:1:MAGIC
 I:1:89:12:CHAOS                },/*of *Slay Animal**/
+I:1:89:1:MAGIC
 I:1:90:12:CHAOS                },/*of *Slay Evil**/
+I:1:90:1:MAGIC
 I:1:91:12:CHAOS                },/*of *Slay Undead**/
+I:1:91:1:MAGIC
 I:1:92:12:CHAOS                },/*of *Slay Demon**/
+I:1:92:1:MAGIC
 I:1:93:12:CHAOS                },/*of *Slay Orc**/
+I:1:93:1:MAGIC
 I:1:94:12:CHAOS                },/*of *Slay Troll**/
+I:1:94:1:MAGIC
 I:1:95:12:CHAOS                },/*of *Slay Giant**/
+I:1:95:1:MAGIC
 I:1:96:12:CHAOS                },/*of *Slay Dragon**/
+I:1:96:1:MAGIC
 I:1:97:8:LIFE          },/*Vampiric*/
+I:1:97:1:MAGIC
 I:1:98:4:MAGIC         },/*(*Defender*)*/
 I:1:98:8:ACID          },/*(*Defender*)*/
 I:1:98:8:COLD          },/*(*Defender*)*/
@@ -2029,13 +2339,16 @@ 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:99:1:MAGIC
 I:1:100:12:KNOWLEDGE           },/*of Gondolin*/
-I:1:100:1:MAGIC                },/*of Gondolin*/
+I:1:100:2:MAGIC                },/*of Gondolin*/
 I:1:101:1:FORCE                },/*of Digging*/
 I:1:102:12:LIFE                },/*Spectral*/
 I:1:102:4:MANA         },/*Spectral*/
+I:1:102:1:MAGIC
 I:1:105:1:LITE         },/*of Accuracy*/
 I:1:106:2:FORCE                },/*of Power*/
+I:1:101:1:MAGIC
 I:1:107:2:FORCE                },/*of Extra Might*/
 I:1:108:1:FORCE                },/*of Extra Shots*/
 I:1:108:1:LITE         },/*of Extra Shots*/
@@ -2044,11 +2357,15 @@ 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:110:1:MAGIC
 I:1:111:2:FORCE                },/*of Buckland*/
 I:1:111:2:LITE         },/*of Buckland*/
+I:1:111:1:MAGIC
 I:1:112:1:CHAOS                },/*of Slay Animal*/
 I:1:113:1:CHAOS                },/*of Slay Evil*/
+I:1:113:1:MAGIC
 I:1:114:1:CHAOS                },/*of Slay Undead*/
+I:1:114:1:MAGIC
 I:1:115:1:POISON      },/*of Venom*/
 I:1:116:1:ACID         },/*of Acid*/
 I:1:117:12:ACID                },/*Elemental*/
@@ -2056,6 +2373,7 @@ 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:117:1:MAGIC
 I:1:118:1:CHAOS                },/*of Slay Demon*/
 I:1:119:1:CHAOS                },/*of Slay Dragon*/
 I:1:120:1:FORCE                },/*of Slaying*/
@@ -2069,19 +2387,27 @@ 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:128:1:MAGIC
 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:129:1:MAGIC
 I:1:130:1:MANA         },/*Dragon*/
+I:1:130:1:MAGIC
 I:1:131:1:MANA         },/*Capacity of */
+I:1:131:1:MAGIC
 I:1:132:1:LIFE         },/*Cheapness of */
+I:1:132:1:MAGIC
 I:1:133:1:TIME         },/*Quickness of */
+I:1:133:1:MAGIC
 I:1:134:1:TIME         },/*Charging of */
+I:1:134:1:MAGIC
 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:135:1:MAGIC
 I:1:136:1:LITE         },/*of Boldness*/
 I:1:137:1:LITE         },/*of Fearlessness*/
 I:1:138:2:LITE         },/*of Illumination*/
@@ -2093,29 +2419,37 @@ 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:145:1:MAGIC                },/*of Fading*/
 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:146:1:MAGIC
+I:1:147:4: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:148:16:LIFE                Cursed
 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:163:1:MAGIC
 I:1:166:4:MAGIC                },/*of Preservation*/
 I:1:166:4:MANA         },/*of Preservation*/
 I:1:167:12:MANA                },/*of Serenity*/
+I:1:167:1:MAGIC
 I:1:168:4:DARKNESS             },/*of Night and Day*/
 I:1:168:4:LITE         },/*of Night and Day*/
+I:1:168:1:MAGIC
 I:1:169:1:TIME         },/*of the Magi*/
 I:1:169:8:KNOWLEDGE            },/*of the Magi*/
+I:1:169:1:MAGIC
 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:171:1:MAGIC
 I:1:172:4:LIGHTNING            },/*of Thievery*/
 I:1:173:4:FORCE                },/*of Combat*/
 I:1:174:4:TELEPORT             },/*of Stability*/
@@ -2123,12 +2457,26 @@ 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:175:1:MAGIC
+I:1:176:4: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:178:1:MAGIC
 I:1:179:4:KNOWLEDGE            },/*Simplicity of */
+I:1:179:1:MAGIC
 I:1:180:1:FIRE         },/*of Warmth*/
+I:1:180:1:MAGIC
+I:1:181:8:COLD         Dragon Horn
+I:1:181:1:MAGIC
+I:1:182:8:LIGHTNING    Dragon Horn
+I:1:182:1:MAGIC
+I:1:183:8:FIRE Dragon Horn
+I:1:183:1:MAGIC
+I:1:184:4:LIFE    Water Breathing
+I:1:184:1:MAGIC
 I:1:185:12:LIFE                },/*of Life*/
 I:1:185:2:MAGIC                },/*of Life*/
+I:1:186:4:POISON       Cloak of Air
+I:1:186:1:MAGIC        Cloak of Air
diff -udprBb --exclude=*.o --exclude=*.raw p/lib/edit/k_info.txt 1/lib/edit/k_info.txt
--- p/lib/edit/k_info.txt       Thu Mar 13 20:00:34 2003
+++ 1/lib/edit/k_info.txt       Sat Apr 26 12:59:58 2003
@@ -65,6 +65,8 @@ W:10:0:1:0
 A:10/1
 D:'E'ating this mushroom will make you hallucinate.
 D:You will not be able to recognise any monster or item.
+D:Some people claim that eating this gives you insight and understanding.
+D:Most just say it messes up your mind.
 
 N:5:Cure Poison
 G:,:d
@@ -2247,7 +2249,7 @@ G:!:d
 I:71:17:0
 W:20:0:4:0
 A:20/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:This accursed potion will cloud your intellect, making you stupid.
 
@@ -2273,7 +2275,7 @@ G:!:d
 I:71:18:0
 W:20:0:4:0
 A:20/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:This potion casts a shadow on your knowledge, making you foolish.
 
@@ -2299,7 +2301,7 @@ G:!:d
 I:71:21:0
 W:20:0:4:0
 A:20/1
-P:0:1d1:0:0:0
+P:0:1d7:0:0:0
 F:FOUNTAIN
 D:This wicked potion slightly twists your features, making you appear less fair.
 
@@ -2391,7 +2393,7 @@ G:!:d
 I:71:11:100
 W:0:0:4:0
 A:0/1
-P:0:1d1:0:0:0
+P:0:2d7:0:0:0
 F:FOUNTAIN
 D:This potion was made to help people with bad sleeping disorders to find rest. Surely you don't
 D:want to take a nap while nasty goblins are searching for you?
@@ -2401,7 +2403,7 @@ G:!:d
 I:71:7:0
 W:0:0:4:0
 A:0/1
-P:0:1d1:0:0:0
+P:0:2d7:0:0:0
 F:FOUNTAIN
 D:This slightly poisonous potion temporarily impedes your eyesight, making you unable to see
 D:a thing.
@@ -2411,7 +2413,7 @@ G:!:d
 I:71:9:50
 W:0:0:4:0
 A:0/1
-P:0:1d1:0:0:0
+P:0:1d7:0:0:0
 F:FOUNTAIN
 D:A small bottle of a dark brown distilled beverage. By its look and smell, it contains a fair
 D:amount of still muck and wood alcohol.
@@ -2421,7 +2423,7 @@ G:!:d
 I:71:6:0
 W:3:0:4:0
 A:3/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:This bottle is filled with a mild but still dangerous liquid poison. Drinking it would be highly
 D:unwise.
@@ -2440,7 +2442,7 @@ G:!:d
 I:71:4:50
 W:1:0:4:0
 A:1/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:A magical concoction which drains force from you, forcing you to move and act a lot slower,
 D:until it wears off.
@@ -2476,7 +2478,7 @@ G:!:d
 I:71:13:0
 W:10:0:4:0
 A:10/1
-P:0:1d1:0:0:0
+P:0:6d7:0:0:0
 F:FOUNTAIN
 D:A wicked potion, making you less of an adventurer than by right you should be.
 
@@ -2485,7 +2487,7 @@ G:!:d
 I:71:5:0
 W:0:0:4:0
 A:0/1
-P:0:1d1:0:0:0
+P:0:1d7:0:0:0
 F:FOUNTAIN
 D:A solution of salt in water, made for curing meat. Drinking it would cause violent nausea.
 
@@ -3898,7 +3900,7 @@ G:!:d
 I:71:19:0
 W:5:0:4:0
 A:5/1
-P:0:1d1:0:0:0
+P:0:6d7:0:0:0
 F:FOUNTAIN
 D:This nasty concoction will numb your nerves, making you clumsier.
 
@@ -3907,7 +3909,7 @@ G:!:d
 I:71:20:0
 W:10:0:4:0
 A:10/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:This unhealthy drink damages your health, reducing your physical constitution.
 
@@ -4701,7 +4703,7 @@ P:0:1d1:0:0:0
 
 N:568:Nothing
 G:_:d
-I:55:30:0
+I:55:2:-1:SPELL=Nothing
 W:5:0:50:50
 A:5/1
 P:0:1d1:0:0:0
@@ -4853,7 +4855,7 @@ G:!:d
 I:71:10:0
 W:3:0:4:0
 A:3/1:13/1:23/1
-P:0:1d1:0:0:0
+P:0:4d7:0:0:0
 F:FOUNTAIN
 D:This concoction of toxic wastes will strangely warp your shape.
 
@@ -6319,3 +6321,19 @@ 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.
+
+#Actually, I've decided to make it proportional to a potion of detonations.
+#Detonation is 25d25, or an average of 312 damage, it takes 6 essences.
+#Explosion takes 1 essence, which would yeild 50 damage, but call it half as
+#efficient, and make it an average of 25 damage.
+N:819:Explosions
+G:!:d
+I:71:64:0
+W:0:0:4:1
+A:0/1
+P:0:8d6:0:0:0
+F:FOUNTAIN
+D:This bottle is filled with a strange substance which may explode if agitated.
+D:You don't want to know what it might do to your intestines.
+
+
diff -udprBb --exclude=*.o --exclude=*.raw p/lib/edit/misc.txt 1/lib/edit/misc.txt
--- p/lib/edit/misc.txt Sat Mar  8 20:00:07 2003
+++ 1/lib/edit/misc.txt Thu Apr 17 13:27:18 2003
@@ -23,7 +23,7 @@ M:R:1077
 M:r:14
 
 # Maximum number of items in k_info.txt
-M:K:819
+M:K:820
 
 # Maximum number of vaults in v_info.txt
 M:V:108
diff -udprBb --exclude=*.o --exclude=*.raw p/lib/edit/p_info.txt 1/lib/edit/p_info.txt
--- p/lib/edit/p_info.txt       Thu Mar 13 20:00:34 2003
+++ 1/lib/edit/p_info.txt       Sat Apr 19 14:45:26 2003
@@ -362,31 +362,33 @@ C:a:O:23:4:1d1
 C:a:N:Alchemist
 C:a:D:An 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:-400:Sorcery
-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:+300:Weaponmastery
+C:a:k:-1000:-0:Magic
+C:a:k:-0:-0:Spell-power
+C:a:k:-0:-300:Sorcery
+C:a:k:+2000:+200:Combat
+C:a:k:+2000:+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:+0:-300:Sorcery
-C:a:k:+1000:+800:Alchemy
-C:a:k:+0:+50:Magic-Device
+C:a:k:-0:-700:Fire
+C:a:k:-0:-700:Water
+C:a:k:-0:-700:Air
+C:a:k:-0:-700:Earth
+C:a:k:-0:-700:Meta
+C:a:k:-0:-700:Conveyance
+C:a:k:-0:-700:Divination
+C:a:k:-0:-700:Temporal
+C:a:k:-0:-700:Nature
+C:a:k:-0:-700:Mind
+C:a:k:-0:-700:Necromancy
+C:a:k:-0:-700:Runecraft
+C:a:k:-0:-700:Thaumaturgy
+C:a:k:-0:-0:Spirituality
+C:a:k:+1000:+2000:Corpse-preservation
+C:a:k:+0:+200:Prayer
+C:a:k:+1000:+1000:Alchemy
+C:a:k:+0:+100:Magic-Device
 C:a:O:31:1:1d1
-C:a:O:4:2:6d1
-C:a:O:2:1:1d1
+C:a:O:4:2:6d3
+C:a:O:2:1:7d2
 C:a:O:23:4:1d1
 
 C:N:2:Archer
diff -udprBb --exclude=*.o --exclude=*.raw p/lib/edit/s_info.txt 1/lib/edit/s_info.txt
--- p/lib/edit/s_info.txt       Sun Jan 26 20:00:25 2003
+++ 1/lib/edit/s_info.txt       Wed Apr 16 16:14:29 2003
@@ -161,7 +161,6 @@ I:1000
 
 
 # All magic skills affect magic skill
-f:Magic-Device:Magic%7
 f:Spell-power:Magic%20
 f:Sorcery:Magic%20
 f:Mana:Magic%10
@@ -361,6 +361,7 @@ N:39:Alchemy
 D:Ability to use essences to modify/create magic items
 A:5:Use Alchemy
 I:1000
+f:Alchemy:Magic-Device%20
 
 # Antimagic exclude all magic
 E:Magic-Device:Antimagic
@@ -499,7 +500,6 @@ T:Sneakiness:Stealing
 T:Sneakiness:Dodging
 
 T:Main:Magic
-T:Magic:Magic-Device
 T:Magic:Spell-learning
 T:Magic:Spell-power
 T:Magic:Sorcery
@@ -519,7 +519,9 @@ T:Magic:Demonology
 T:Magic:Necroman