diff --git a/doc/game/Mage.html b/doc/game/Mage.html
index 9b97adab..a7ddff00 100644
--- a/doc/game/Mage.html
+++ b/doc/game/Mage.html
@@ -17,84 +17,84 @@
 <ul>
   <li>Light: (C 1) Creates a weak light.</li>
   <li>Spark: (C 1, R 6) Fires a weak bolt of electricity at an enemy.</li>
-  <li>Minor Haste: (C 1)Makes the selected PC move faster for a while. All haste spells take effect at the beginning of the next round.</li>
-  <li>Strength:(C 1)Makes the selected PC more skilled for a short time. Works like the priest spell ‘Bless.’</li>
-  <li>Scare: (C 1, R 6)Decreases the morale of the victim. Casting this on a weak foe will make the foe flee. Even if the monster doesn't flee, later castings have a higher chance of success.</li>
-  <li>Flame Cloud: (C 2, R 7)This spell fills the selected space with a short-lasting wall of fire.</li>
-  <li>Identify: (C 15)This draining spell makes all of your parties unidentified items identified.</li>
-  <li>Scry Monster: (C 2, R 14)When cast, you receive information about the monster you target: current health, spell points, etc. In addition, this monster will now appear on your Monster Info menu.</li>
+  <li>Minor Haste: (C 1) Makes the selected PC move faster for a while. All haste spells take effect at the beginning of the next round.</li>
+  <li>Strength: (C 1) Makes the selected PC more skilled for a short time. Works like the priest spell 'Bless.'</li>
+  <li>Scare: (C 1, R 7) Decreases the morale of the victim. Casting this on a weak foe will make the foe flee. Even if the monster doesn't flee, later castings have a higher chance of success.</li>
+  <li>Flame Cloud: (C 2, R 7) This spell fills the selected space with a short-lasting wall of fire.</li>
+  <li>Identify: (C 50) This draining spell makes all of your parties unidentified items identified.</li>
+  <li>Scry Monster: (C 2, R 14) When cast, you receive information about the monster you target: current health, spell points, etc. In addition, this monster will now appear on your Monster Info menu.</li>
   <li>Goo: (C 1, R 8) This spell covers the target with sticky goo, slowing it down and interferingwith its attacks.</li>
-  <li>True Sight: (C 3)This spell lets you see everything in a short radius around you, even spaces blocked off by walls. It's useful for finding secret passages, for example.</li>
+  <li>True Sight: (C 3) This spell lets you see everything in a short radius around you, even spaces blocked off by walls. It's useful for finding secret passages, for example.</li>
 </ul>
 <h2>Level 2</h2>
 <ul>
-<li>Minor Poison:(C 2, R 6) Poisons the target creature. This does a fair amount of damage, but it takes time to happen.</li>
-<li>Flame:(C 3, R 8)Fires a decent-sized bolt of flame at the target. The damage done increases with the level of the caster.</li>
-<li>Slow:(C 2, R 7)Makes the victim get half its usual number of actions for a while.</li>
-<li>Dumbfound:(C 2, R 10) Makes the victim incompetent: easier to hit, easier to damage, and less able to attack you.</li>
-<li>Envenom:(C 2)This spell puts poison on the weapon of the selected PC, with no chance of failure or accidental poisoning.</li>
-<li>Stinking Cloud:(C 2, R 8)When cast, a 3x3 area you select becomes filled with choking gasses. Anyone entering will be cursed. The gas will slowly fade on its own.</li>
-<li>Summon Beast: (C 4)This spell summons one low-level non-magical monster to fight on your side. It disappears after a short time.</li>
-<li>Conflagration:(C 4, R 8) This spell makes the air in a radius 2 circle burst into flames, charring anyone inside the cloud. After creation, the cloud will rapidly fade.</li>
-<li>Dispel Field:(C 2, R 10) This spell erases a magical field in a target space. It does not work on certain powerful sorts of field.</li>
-<li>Sleep Cloud: (C 6)This spell creates a small sleep field around the target space.</li>
+<li>Minor Poison: (C 2, R 6) Poisons the target creature. This does a fair amount of damage, but it takes time to happen.</li>
+<li>Flame: (C 3, R 8) Fires a decent-sized bolt of flame at the target. The damage done increases with the level of the caster.</li>
+<li>Slow: (C 2, R 7) Makes the victim get half its usual number of actions for a while.</li>
+<li>Dumbfound: (C 2, R 10) Makes the victim incompetent: easier to hit, easier to damage, and less able to attack you.</li>
+<li>Envenom: (C 2) This spell puts poison on the weapon of the selected PC, with no chance of failure or accidental poisoning.</li>
+<li>Stinking Cloud: (C 2, R 8) When cast, a 3x3 area you select becomes filled with choking gasses. Anyone entering will be cursed. The gas will slowly fade on its own.</li>
+<li>Summon Beast: (C 4, R 3) This spell summons one low-level non-magical monster to fight on your side. It disappears after a short time.</li>
+<li>Conflagration: (C 4, R 8) This spell makes the air in a radius 2 circle burst into flames, charring anyone inside the cloud. After creation, the cloud will rapidly fade.</li>
+<li>Dispel Fields: (C 2, R 10) This spell erases magical fields in the target area. It does not work on magical barriers.</li>
+<li>Sleep Cloud: (C 6, R 6) This spell creates a small sleep field around the target space.</li>
 </ul>
 <h2>Level 3</h2>
 <ul>
-<li>Unlock: (C 3) Some doors are magically locked, and others are just hard to open. This spell will crack them. However, it isn’t guaranteed to succeed, and won’t work on all doors.</li>
-<li>Haste:(C 3)Makes the selected PC get twice the usual number of actions for a long time.</li>
-<li>Fireball:(C 5, R 12)Fires a powerful ball of flame, which affects</li>
+<li>Unlock: (C 3) Some doors are magically locked, and others are just hard to open. This spell will crack them. However, it isn't guaranteed to succeed, and won't work on all doors.</li>
+<li>Haste: (C 3) Makes the selected PC get twice the usual number of actions for a long time.</li>
+<li>Fireball: (C 5, R 12) Fires a powerful ball of flame, which affects</li>
 <li>the target space and every space adjacent. The damage done increases with the level of the caster.</li>
-<li>Long Light:(C 3)Like the first level light spell, but much more effective.</li>
-<li>Fear:(C 3, R 10)Like scare, but much more powerful.</li>
-<li>Wall of Force:(C 5, R 12)This powerful spell creates a line of force walls, which are like fire walls but more damaging and lasting. Hitting space while targeting this spell makes the wall rotate.</li>
-<li>Weak Summoning: (C 6, R 4)When cast, a group of monsters appears and attacks all enemies of the caster. The number of monsters depends on the level of the caster. After a time, they disappear.</li>
-<li>Flame Arrows:(C 4, R 10)This spell is like flame, but the caster gets to select several targets. The number of missiles increases with the level of the caster. If you don't want to use all the missiles, hit space to cast the spell.</li>
-<li>Web:(C 6, R 8) This spell covers a large circle with icky webs, slowing down everyone inside. The webs last until torn down.</li>
-<li>Resist Magic: (C 4)You can cast this spell on another PC to make him/her resistant to magical damage and effects. Note this does not help against damage from fire and cold.</li>
+<li>Long Light: (C 3) Like the first level light spell, but much more effective.</li>
+<li>Fear: (C 3, R 10) Like scare, but much more powerful.</li>
+<li>Wall of Force: (C 5, R 12) This powerful spell creates a line of force walls, which are like fire walls but more damaging and lasting. Hitting space while targeting this spell makes the wall rotate.</li>
+<li>Weak Summoning: (C 6, R 4) When cast, a group of monsters appears and attacks all enemies of the caster. The number of monsters depends on the level of the caster. After a time, they disappear.</li>
+<li>Flame Arrows: (C 4, R 10) This spell is like flame, but the caster gets to select several targets. The number of missiles increases with the level of the caster. If you don't want to use all the missiles, hit space to cast the spell.</li>
+<li>Web: (C 6, R 8) This spell covers a large circle with icky webs, slowing down everyone inside. The webs last until torn down.</li>
+<li>Resist Magic: (C 4) You can cast this spell on another PC to make him/her resistant to magical damage and effects. Note this does not help against damage from fire and cold.</li>
 </ul>
 <h2>Level 4</h2>
 <ul>
-<li>Poison:(C 4, R 8)This makes poison run thick in the veins of the target. Repeated castings will have a devastating effect.</li>
-<li>Ice Bolt:(C 5, R 12)Slams the target with a heavy, pointed bolt of ice. Effective against monsters who are resistant to fire. Damage increases as level of caster increases.</li>
-<li>Slow Group:(C 4, R 12)Makes all monsters within a 12 space radius move at half speed for a time.</li>
-<li>Magic Map:(C 8)This powerful spell gives you a vision of the entire level. Your map will show you the entire area. However, to cast this spell requires a sapphire.</li>
-<li>Capture Soul:(C 30, R 10) You need a Soul Crystal to cast this. When you cast it on a monster, you attempt to store a copy of it in your Soul Crystal, so you can later recreate it with the simulacrum spell. The stronger the monster, the lower the chance of success.</li>
-<li>Simulacrum:(C ?)This spell summons a monster you select from your Soul Crystal. The cost depends on the level of the monster being summoned.</li>
-<li>Venom Arrows:(C 8, R 8) This spell is similar to Flame Arrows, except that your targets become poisoned.</li>
-<li>Wall of Ice: (C 6, R 8)This spell is similar to Wall of Force, except that it creates an ice wall. Ice walls do as much damage as force walls, but last a lot longer.</li>
+<li>Poison: (C 4, R 8) This makes poison run thick in the veins of the target. Repeated castings will have a devastating effect.</li>
+<li>Ice Bolt: (C 5, R 12) Slams the target with a heavy, pointed bolt of ice. Effective against monsters who are resistant to fire. Damage increases as level of caster increases.</li>
+<li>Slow Group: (C 4, R 12) Makes all monsters within a 12 space radius move at half speed for a time.</li>
+<li>Magic Map: (C 8) This powerful spell gives you a vision of the entire level. Your map will show you the entire area. However, to cast this spell requires a sapphire.</li>
+<li>Capture Soul: (C 30, R 10) When you cast this on a monster, you attempt to store a "copy" of it in your mind, so you can later recreate it with the simulacrum spell. The stronger the monster, the lower the chance of success.</li>
+<li>Simulacrum: (C ?) This spell summons a monster you select from your mind, previously memorized with Capture Soul. The cost depends on the level of the monster being summoned.</li>
+<li>Venom Arrows: (C 8, R 8) This spell is similar to Flame Arrows, except that your targets become poisoned.</li>
+<li>Wall of Ice: (C 6, R 8) This spell is similar to Wall of Force, except that it creates an ice wall. Ice walls do as much damage as force walls, but last a lot longer.</li>
 </ul>
 <h2>Level 5</h2>
 <ul>
 <li>Stealth: (C 5) This powerful spell makes monsters less likely to see you for a time which depends on your level. Try casting it before walking through a room crowded with monsters.</li>
 <li>Major Haste: (C 8) Gives the entire party double the actions for a time depending on the level of the caster.</li>
-<li>Fire Storm:(C 8, R 14)This spell is like fireball, but does more damage, and affects all creatures within two spaces of the space you target. Be careful not to fry your party!</li>
-<li>Dispel Barrier:(C 6)In some towns, you will find magical barriers blocking you from certain areas. This spell will remove them. The chance of success starts low, but improves with the caster’s level. Some barriers are harder to dispel than others, some cannot be dispelled, and it is rumored some barriers can be walked through.</li>
-<li>Fire Barrier:(C 9) This spell creates a single fire barrier at the target space. Fire barriers are damaging and permanent.</li>
-<li>Summoning:(C 10) This spell is like Minor Summoning, but summons more powerful monsters.</li>
+<li>Fire Storm: (C 8, R 14) This spell is like fireball, but does more damage, and affects all creatures within two spaces of the space you target. Be careful not to fry your party!</li>
+<li>Dispel Barrier: (C 6) In some towns, you will find magical barriers blocking you from certain areas. This spell will remove them. The chance of success starts low, but improves with the caster's level. Some barriers are harder to dispel than others, some cannot be dispelled, and it is rumored some barriers can be walked through.</li>
+<li>Fire Barrier: (C 9, R 2) This spell creates a single fire barrier at the target space. Fire barriers are damaging and permanent.</li>
+<li>Summoning: (C 10, R 4) This spell is like Minor Summoning, but summons more powerful monsters.</li>
 <li>Shockstorm: (C 6, R 10) This spell creates a large sphere of force walls.</li>
 <li>Spray Fields: (C 6, R 12) This spell creates a large number of small fields of a random sort, each of which may be individually targeted. The number of fields increases with the level of the caster.</li>
 </ul>
 <h2>Level 6</h2>
 <ul>
-<li>Major Poison:(C 7, R 8)This spell makes the targeted monster very poisoned. This spell does a lot of damage, but it takes time to take effect.</li>
-<li>Group Fear:(C 6, R 12)When cast, the caster begins to radiate a horrible aura of fear. All monsters within 12 spaces lose a lot of morale. This spell gains effectiveness rapidly with the level of the caster.</li>
-<li>Kill:(C 8, R 6)The deadly Kill spell deals a devastating blow to one target you select.</li>
-<li>Paralyze: (C 7, R 8)This spell has a chance of paralyzing the target. Paralysis lasts for a very long time.</li>
-<li>Daemon:(C 12)This dangerous spell summons a beast from the netherworld to fight at your side.</li>
-<li>Antimagic Cloud: (C 10) This spell creates a spherical field, from which no spells may be cast and in which no spells may be targeted. After creation, it slowly fades.</li>
-<li>Mindduel:(C 12)When cast on a magic using enemy, the two creatures get in a mental battle, absorbing spell points from each other. The loser may end up dumbfounded or killed. Requires a Smoky Crystal to cast.</li>
-<li>Flight:(C 20)When cast outdoors, the party can fly for a short time.</li>
+<li>Major Poison: (C 7, R 8) This spell makes the targeted monster very poisoned. This spell does a lot of damage, but it takes time to take effect.</li>
+<li>Group Fear: (C 6, R 12) When cast, the caster begins to radiate a horrible aura of fear. All monsters within 12 spaces lose a lot of morale. This spell gains effectiveness rapidly with the level of the caster.</li>
+<li>Kill: (C 8, R 6) The deadly Kill spell deals a devastating blow to one target you select.</li>
+<li>Paralyze: (C 7, R 8) This spell has a chance of paralyzing the target. Paralysis lasts for a very long time.</li>
+<li>Daemon: (C 12, R 5) This dangerous spell summons a beast from the netherworld to fight at your side.</li>
+<li>Antimagic Cloud: (C 10, R 8) This spell creates a spherical field, from which no spells may be cast and in which no spells may be targeted. After creation, it slowly fades.</li>
+<li>Mindduel: (C 12, R 40) When cast on a magic using enemy, the two creatures get in a mental battle, absorbing spell points from each other. The loser may end up dumbfounded or killed. Requires a Smoky Crystal to cast.</li>
+<li>Flight: (C 20) When cast outdoors, the party can fly for a short time.</li>
 </ul>
 <h2>Level 7</h2>
 <ul>
-<li>Shockwave:(C 12)A dangerous spell. It sends a wave of force out from the caster, damaging everyonenearby--monsters and PCs. The farther someone is from the caster, the more damage is taken, out to a radius of 10. Don’t cast this spell in towns.</li>
-<li>Major Blessing:(C 8)When cast, the entire party is blessed and hasted, and has their weapons mildly poisoned.</li>
-<li>Mass Paralysis: (C 20, R 8)This spell has a chance of paralyzing any foes within 8 spaces of the caster. Very dangerous.</li>
-<li>Protection:(C 10)One of the most powerful spells in the mage’s repertoire. It makes the whole party temporarily magic resistant, and makes one PC you select immune to ALL damage for a short time.</li>
-<li>Major Summoning: (C 14)This spell works like Summoning, but brings forth much more powerful creatures.</li>
-<li>Force Barrier: (C 10)This spell creates an impenetrable, permanent barrier. Be careful not to trap yourself.</li>
-<li>Quickfire: (C 50) Devastating beyond words, this spell creates a space of quickfire, which will sweep over the area killing everyone and everything.</li>
+<li>Shockwave: (C 12) A dangerous spell. It sends a wave of force out from the caster, damaging everyonenearby--monsters and PCs. The farther someone is from the caster, the more damage is taken, out to a radius of 10. Don't cast this spell in towns - they might get angry.</li>
+<li>Major Blessing: (C 8) When cast, the entire party is blessed and hasted, and has their weapons mildly poisoned.</li>
+<li>Mass Paralysis: (C 20, R 8) This spell has a chance of paralyzing any foes within 8 spaces of the caster. Very dangerous.</li>
+<li>Protection: (C 10) One of the most powerful spells in the mage's repertoire. It makes the whole party temporarily magic resistant, and makes one PC you select immune to ALL damage for a short time.</li>
+<li>Major Summoning: (C 14, R 4) This spell works like Summoning, but brings forth much more powerful creatures.</li>
+<li>Force Barrier: (C 10, R 2) This spell creates an impenetrable, permanent barrier. Be careful not to trap yourself.</li>
+<li>Quickfire: (C 50, R 4) Devastating beyond words, this spell creates a space of quickfire, which will sweep over the area killing everyone and everything.</li>
 <li>Death Arrows: (C 10, R 6) This spell is like the previous Arrow spells, but strikes each target with a kill spell. The number of arrows increases with the level of the caster.</li>
 </ul>
 </div></body>
diff --git a/doc/game/Priest.html b/doc/game/Priest.html
index f1fd0f7b..e198bfc8 100644
--- a/doc/game/Priest.html
+++ b/doc/game/Priest.html
@@ -19,41 +19,41 @@
 <ul>
 <li>Minor Bless: (C 1) Makes the character harder to hit and take less damage from blows. It also makes the PC hit more often, and his or her blows do more damage. Its effects decay with time.</li>
 <li>Minor Heal: (C 1) Increases the health of the selected PC a small amount, up to the PCs maximum health.</li>
-<li>Weaken Poison: (C 1)Reduces the amount of poison running around in the veins of the selected PC.</li>
-<li>Turn Undead: (C 2, R 8)When cast on an undead creature, it usually does a reasonable amount of damage to it. It has no effect on non-undead.</li>
-<li>Location: (C 1)Returns the party’s x-y location in the town or outdoors.</li>
+<li>Weaken Poison: (C 1) Reduces the amount of poison running around in the veins of the selected PC.</li>
+<li>Turn Undead: (C 2, R 8) When cast on an undead creature, it usually does a reasonable amount of damage to it. It has no effect on non-undead.</li>
+<li>Location: (C 1) Returns the party's x-y location in the town or outdoors.</li>
 <li>Sanctuary: (C 1) The target of this spell becomes magically shielded.</li>
 <li>For a time, monsters probably won't be able to attack him/her. The effects disappears when the PC attacks someone.</li>
-<li>Symbiosis: (C 3)This spell has the caster absorb the damage taken by another character. The higher the caster’s level, the less damage the caster takes per health point healed.</li>
-<li>Minor Manna: (C 5)Casting this spell gives the party a little more food.</li>
+<li>Symbiosis: (C 3) This spell has the caster absorb the damage taken by another character. The higher the caster's level, the less damage the caster takes per health point healed.</li>
+<li>Minor Manna: (C 5) Casting this spell gives the party a little more food.</li>
 <li>Ritual - Sanctify: (C 50) When cast on a location filled with evil magic, the location receives a blessing. This might drive out the evil magic. Then again, it might not.</li>
-<li>Stumble: (C 1)The victim of this spell moves slower and has worse attacks for a short time.</li>
+<li>Stumble: (C 1, R 10) The victim of this spell moves slower and has worse attacks for a short time.</li>
 
 </ul>
 <h2>Level 2</h2>
 <ul>
-<li>Bless: (C 2)Like Minor Bless, but better. Its effect increases with the level of the caster.</li>
-<li>Cure Poison: (C 2)Like Weaken Poison, but better. Its effect increases with the level of the caster.</li>
+<li>Bless: (C 2) Like Minor Bless, but better. Its effect increases with the level of the caster.</li>
+<li>Cure Poison: (C 2) Like Weaken Poison, but better. Its effect increases with the level of the caster.</li>
 <li>Curse: (C 2, R 10) The opposite of bless. It makes everything work much worse for the victim, for a time.</li>
-<li>Light: (C 2)Gives a short, reasonable quality magical light source.</li>
-<li>Wound: (C 3, R 5)Deals a painful blow to the targeted victim. The damage increases with your level.</li>
-<li>Summon Spirit: (C 5) This spell summons a shade from the netherworld to aid you. It will disappear after a short time.</li>
+<li>Light: (C 2) Gives a short, reasonable quality magical light source.</li>
+<li>Wound: (C 3, R 6) Deals a painful blow to the targeted victim. The damage increases with your level.</li>
+<li>Summon Spirit: (C 5, R 4) This spell summons a shade from the netherworld to aid you. It will disappear after a short time.</li>
 <li>Move Mountains: (C 8) When cast on a fragile wall or outcropping of rock, the wall or outcropping crumbles into rubble. It doesn't work on all walls.</li>
 <li>Charm Foe: (C 6, R 6) This spell has a chance of making the target monster start to fight for the party. The chance of it working drops sharply with the level of the monster.</li>
-<li>Disease: (C 4)The victim of this spell is afflicted by a disease, which slowly weakens it. The disease lasts a long time.</li>
-<li>Awaken: (C 2)Casting this on a character immediately wakes him/her up.</li>
+<li>Disease: (C 4, R 6) The victim of this spell is afflicted by a disease, which slowly weakens it. The disease lasts a long time.</li>
+<li>Awaken: (C 2) Casting this on a character immediately wakes him/her up.</li>
 
 </ul>
 <h2>Level 3</h2>
 <ul>
-<li>Heal: (C 3)A much better version of Minor Heal.</li>
-<li>Minor Heal All: (C 4) Casts one minor heal on each PC.</li>
-<li>Holy Scourge: (C 3, R 8)This spell gives the victim a powerful curse, the effect of which increases with the level of the caster.</li>
-<li>Detect Life: (C 3)This spell causes all other living things to appear on your map for a short time. Note, however, that this spell only detects creatures in areas you have explored.</li>
+<li>Heal: (C 3) A much better version of Minor Heal.</li>
+<li>Light Heal All: (C 4) Casts one minor heal on each PC.</li>
+<li>Holy Scourge: (C 3, R 8) This spell gives the victim a powerful curse, the effect of which increases with the level of the caster.</li>
+<li>Detect Life: (C 3) This spell causes all other living things to appear on your map for a short time. Note, however, that this spell only detects creatures in areas you have explored.</li>
 <li>Cure Paralysis: (C 3) This spell revives a paralyzed character.</li>
-<li>Manna: (C 10)This spell magically creates a lot of food for the party.</li>
+<li>Manna: (C 10) This spell magically creates a lot of food for the party.</li>
 <li>Forcefield: (C 5, R 8) This spell fills an area with walls of force,which are fairly damaging and reasonably long lasting.</li>
-<li>Cure Disease: (C 3)Casting this spell cures a PC’s disease.</li>
+<li>Cure Disease: (C 3) Casting this spell cures a PC's disease.</li>
 <li>Restore Mind: (C 4) This spell completely undumbfounds the recipient.</li>
 <li>Smite: (C 6, R 8) This spell fires a number of bolts of divinely inspired cold, the number of which increases with the level of the caster. To cast without using all the targets, hit the space bar.</li>
 
@@ -61,49 +61,49 @@
 <h2>Level 4</h2>
 <ul>
 <li>Cure All Poison: (C 5) Causes everyone to become less poisoned. Useful for dealing with those nasty swamps.</li>
-<li>Curse All: (C 5, R 10)Causes all monsters within ten spaces to receive a powerful curse.</li>
-<li>Dispel Undead: (C 5, R 8)Deals a deadly blow to the targeted undead nasty. Chance of having effect increases with level.</li>
-<li>Remove Curse: (C 15)Occasionally, you will put on an item which then refuses to be taken off. Casting this spell has a chance of removing the curse.</li>
-<li>Sticks to Snakes: (C 6) This spell summons a bunch of snakes to aid the party. Skillful casters have a chance of getting asps instead of the weaker giant snakes.</li>
-<li>Martyr's Shield: (C 5)When something strikes the recipient of this spell in hand-to-hand combat, it takes as much damage as the victim. The duration of this spell increases with the level of the caster.</li>
-<li>Cleanse: (C 5)This spell purifies the recipient. The beneficiary is completely unwebbed, and all disease is cured.</li>
-<li>Firewalk: (C 8)When cast, for a short time everyone in the party can walk across lava with no damage. The duration increases slowly with the level of the caster.</li>
+<li>Curse All: (C 5, R 10) Causes all monsters within ten spaces to receive a powerful curse.</li>
+<li>Dispel Undead: (C 5, R 8) Deals a deadly blow to the targeted undead nasty. Chance of having effect increases with level.</li>
+<li>Remove Curse: (C 15) Occasionally, you will put on an item which then refuses to be taken off. Casting this spell has a chance of removing the curse.</li>
+<li>Sticks to Snakes: (C 6, R 6) This spell summons a bunch of snakes to aid the party. Skillful casters have a chance of getting asps instead of the weaker giant snakes.</li>
+<li>Martyr's Shield: (C 5) When something strikes the recipient of this spell in hand-to-hand combat, it takes as much damage as the victim. The duration of this spell increases with the level of the caster.</li>
+<li>Cleanse: (C 5) This spell purifies the recipient. The beneficiary is completely unwebbed, and all disease is cured.</li>
+<li>Firewalk: (C 8) When cast, for a short time everyone in the party can walk across lava with no damage. The duration increases slowly with the level of the caster.</li>
 
 </ul>
 <h2>Level 5</h2>
 <ul>
-<li>Bless Party: (C 6)Much like Bless, but affects everyone.</li>
-<li>Major Heal: (C 7)Works like the Heal spell, but gives much more bang for the spell points.</li>
-<li>Raise Dead: (C 25)This spell returns a dead character to life. However, you need to have Resurrection Balm for the spell to work, and there is a small chance (decreasing with your level) that it turns the corpse to dust. A dusted character can only be revived with a Resurrect spell.</li>
-<li>Flamestrike: (C 8, R 9)The first good offensive priest spell. It chars all beings adjacent to the space you target. The damage done increases with level.</li>
-<li>Mass Sanctuary: (C 10)This spell hides all PCs (like a sanctuary spell). As before, the effect for a PC is voided when that PC attacks.</li>
-<li>Summon Host: (C 12)This powerful spell summons four spirits, and a magical being to lead them. They then fight on the side of the caster for a little while.</li>
-<li>Shatter: (C 12)This spell strikes every space adjacent to the party with a Move Mountains spell.</li>
-<li>Dispel Fields: (C 6)All magical walls, etc. in the large area affected by this spell will be dispelled. It has a small chance of affecting quickfire.</li>
+<li>Bless Party: (C 6) Much like Bless, but affects everyone.</li>
+<li>Major Heal: (C 7) Works like the Heal spell, but gives much more bang for the spell points.</li>
+<li>Raise Dead: (C 25) This spell returns a dead character to life. However, you need to have Resurrection Balm for the spell to work, and there is a small chance (decreasing with your level) that it turns the corpse to dust. A dusted character can only be revived with a Resurrect spell.</li>
+<li>Flamestrike: (C 8, R 9) The first good offensive priest spell. It chars all beings adjacent to the space you target. The damage done increases with level.</li>
+<li>Mass Sanctuary: (C 10) This spell hides all PCs (like a sanctuary spell). As before, the effect for a PC is voided when that PC attacks.</li>
+<li>Summon Host: (C 12, R 4) This powerful spell summons four spirits, and a magical being to lead them. They then fight on the side of the caster for a little while.</li>
+<li>Shatter: (C 12) This spell strikes every space adjacent to the party with a Move Mountains spell.</li>
+<li>Dispel Fields: (C 6, R 8) All magical walls, etc. in the large area affected by this spell will be dispelled. It has a small chance of affecting quickfire.</li>
 
 </ul>
 <h2>Level 6</h2>
 <ul>
 <li>Heal All: (C 8) Like the Heal spell, but affects the whole party. Very efficient.</li>
-<li>Revive: (C 7)This heals all damage and cures all poison for a PC.</li>
+<li>Revive: (C 7) This heals all damage and cures all poison for a PC.</li>
 <li>Hyperactivity: (C 8) This spell wakes up all PCs, and provides a small amount of magical protection from sleeping.</li>
 <li>Destone: (C 8) Certain rare monsters can turn one of your characters to stone. This valuable spell undoes the damage.</li>
-<li>Summon Guardian: (C 14)This spell summons a powerful, invisible being to fight on the side of the party. Be careful not to damage it by mistake!</li>
-<li>Mass Charm: (C 17)When cast, all creatures within eight spaces of the caster have a chance of coming under his/her control.</li>
-<li>Protective Circle: (C 8)A very unusual and effective spell for a party on the defensive. The caster is surrounded by several layers of magical fields, which fend off anyone attacking.</li>
-<li>Pestilence: (C 7)This spell afflicts everyone within eight spaces with an effective but slow-acting disease.</li>
+<li>Summon Guardian: (C 14, R 4) This spell summons a powerful, invisible being to fight on the side of the party. Be careful not to damage it by mistake!</li>
+<li>Mass Charm: (C 17, R 8) When cast, all creatures within eight spaces of the caster have a chance of coming under his/her control.</li>
+<li>Protective Circle: (C 8) A very unusual and effective spell for a party on the defensive. The caster is surrounded by several layers of magical fields, which fend off anyone attacking.</li>
+<li>Pestilence: (C 7, R 8) This spell afflicts everyone within eight spaces with an effective but slow-acting disease.</li>
 
 </ul>
 <h2>Level 7</h2>
 <ul>
 <li>Revive All: (C 10) When cast, the party receives a powerful healing (increasing with level of the caster) and has poison cured as well.</li>
 <li>Ravage Spirit: (C 10, R 4) Demons have a nasty tendency to resist anyspells you throw at them.This spell gives them a blow which, most of the time, does a lot of damage. The chance of success increases with the level of the caster.</li>
-<li>Resurrect: (C 35)Like raise dead, but much more effective, and works on even a dusted character. It still requires Resurrection Balm to cast.</li>
-<li>Divine Thud: (C 10, R 12)The most powerful offensive priest spell. It delivers a stunning blow of force to all beings within two spaces of the targeted space.</li>
-<li>Avatar: (C 12)This spell temporarily makes the caster an invulnerable, incredibly powerful avatar of the gods.</li>
+<li>Resurrect: (C 35) Like raise dead, but much more effective, and works on even a dusted character. It still requires Resurrection Balm to cast.</li>
+<li>Divine Thud: (C 10, R 12) The most powerful offensive priest spell. It delivers a stunning blow of force to all beings within two spaces of the targeted space.</li>
+<li>Avatar: (C 12) This spell temporarily makes the caster an invulnerable, incredibly powerful avatar of the gods.</li>
 <li>Wall of Blades: (C 12, R 10) This spell creates a wall of the most damaging (and long lasting) of the magic walls. Rotate the wall by hitting space.</li>
 <li>Word of Recall: (C 30) This spell returns the party to the town where you began the scenario. Because of the danger of teleporting from narrow, windy tunnels, it can only be cast outdoors.</li>
-<li>Major Cleansing: (C 10)This spell removes all webs and disease from the party.</li>
+<li>Major Cleansing: (C 10) This spell removes all webs and disease from the party.</li>
 </ul>
 </div></body>
 </html>
diff --git a/osx/BoE.xcodeproj/project.pbxproj b/osx/BoE.xcodeproj/project.pbxproj
index fc51194d..61874188 100644
--- a/osx/BoE.xcodeproj/project.pbxproj
+++ b/osx/BoE.xcodeproj/project.pbxproj
@@ -330,6 +330,8 @@
 		915325171A2E1DF0000A9A1C /* oldstructs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915325161A2E1DA8000A9A1C /* oldstructs.cpp */; };
 		915325391A2E5F36000A9A1C /* specials_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915325181A2E37EE000A9A1C /* specials_parse.cpp */; };
 		9153253B1A2E5F37000A9A1C /* specials_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915325181A2E37EE000A9A1C /* specials_parse.cpp */; };
+		91597A6F1A3C021400BE7BF9 /* spell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91597A6E1A3BEDC700BE7BF9 /* spell.cpp */; };
+		91597A701A3C021600BE7BF9 /* spell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91597A6E1A3BEDC700BE7BF9 /* spell.cpp */; };
 		915E090A1A316EE3008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; };
 		915E090B1A316EE4008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; };
 		915E090C1A317E2E008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; };
@@ -1250,6 +1252,8 @@
 		914CA49F190C4E9200B6ADD1 /* scen.menu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = scen.menu.xib; sourceTree = "<group>"; };
 		915325161A2E1DA8000A9A1C /* oldstructs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = oldstructs.cpp; path = ../oldstructs.cpp; sourceTree = "<group>"; };
 		915325181A2E37EE000A9A1C /* specials_parse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = specials_parse.cpp; sourceTree = "<group>"; };
+		91597A6C1A3BED2D00BE7BF9 /* spell.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = spell.hpp; sourceTree = "<group>"; };
+		91597A6E1A3BEDC700BE7BF9 /* spell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spell.cpp; sourceTree = "<group>"; };
 		915E09071A316D6A008BDF00 /* map_parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = map_parse.hpp; sourceTree = "<group>"; };
 		915E09081A316D89008BDF00 /* map_parse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_parse.cpp; sourceTree = "<group>"; };
 		917B573F100B956C0096C978 /* undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = undo.h; sourceTree = "<group>"; };
@@ -1649,6 +1653,7 @@
 				91AC607F0FA26A3B00EEAE67 /* regtown.cpp */,
 				91279C580F9D1253007B0D52 /* scenario.cpp */,
 				91279CC60F9D1A02007B0D52 /* special.cpp */,
+				91597A6E1A3BEDC700BE7BF9 /* spell.cpp */,
 				91E5C7B70F9F619D00C21460 /* talking.cpp */,
 				91279C660F9D12D6007B0D52 /* terrain.cpp */,
 				91AC60A70FA26C1B00EEAE67 /* tmpltown.cpp */,
@@ -1673,6 +1678,7 @@
 				91279C570F9D1253007B0D52 /* scenario.h */,
 				912287850FD41A2300B21642 /* simpletypes.h */,
 				91279CC50F9D1A02007B0D52 /* special.h */,
+				91597A6C1A3BED2D00BE7BF9 /* spell.hpp */,
 				91E5C7B60F9F619D00C21460 /* talking.h */,
 				91279C650F9D12D6007B0D52 /* terrain.h */,
 				91AC60A60FA26C1B00EEAE67 /* tmpltown.h */,
@@ -2407,6 +2413,7 @@
 				915325171A2E1DF0000A9A1C /* oldstructs.cpp in Sources */,
 				9153253B1A2E5F37000A9A1C /* specials_parse.cpp in Sources */,
 				915E090A1A316EE3008BDF00 /* map_parse.cpp in Sources */,
+				91597A6F1A3C021400BE7BF9 /* spell.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2519,6 +2526,7 @@
 				91870F83190C8C1F0081C150 /* tarball.cpp in Sources */,
 				915325391A2E5F36000A9A1C /* specials_parse.cpp in Sources */,
 				915E090B1A316EE4008BDF00 /* map_parse.cpp in Sources */,
+				91597A701A3C021600BE7BF9 /* spell.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/osx/boe.actions.cpp b/osx/boe.actions.cpp
index 4fd39fd9..6467e233 100644
--- a/osx/boe.actions.cpp
+++ b/osx/boe.actions.cpp
@@ -34,6 +34,7 @@
 #include "boe.menus.h"
 #include "winutil.h"
 #include "cursors.h"
+#include "spell.hpp"
 
 RECT bottom_buttons[7];
 RECT town_buttons[10];
@@ -62,22 +63,6 @@ extern bool flushingInput;
 bool ghost_mode;
 RECT startup_top;
 
-// For menu spell casting, some info needs to be stored up here.
-short refer_mage[62] = {
-	0,2,1,1,2,2,0,2,2,0, 2,2,2,2,1,2,2,2,2,2, 0,1,2,0,2,2,3,3,2,1,
-	2,2,1,0,2,2,3,2, 0,1,2,0,2,3,2,3, 2,1,2,3,2,2,2,0, 1,1,1,0,3,2,2,3};
-short refer_priest[62] = {
-	1,0,0,2,0,0,0,0,0,2, 1,0,2,0,2,2,0,2,3,0, 0,0,2,0,0,0,2,0,0,3,
-	0,1,2,0,3,0,0,0, 1,0,0,2,0,3,0,2, 0,0,0,0,2,1,1,1, 0,2,0,2,1,2,0,0};
-// 0 - refer  1 - do in combat immed.  2 - need targeting  3 - need fancy targeting
-short mage_need_select[62] = {
-	0,0,1,1,0,0,0,0,0,0, 0,0,0,0,1,0,0,0,0,0, 0,1,0,0,0,0,0,0,0,1,
-	0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,1,0,0,0,0};
-short priest_need_select[62] = {
-	1,1,1,0,0,1,1,0,0,0, 1,1,0,0,0,0,0,0,0,1, 1,0,0,0,1,0,0,1,1,0,
-	0,0,0,1,0,1,1,0, 0,1,2,0,0,0,0,0, 0,1,0,2,0,0,0,0, 0,0,2,0,0,0,0,0};
-// 0 - no select  1 - active only  2 - any existing
-
 // TODO: The duplication of RECT here shouldn't be necessary...
 cItemRec start_items[6] = {cItemRec('nife'),cItemRec('buck'),cItemRec('bow '),cItemRec('arrw'),cItemRec('pole'),cItemRec('helm')};
 bool item_area_button_active[8][6];
@@ -111,7 +96,8 @@ extern sf::RenderWindow mainPtr;
 //extern big_tr_type t_d;
 //extern unsigned char out[96][96],out_e[96][96];
 extern short which_item_page[6];
-extern short store_spell_target,pc_casting,store_mage,store_priest;
+extern short store_spell_target,pc_casting;
+extern eSpell store_mage, store_priest;
 //extern town_item_list	t_i; // shouldn't be here
 //extern unsigned char misc_i[64][64];
 extern short spec_item_array[60];
@@ -1443,8 +1429,9 @@ bool someone_awake()
 }
 
 
-void handle_menu_spell(short spell_picked,eSkill spell_type)
+void handle_menu_spell(eSpell spell_picked)
 {
+	eSkill spell_type = (*spell_picked).type;
 	if(!prime_time()) {
 		ASB("Finish what you're doing first.");
 		print_buf();
@@ -1459,13 +1446,13 @@ void handle_menu_spell(short spell_picked,eSkill spell_type)
 	if(spell_type == eSkill::MAGE_SPELLS)
 		store_mage = spell_picked;
 	else store_priest = spell_picked;
-	if(spell_type == eSkill::MAGE_SPELLS && mage_need_select[spell_picked] > 0) {
-		if ((store_spell_target = char_select_pc(2 - mage_need_select[spell_picked],0,"Cast spell on who?")) == 6)
+	if(spell_type == eSkill::MAGE_SPELLS && (*spell_picked).need_select != SELECT_NO) {
+		if ((store_spell_target = char_select_pc((*spell_picked).need_select == SELECT_ANY ? 0 : 1,0,"Cast spell on who?")) == 6)
 			return;
 	}
 	else {
-		if(spell_type == eSkill::PRIEST_SPELLS && priest_need_select[spell_picked] > 0)
-			if ((store_spell_target = char_select_pc(2 - priest_need_select[spell_picked],0,"Cast spell on who?")) == 6)
+		if(spell_type == eSkill::PRIEST_SPELLS && (*spell_picked).need_select != SELECT_NO)
+			if ((store_spell_target = char_select_pc((*spell_picked).need_select == SELECT_ANY ? 0 : 1,0,"Cast spell on who?")) == 6)
 				return;
 	}
 /*	if ((is_combat()) && (((spell_type == 0) && (refer_mage[spell_picked] > 0)) ||
diff --git a/osx/boe.combat.cpp b/osx/boe.combat.cpp
index 25175f9a..ffc95e4d 100644
--- a/osx/boe.combat.cpp
+++ b/osx/boe.combat.cpp
@@ -23,6 +23,7 @@
 #include "mathutil.h"
 #include "dlogutil.h"
 #include "boe.menus.h"
+#include "spell.hpp"
 
 //extern party_record_type party;
 //extern current_town_type univ.town;
@@ -39,7 +40,7 @@ extern short combat_active_pc;
 extern bool monsters_going,spell_forced;
 extern bool flushingInput;
 extern sf::RenderWindow mainPtr;
-extern short store_mage, store_priest;
+extern eSpell store_mage, store_priest;
 extern short store_mage_lev, store_priest_lev,store_item_spell_level;
 extern short store_spell_target,pc_casting,current_spell_range;
 extern effect_pat_type current_pat;
@@ -51,13 +52,13 @@ extern bool in_scen_debug;
 extern bool fast_bang;
 //extern unsigned char misc_i[64][64],sfx[64][64];
 extern short store_current_pc;
-extern short refer_mage[62],refer_priest[62];
 //extern location monster_targs[60];
 extern short combat_posing_monster , current_working_monster ; // 0-5 PC 100 + x - monster x
 extern cScenario scenario;
 extern short spell_caster, missile_firer,current_monst_tactic;
 char create_line[60];
-short spell_being_cast;
+eSpell spell_being_cast;
+bool spell_freebie;
 short missile_inv_slot, ammo_inv_slot;
 short force_wall_position = 10; //  10 -> no force wall
 bool processing_fields = true;
@@ -74,25 +75,6 @@ short hit_chance[51] = {
 	,99,99,99,99,99,99,99,99,99,99,
 	99,99,99,99,99,99,99,99,99,99};
 
-
-//short s_cost[2][62] = {
-//	{1,1,1,1,1,2,15,2,1,3, 2,2,2,2,2,2,4,6,2,2, 3,3,4,3,3,5,5,4,6,4,/
-//	4,4,4,4,30,-1,8,5, 5,8,7,5,8,10,5,7, 6,6,7,7,12,10,-1,20, 12,8,20,8,14,10,50,10},
-//	{1,1,1,2,1,2,2,5,50,1, 2,2,2,2,2,6,8,7,4,3, 3,4,3,3,3,10,6,3,3,7,
-//		4,5,5,15,8,6,4,4, 5,5,25,8,12,12,10,5, 7,6,6,8,14,20,7,6, 8,7,20,12,8,12,30,8}};
-short s_cost[2][62] = {
-	{1,1,1,1,1,2,50,2,1,3, 2,3,2,2,2,2,4,4,2,6, 3,3,5,3,3,5,6,4,6,4,
-	4,5,4,8,30,-1,8,6, 5,8,8,6,9,10,6,6, 7,6,8,7,12,10,12,20, 12,8,20,10,14,10,50,10},
-	{1,1,1,2,1,1,3,5,50,1, 2,2,2,2,3,5,8,6,4,2, 3,4,3,3,3,10,5,3,4,6,
-		5,5,5,15,6,5,5,8, 6,7,25,8,10,12,12,6, 8,7,8,8,14,17,8,7, 10,10,35,10,12,12,30,10}};
-
-short mage_range[80] = {
-	0,6,0,0,7,7,0,14,8,0, 6,8,7,10,0,8,3,8,10,6, 0,0,12,0,10,12,4,10,8,0,
-	8,12,12,0,10,4,8,8, 0,0,14,0,2,4,10,12, 8,12,6,8,5,8,4,0, 0,0,8,0,4,2,4,6
-	,10,8,8,12,8,10,10,10, 10,10,10,10,10,10,10,10,10,10};
-short priest_range[62] = {
-	0,0,0,8,0,0,0,0,0,10, 0,0,10,0,6,4,0,6,6,8, 0,0,8,0,10,0,8,0,0,8,
-	0,10,8,0,6,0,0,0, 0,0,0,9,0,4,0,8, 0,0,10,0,4,8,0,8, 0,4,0,12,0,10,0,0};
 short monst_mage_spell[55] = {
 	1,1,1,1,1,1,2,2,2,2,
 	2,2,3,3,3,3,3,4,4,4,
@@ -858,11 +840,11 @@ void place_target(location target)
 			add_string_to_buf("  Can't see target.           ");
 			return;
 		}
-		if (dist(univ.party[current_pc].combat_pos,target) > ((spell_being_cast >= 100) ? priest_range[spell_being_cast - 100] : mage_range[spell_being_cast]))  {
+		if (dist(univ.party[current_pc].combat_pos,target) > (*spell_being_cast).range)  {
 			add_string_to_buf("  Target out of range.");
 			return;
 		}
-		if(sight_obscurity(target.x,target.y) == 5 && spell_being_cast != 41) {
+		if(sight_obscurity(target.x,target.y) == 5 && spell_being_cast != eSpell::DISPEL_BARRIER) {
 			add_string_to_buf("  Target space obstructed.           ");
 			return;
 		}
@@ -895,19 +877,9 @@ void place_target(location target)
 	}
 }
 
-// Special spells:
-//   62 - Carrunos
-//	 63 - Summon Rat
-//	 64 - Ice Wall Balls
-//	 65 - Goo Bomb
-//   66 - Foul vapors
-//	 67 - SLeep cloud
-//	 68 - Acid spray
-//   69 - Paralyze beam
-//   70 - mass sleep
 void do_combat_cast(location target)////
 {
-	short adjust,r1,r2,targ_num,s_num,level,bonus = 1,i,item,store_sound = 0;
+	short adjust,r1,r2,targ_num,level,bonus = 1,i,item,store_sound = 0;
 	cCreature *cur_monst;
 	bool freebie = false,ap_taken = false,cost_taken = false;
 	short num_targets = 1,store_m_type = 2;
@@ -928,8 +900,7 @@ void do_combat_cast(location target)////
 	eDamageType boom_type[8];
 	location boom_targ[8];
 	
-	if (spell_being_cast >= 1000) {
-		spell_being_cast -= 1000;
+	if(spell_freebie) {
 		freebie = true;
 		level = store_item_spell_level;
 		level = minmax(2,20,level);
@@ -939,7 +910,6 @@ void do_combat_cast(location target)////
 		bonus = stat_adj(current_pc,eSkill::INTELLIGENCE);
 	}
 	force_wall_position = 10;
-	s_num = spell_being_cast % 100;
 	
 	void_sanctuary(current_pc);
 	if (overall_mode == MODE_SPELL_TARGET) {
@@ -952,17 +922,14 @@ void do_combat_cast(location target)////
 	spell_caster = current_pc;
 	
 	// assign monster summoned, if summoning
-	if (spell_being_cast == 16) {
+	if(spell_being_cast == eSpell::SUMMON_BEAST) {
 		summon = get_summon_monster(1);
 		
-	}
-	if (spell_being_cast == 26) {
+	} else if (spell_being_cast == eSpell::SUMMON_WEAK) {
 		summon = get_summon_monster(1);
-	}
-	if (spell_being_cast == 43) {
+	} else if (spell_being_cast == eSpell::SUMMON) {
 		summon = get_summon_monster(2);
-	}
-	if (spell_being_cast == 58) {
+	} else if (spell_being_cast == eSpell::SUMMON_MAJOR) {
 		summon = get_summon_monster(3);
 	}
 	combat_posing_monster = current_working_monster = current_pc;
@@ -972,11 +939,11 @@ void do_combat_cast(location target)////
 			target = spell_targets[i];
 			spell_targets[i].x = 120; // nullify target as it is used
 			
-			if ((cost_taken == false) && (freebie == false) && (s_num != 52) && (s_num != 35)) {
-				univ.party[current_pc].cur_sp -= s_cost[spell_being_cast / 100][s_num];
+			if(!cost_taken && !freebie && spell_being_cast != eSpell::MINDDUEL && spell_being_cast != eSpell::SIMULACRUM) {
+				univ.party[current_pc].cur_sp -= (*spell_being_cast).cost;
 				cost_taken = true;
 			}
-			if ((cost_taken == false) && (freebie == false) && (s_num == 35)) {
+			if(!cost_taken && !freebie && spell_being_cast == eSpell::SIMULACRUM) {
 				univ.party[current_pc].cur_sp -=	store_sum_monst_cost;
 				cost_taken = true;
 			}
@@ -987,9 +954,9 @@ void do_combat_cast(location target)////
 			else if (loc_off_act_area(target) == true) {
 				add_string_to_buf("  Space not in town.           ");
 			}
-			else if (dist(univ.party[current_pc].combat_pos,target) > ((spell_being_cast >= 100) ? priest_range[spell_being_cast - 100] : mage_range[spell_being_cast]))
+			else if (dist(univ.party[current_pc].combat_pos,target) > (*spell_being_cast).range)
 				add_string_to_buf("  Target out of range.");
-			else if(sight_obscurity(target.x,target.y) == 5 && spell_being_cast != 41)
+			else if(sight_obscurity(target.x,target.y) == 5 && spell_being_cast != eSpell::DISPEL_BARRIER)
 				add_string_to_buf("  Target space obstructed.           ");
 			else if (univ.town.is_antimagic(target.x,target.y))
 				add_string_to_buf("  Target in antimagic field.");
@@ -1003,41 +970,41 @@ void do_combat_cast(location target)////
 				boom_targ[i] = target;
 				switch (spell_being_cast) {
 						
-					case 8: case 28: case 65: // web spells
+					case eSpell::GOO: case eSpell::WEB: case eSpell::GOO_BOMB:
 						place_spell_pattern(current_pat,target,FIELD_WEB,current_pc);
 						break;
-					case 5: case 17: // fire wall spells
+					case eSpell::CLOUD_FLAME: case eSpell::CONFLAGRATION:
 						place_spell_pattern(current_pat,target,WALL_FIRE,current_pc);
 						break;
-					case 15: case 66: // stink cloud
+					case eSpell::CLOUD_STINK: case eSpell::FOUL_VAPOR:
 						place_spell_pattern(current_pat,target,CLOUD_STINK,current_pc);
 						break;
-					case 25: case 44: case 126: // force walls
+					case eSpell::WALL_FORCE: case eSpell::SHOCKSTORM: case eSpell::FORCEFIELD:
 						place_spell_pattern(current_pat,target,WALL_FORCE,current_pc);
 						break;
-					case 37: case 64: // ice walls
+					case eSpell::WALL_ICE: case eSpell::WALL_ICE_BALL:
 						place_spell_pattern(current_pat,target,WALL_ICE,current_pc);
 						break;
-					case 51: // antimagic
+					case eSpell::ANTIMAGIC:
 						place_spell_pattern(current_pat,target,FIELD_ANTIMAGIC,current_pc);
 						break;
-					case 19: case 67: // sleep clouds
+					case eSpell::CLOUD_SLEEP: case eSpell::CLOUD_SLEEP_LARGE:
 						place_spell_pattern(current_pat,target,CLOUD_SLEEP,current_pc);
 						break;
-					case 60:
+					case eSpell::QUICKFIRE:
 						univ.town.set_quickfire(target.x,target.y,true);
 						break;
-					case 45: // spray fields
+					case eSpell::SPRAY_FIELDS:
 						r1 = get_ran(1,0,14);
 						place_spell_pattern(current_pat,target,spray_type_array[r1],current_pc);
 						break;
-					case 159:  // wall of blades
+					case eSpell::WALL_BLADES:
 						place_spell_pattern(current_pat,target,WALL_BLADES,current_pc);
 						break;
-					case 145: case 119: case 18: // wall dispelling
+					case eSpell::DISPEL_FIELD: case eSpell::DISPEL_SPHERE: case eSpell::DISPEL_SQUARE:
 						place_spell_pattern(current_pat,target,FIELD_DISPEL,current_pc);
 						break;
-					case 42: // Fire barrier
+					case eSpell::BARRIER_FIRE:
 						play_sound(68);
 						r1 = get_ran(3,2,7);
 						hit_space(target,r1,DAMAGE_FIRE,true,true);
@@ -1046,7 +1013,7 @@ void do_combat_cast(location target)////
 							add_string_to_buf("  You create the barrier.              ");
 						else add_string_to_buf("  Failed.");
 						break;
-					case 59: // Force barrier
+					case eSpell::BARRIER_FORCE:
 						play_sound(68);
 						r1 = get_ran(7,2,7);
 						hit_space(target,r1,DAMAGE_FIRE,true,true);
@@ -1060,7 +1027,7 @@ void do_combat_cast(location target)////
 						start_missile_anim();
 						switch (spell_being_cast) {
 								
-							case 157:
+							case eSpell::DIVINE_THUD:
 								add_missile(target,9,1,0,0);
 								store_sound = 11;
 								r1 = min(18,(level * 7) / 10 + 2 * bonus);
@@ -1068,51 +1035,51 @@ void do_combat_cast(location target)////
 								ashes_loc = target;
 								break;
 								
-							case 1: case 31:
-								r1 = (spell_being_cast == 1) ? get_ran(2,1,4) : get_ran(min(20,level + bonus),1,4);
+							case eSpell::SPARK: case eSpell::ICE_BOLT:
+								r1 = (spell_being_cast == eSpell::SPARK) ? get_ran(2,1,4) : get_ran(min(20,level + bonus),1,4);
 								add_missile(target,6,1,0,0);
 								do_missile_anim(100,univ.party[current_pc].combat_pos,11);
-								hit_space(target,r1,(spell_being_cast == 1) ? DAMAGE_MAGIC : DAMAGE_COLD,1,0);
+								hit_space(target,r1,(spell_being_cast == eSpell::SPARK) ? DAMAGE_MAGIC : DAMAGE_COLD,1,0);
 								break;
-							case 27: // flame arrows
+							case eSpell::ARROWS_FLAME:
 								add_missile(target,4,1,0,0);
 								r1 = get_ran(2,1,4);
 								boom_type[i] = DAMAGE_FIRE;
 								boom_dam[i] = r1;
 								//hit_space(target,r1,1,1,0);
 								break;
-							case 129: // smite
+							case eSpell::SMITE:
 								add_missile(target,6,1,0,0);
 								r1 = get_ran(2,1,5);
 								boom_type[i] = DAMAGE_COLD;
 								boom_dam[i] = r1;
 								//hit_space(target,r1,5,1,0);
 								break;
-							case 114:
+							case eSpell::WOUND:
 								r1 = get_ran(min(7,2 + bonus + level / 2),1,4);
 								add_missile(target,14,1,0,0);
 								do_missile_anim(100,univ.party[current_pc].combat_pos,24);
 								hit_space(target,r1,DAMAGE_UNBLOCKABLE,1,0);
 								break;
-							case 11:
+							case eSpell::FLAME:
 								r1 = get_ran(min(10,1 + level / 3 + bonus),1,6);
 								add_missile(target,2,1,0,0);
 								do_missile_anim(100,univ.party[current_pc].combat_pos,11);
 								hit_space(target,r1,DAMAGE_FIRE,1,0);
 								break;
-							case 22: case 141:
+							case eSpell::FIREBALL: case eSpell::FLAMESTRIKE:
 								r1 = min(9,1 + (level * 2) / 3 + bonus) + 1;
 								add_missile(target,2,1,0,0);
 								store_sound = 11;
 								//do_missile_anim(100,univ.party[current_pc].combat_pos,11);
-								if (spell_being_cast == 141)
+								if (spell_being_cast == eSpell::FLAMESTRIKE)
 									r1 = (r1 * 14) / 10;
 								else if (r1 > 10) r1 = (r1 * 8) / 10;
 								if (r1 <= 0) r1 = 1;
 								place_spell_pattern(square,target,DAMAGE_FIRE,r1,current_pc);
 								ashes_loc = target;
 								break;
-							case 40:
+							case eSpell::FIRESTORM:
 								add_missile(target,2,1,0,0);
 								store_sound = 11;
 								//do_missile_anim(100,univ.party[current_pc].combat_pos,11);
@@ -1122,13 +1089,13 @@ void do_combat_cast(location target)////
 								place_spell_pattern(rad2,target,DAMAGE_FIRE,r1,current_pc);
 								ashes_loc = target;
 								break;
-							case 48:  // kill
+							case eSpell::KILL:
 								add_missile(target,9,1,0,0);
 								do_missile_anim(100,univ.party[current_pc].combat_pos,11);
 								r1 = get_ran(3,0,10) + univ.party[current_pc].level * 2;
 								hit_space(target,40 + r1,DAMAGE_MAGIC,1,0);
 								break;
-							case 61:	// death arrows
+							case eSpell::ARROWS_DEATH:
 								add_missile(target,9,1,0,0);
 								store_sound = 11;
 								r1 = get_ran(3,0,10) + univ.party[current_pc].level + 3 * bonus;
@@ -1137,64 +1104,66 @@ void do_combat_cast(location target)////
 								//hit_space(target,40 + r1,3,1,0);
 								break;
 								// summoning spells
-							case 35: case 16: case 26: case 43: case 58: case 50:
-							case 63: case 115: case 134: case 143: case 150:
+							case eSpell::SIMULACRUM: case eSpell::SUMMON_BEAST: case eSpell::SUMMON_RAT:
+							case eSpell::SUMMON_WEAK: case eSpell::SUMMON: case eSpell::SUMMON_MAJOR:
+							case eSpell::DEMON: case eSpell::SUMMON_SPIRIT: case eSpell::STICKS_TO_SNAKES:
+							case eSpell::SUMMON_HOST: case eSpell::SUMMON_GUARDIAN:
 								add_missile(target,8,1,0,0);
 								do_missile_anim(50,univ.party[current_pc].combat_pos,61);
 								switch (spell_being_cast) {
-									case 35: // Simulacrum
+									case eSpell::SIMULACRUM:
 										r2 = get_ran(3,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (summon_monster(store_sum_monst,target,r2,2) == false)
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 16: // summon beast
+									case eSpell::SUMMON_BEAST:
 										r2 = get_ran(3,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if ((summon == 0) || (!summon_monster(summon,target,r2,2)))
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 26: // summon 1
+									case eSpell::SUMMON_WEAK:
 										r2 = get_ran(4,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if ((summon == 0) || (!summon_monster(summon,target,r2,2)))
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 43: // summon 2
+									case eSpell::SUMMON:
 										r2 = get_ran(5,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if ((summon == 0) || (!summon_monster(summon,target,r2,2)))
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 58: // summon 3
+									case eSpell::SUMMON_MAJOR:
 										r2 = get_ran(7,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if ((summon == 0) || (!summon_monster(summon,target,r2,2)))
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 50: // Daemon
+									case eSpell::DEMON:
 										r2 = get_ran(5,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (!summon_monster(85,target,r2,2))
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 63: // Rat!
+									case eSpell::SUMMON_RAT:
 										r1 = get_ran(3,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (!summon_monster(80,target,r1,2))
 											add_string_to_buf("  Summon failed.");
 										break;
 										
-									case 115: // summon spirit
+									case eSpell::SUMMON_SPIRIT:
 										r2 = get_ran(2,1,5) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (summon_monster(125,target,r2,2) == false)
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 134: // s to s
+									case eSpell::STICKS_TO_SNAKES:
 										r1 = get_ran(1,0,7);
 										r2 = get_ran(2,1,5) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (summon_monster((r1 == 1) ? 100 : 99,target,r2,2) == false)
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 143: // host
+									case eSpell::SUMMON_HOST: // host
 										r2 = get_ran(2,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (summon_monster((i == 0) ? 126 : 125,target,r2,2) == false)
 											add_string_to_buf("  Summon failed.");
 										break;
-									case 150: // guardian
+									case eSpell::SUMMON_GUARDIAN: // guardian
 										r2 = get_ran(6,1,4) + stat_adj(current_pc,eSkill::INTELLIGENCE);
 										if (summon_monster(122,target,r2,2) == false)
 											add_string_to_buf("  Summon failed.");
@@ -1209,33 +1178,36 @@ void do_combat_cast(location target)////
 									add_string_to_buf("  Nobody there                 ");
 								else {
 									cur_monst = &univ.town.monst[targ_num];
-									if ((cur_monst->attitude % 2 != 1) && (spell_being_cast != 7)
-										&& (spell_being_cast != 34))
+									cCreature* cur_monst = &univ.town.monst[targ_num];
+									if(cur_monst->attitude % 2 != 1 && spell_being_cast != eSpell::SCRY_MONSTER && spell_being_cast != eSpell::CAPTURE_SOUL)
 										make_town_hostile();
-									store_sound = (spell_being_cast >= 50) ? 24 : 25;
 									switch (spell_being_cast) {
-										case 68: // spray acid
+										case eSpell::ACID_SPRAY:
 											store_m_type = 0;
 											acid_monst(cur_monst,level);
+											store_sound = 24;
 											break;
-										case 69: // paralyze
+										case eSpell::PARALYZE_BEAM:
 											store_m_type = 9;
 											charm_monst(cur_monst,0,eStatus::PARALYZED,500);
+											store_sound = 24;
 											break;
 											
-										case 7: // monster info
+										case eSpell::SCRY_MONSTER:
 											store_m_type = -1;
 											play_sound(52);
 											univ.party.m_noted[cur_monst->number] = true;
 											adjust_monst_menu();
 											display_monst(0,cur_monst,0);
+											store_sound = 25;
 											break;
-										case 34: // Capture soul
+										case eSpell::CAPTURE_SOUL:
 											store_m_type = 15;
 											record_monst(cur_monst);
+											store_sound = 25;
 											break;
 											
-										case 52: // Mindduel!
+										case eSpell::MINDDUEL:
 											store_m_type = -1;
 											if ((cur_monst->mu == 0) && (cur_monst->cl == 0))
 												add_string_to_buf("  Can't duel: no magic.");
@@ -1248,85 +1220,92 @@ void do_combat_cast(location target)////
 													do_mindduel(current_pc,cur_monst);
 												}
 											}
+											store_sound = 24;
 											break;
 											
-										case 117: // charm
+										case eSpell::CHARM_FOE:
 											store_m_type = 14;
 											charm_monst(cur_monst,-1 * (bonus + univ.party[current_pc].level / 8),eStatus::CHARM,0);
+											store_sound = 24;
 											break;
 											
-										case 118: // disease
+										case eSpell::DISEASE:
 											store_m_type = 0;
 											r1 = get_ran(1,0,1);
 											disease_monst(cur_monst,2 + r1 + bonus);
+											store_sound = 24;
 											break;
 											
-										case 62:
+										case eSpell::STRENGTHEN_TARGET:
 											store_m_type = 14;
 											cur_monst->health += 20;
 											store_sound = 55;
 											break;
 											
-										case 13:
+										case eSpell::DUMBFOUND:
 											store_m_type = 14;
 											dumbfound_monst(cur_monst,1 + bonus / 3);
 											store_sound = 53;
 											break;
 											
-										case 4:
+										case eSpell::SCARE:
 											store_m_type = 11;
 											scare_monst(cur_monst,get_ran(2 + bonus,1,6));
 											store_sound = 54;
 											break;
-										case 24:
+										case eSpell::FEAR:
 											store_m_type = 11;
-											scare_monst(cur_monst,get_ran(min(20,univ.party[current_pc].level / 2 + bonus),1,
-																		  ((spell_being_cast == 24) ? 8 : 6)));
+											scare_monst(cur_monst,get_ran(min(20,univ.party[current_pc].level / 2 + bonus),1,8));
 											store_sound = 54;
 											break;
 											
-										case 12:
+										case eSpell::SLOW:
 											store_m_type = 11;
 											r1 = get_ran(1,0,1);
 											slow_monst(cur_monst,2 + r1 + bonus);
+											store_sound = 25;
 											break;
 											
-										case 10: case 36:
-											store_m_type = (spell_being_cast == 36) ? 4 : 11;
+										case eSpell::POISON_MINOR: case eSpell::ARROWS_VENOM:
+											store_m_type = (spell_being_cast == eSpell::ARROWS_VENOM) ? 4 : 11;
 											poison_monst(cur_monst,2 + bonus / 2);
 											store_sound = 55;
 											break;
-										case 49: // Paralysis
+										case eSpell::PARALYZE:
 											store_m_type = 9;
 											charm_monst(cur_monst,-10,eStatus::PARALYZED,1000);
+											store_sound = 25;
 											break;
-										case 30:
+										case eSpell::POISON:
 											store_m_type = 11;
 											poison_monst(cur_monst,4 + bonus / 2);
 											store_sound = 55;
 											break;
-										case 46:
+										case eSpell::POISON_MAJOR:
 											store_m_type = 11;
 											poison_monst(cur_monst,8 + bonus / 2);
 											store_sound = 55;
 											break;
 											
-										case 109: // stumble
+										case eSpell::STUMBLE:
 											store_m_type = 8;
 											curse_monst(cur_monst,4 + bonus);
+											store_sound = 24;
 											break;
 											
-										case 112:
+										case eSpell::CURSE:
 											store_m_type = 8;
 											curse_monst(cur_monst,2 + bonus);
+											store_sound = 24;
 											break;
 											
-										case 122:
+										case eSpell::HOLY_SCOURGE:
 											store_m_type = 8;
 											curse_monst(cur_monst,2 + univ.party[current_pc].level / 2);
+											store_sound = 24;
 											break;
 											
-										case 103: case 132:
+										case eSpell::TURN_UNDEAD: case eSpell::DISPEL_UNDEAD:
 											if (cur_monst->m_type != eRace::UNDEAD) {
 												add_string_to_buf("  Not undead.                    ");
 												store_m_type = -1;
@@ -1337,13 +1316,14 @@ void do_combat_cast(location target)////
 											if (r1 > hit_chance[minmax(0,19,bonus * 2 + level * 4 - (cur_monst->level / 2) + 3)])
 												add_string_to_buf("  Monster resisted.                  ");
 											else {
-												r1 = get_ran((spell_being_cast == 103) ? 2 : 6, 1, 14);
+												r1 = get_ran((spell_being_cast == eSpell::TURN_UNDEAD) ? 2 : 6, 1, 14);
 												
 												hit_space(cur_monst->cur_loc,r1,DAMAGE_UNBLOCKABLE,0,current_pc);
 											}
+											store_sound = 24;
 											break;
 											
-										case 155:
+										case eSpell::RAVAGE_SPIRIT:
 											if (cur_monst->m_type != eRace::DEMON) {
 												add_string_to_buf("  Not a demon.                    ");
 												store_m_type = -1;
@@ -1359,6 +1339,7 @@ void do_combat_cast(location target)////
 												//play_sound(53);
 												hit_space(cur_monst->cur_loc,r1,DAMAGE_UNBLOCKABLE,0,current_pc);
 											}
+											store_sound = 24;
 											break;
 									}
 									if (store_m_type >= 0)
@@ -3499,6 +3480,7 @@ bool monst_cast_priest(cCreature *caster,short targ)
 				break;
 			case 16: case 24:// bless all,revive all
 				play_sound(24);
+				// TODO: What's r2 for here? Should it be used for Revive All?
 				r1 =  get_ran(2,1,4); r2 = get_ran(3,1,6);
 				for (i = 0; i < univ.town->max_monst(); i++)
 					if ((monst_near(i,caster->cur_loc,8,0)) &&
@@ -4252,7 +4234,8 @@ void end_combat()
 
 bool combat_cast_mage_spell()
 {
-	short spell_num,target,i,store_sp,bonus = 1,r1,store_sound = 0,store_m_type = 0,num_opp = 0;
+	short target,i,store_sp,bonus = 1,r1,store_sound = 0,store_m_type = 0,num_opp = 0;
+	eSpell spell_num;
 	char c_line[60];
 	cCreature *which_m;
 	cMonster get_monst;
@@ -4283,7 +4266,7 @@ bool combat_cast_mage_spell()
 			spell_num = univ.party[current_pc].last_cast[eSkill::MAGE_SPELLS];
 		}
 		
-		if (spell_num == 35) {
+		if (spell_num == eSpell::SIMULACRUM) {
 			store_sum_monst = pick_trapped_monst();
 			if (store_sum_monst == 0)
 				return false;
@@ -4297,20 +4280,18 @@ bool combat_cast_mage_spell()
 		
 		bonus = stat_adj(current_pc,eSkill::INTELLIGENCE);
 		combat_posing_monster = current_working_monster = current_pc;
-		if (spell_num >= 70)
-			return false;
-		if (spell_num < 70) {
+		if(spell_num == eSpell::NONE) return false;
 			print_spell_cast(spell_num,eSkill::MAGE_SPELLS);
-			if (refer_mage[spell_num] == 0) {
+			if ((*spell_num).refer == REFER_YES) {
 				take_ap(6);
 				draw_terrain(2);
 				do_mage_spell(current_pc,spell_num);
 				combat_posing_monster = current_working_monster = -1;
 			}
-			else if (refer_mage[spell_num] == 2) {
+			else if ((*spell_num).refer == REFER_TARGET) {
 				start_spell_targeting(spell_num);
 			}
-			else if (refer_mage[spell_num] == 3) {
+			else if ((*spell_num).refer == REFER_FANCY) {
 				start_fancy_spell_targeting(spell_num);
 			}
 			else {
@@ -4318,33 +4299,33 @@ bool combat_cast_mage_spell()
 				take_ap(6);
 				draw_terrain(2);
 				switch (spell_num) {
-					case 54:
-						univ.party[current_pc].cur_sp -= s_cost[0][spell_num];
+					case eSpell::SHOCKWAVE:
+						univ.party[current_pc].cur_sp -= (*spell_num).cost;
 						add_string_to_buf("  The ground shakes.          ");
 						do_shockwave(univ.party[current_pc].combat_pos);
 						break;
 						
-					case 2: case 21: case 3: case 14: case 29:
+					case eSpell::HASTE_MINOR: case eSpell::HASTE: case eSpell::STRENGTH: case eSpell::ENVENOM: case eSpell::RESIST_MAGIC:
 //						target = select_pc(11,0);
 						target = store_spell_target;
 						if (target < 6) {
-							univ.party[current_pc].cur_sp -= s_cost[0][spell_num];
+							univ.party[current_pc].cur_sp -= (*spell_num).cost;
 							play_sound(4);
 							switch (spell_num) {
-								case 14:
+								case eSpell::ENVENOM:
 									sprintf (c_line, "  %s receives venom.               ",
 											 univ.party[target].name.c_str());
 									poison_weapon(target,3 + bonus,1);
 									store_m_type = 11;
 									break;
 									
-								case  3:
+								case eSpell::STRENGTH:
 									sprintf (c_line, "  %s stronger.                     ",
 											 univ.party[target].name.c_str());
 									univ.party[target].status[eStatus::BLESS_CURSE] = univ.party[target].status[eStatus::BLESS_CURSE] + 3;
 									store_m_type = 8;
 									break;
-								case 29:
+								case eSpell::RESIST_MAGIC:
 									sprintf (c_line, "  %s resistant.                     ",
 											 univ.party[target].name.c_str());
 									univ.party[target].status[eStatus::MAGIC_RESISTANCE] = univ.party[target].status[eStatus::MAGIC_RESISTANCE] + 5 + bonus;
@@ -4352,7 +4333,7 @@ bool combat_cast_mage_spell()
 									break;
 									
 								default:
-									i = (spell_num == 2) ? 2 : max(2,univ.party[current_pc].level / 2 + bonus);
+									i = (spell_num == eSpell::HASTE_MINOR) ? 2 : max(2,univ.party[current_pc].level / 2 + bonus);
 									univ.party[target].status[eStatus::HASTE_SLOW] = min(8, univ.party[target].status[eStatus::HASTE_SLOW] + i);
 									sprintf (c_line, "  %s hasted.                       ",
 											 univ.party[target].name.c_str());
@@ -4364,15 +4345,15 @@ bool combat_cast_mage_spell()
 						}
 						break;
 						
-					case 39: case 55:
+					case eSpell::HASTE_MAJOR: case eSpell::BLESS_MAJOR:
 						store_sound = 25;
-						univ.party[current_pc].cur_sp -= s_cost[0][spell_num];
+						univ.party[current_pc].cur_sp -= (*spell_num).cost;
 						
 						
 						for (i = 0; i < 6; i++)
 							if(univ.party[i].main_status == eMainStatus::ALIVE) {
-								univ.party[i].status[eStatus::HASTE_SLOW] = min(8, univ.party[i].status[eStatus::HASTE_SLOW] + ((spell_num == 39) ? 1 + univ.party[current_pc].level / 8 + bonus : 3 + bonus));
-								if (spell_num == 55) {
+								univ.party[i].status[eStatus::HASTE_SLOW] = min(8, univ.party[i].status[eStatus::HASTE_SLOW] + ((spell_num == eSpell::HASTE_MAJOR) ? 1 + univ.party[current_pc].level / 8 + bonus : 3 + bonus));
+								if (spell_num == eSpell::BLESS_MAJOR) {
 									poison_weapon(i,2,1);
 									univ.party[i].status[eStatus::BLESS_CURSE] += 4;
 									add_missile(univ.party[i].combat_pos,14,0,0,0);
@@ -4380,7 +4361,7 @@ bool combat_cast_mage_spell()
 								else add_missile(univ.party[i].combat_pos,8,0,0,0);
 							}
 						//play_sound(4);
-						if (spell_num == 39)
+						if (spell_num == eSpell::HASTE_MAJOR)
 							sprintf (c_line, "  Party hasted.     ");
 						else
 							sprintf (c_line, "  Party blessed!           ");
@@ -4390,36 +4371,36 @@ bool combat_cast_mage_spell()
 						
 						
 						
-					case 32: case 47: case 56: // affect monsters in area spells
-						univ.party[current_pc].cur_sp -= s_cost[0][spell_num];
+					case eSpell::SLOW_GROUP: case eSpell::FEAR_GROUP: case eSpell::PARALYSIS_MASS: // affect monsters in area spells
+						univ.party[current_pc].cur_sp -= (*spell_num).cost;
 						store_sound = 25;
-						if (spell_num == 47)
+						if (spell_num == eSpell::FEAR_GROUP)
 							store_sound = 54;
 						switch (spell_num) {
-							case 32: sprintf (c_line, "  Enemy slowed:       "); break;
-							case 49: sprintf (c_line, "  Enemy ravaged:              ");break;
-							case 47: sprintf (c_line, "  Enemy scared:   ");break;
-							case 56: sprintf (c_line, "  Enemy paralyzed:   ");break;
+							case eSpell::SLOW_GROUP: sprintf (c_line, "  Enemy slowed:       "); break;
+							case eSpell::RAVAGE_ENEMIES: sprintf (c_line, "  Enemy ravaged:              ");break;
+							case eSpell::FEAR_GROUP: sprintf (c_line, "  Enemy scared:   ");break;
+							case eSpell::PARALYSIS_MASS: sprintf (c_line, "  Enemy paralyzed:   ");break;
 						}
 						add_string_to_buf(c_line);
 						for (i = 0; i < univ.town->max_monst(); i++) {
 							if ((univ.town.monst[i].active != 0) && (univ.town.monst[i].attitude % 2 == 1)
-								&& (dist(univ.party[current_pc].combat_pos,univ.town.monst[i].cur_loc) <= mage_range[spell_num])
+								&& (dist(univ.party[current_pc].combat_pos,univ.town.monst[i].cur_loc) <= (*spell_num).range)
 								&& (can_see_light(univ.party[current_pc].combat_pos,univ.town.monst[i].cur_loc,sight_obscurity) < 5)) {
 								which_m = &univ.town.monst[i];
 								switch (spell_num) {
-									case 47:
+									case eSpell::FEAR_GROUP:
 										r1 = get_ran(univ.party[current_pc].level / 3,1,8);
 										scare_monst(which_m,r1);
 										store_m_type = 10;
 										break;
-									case 32: case 49:
+									case eSpell::SLOW_GROUP: case eSpell::RAVAGE_ENEMIES:
 										slow_monst(which_m,5 + bonus);
-										if (spell_num == 49)
+										if (spell_num == eSpell::RAVAGE_ENEMIES)
 											curse_monst(which_m,3 + bonus);
 										store_m_type = 8;
 										break;
-									case 56:
+									case eSpell::PARALYSIS_MASS:
 										charm_monst(which_m,15,eStatus::PARALYZED,1000);
 										store_m_type = 15;
 										break;
@@ -4440,8 +4421,6 @@ bool combat_cast_mage_spell()
 			else play_sound(store_sound);
 			end_missile_anim();
 			put_pc_screen();
-			
-		}
 	}
 	combat_posing_monster = current_working_monster = -1;
 	// Did anything actually get cast?
@@ -4453,7 +4432,8 @@ bool combat_cast_mage_spell()
 
 bool combat_cast_priest_spell()
 {
-	short spell_num,target,i,store_sp,bonus,store_sound = 0,store_m_type = 0,num_opp = 0;
+	short target,i,store_sp,bonus,store_sound = 0,store_m_type = 0,num_opp = 0;
+	eSpell spell_num;
 	char c_line[60];
 	cCreature *which_m;
 	effect_pat_type protect_pat = {{
@@ -4488,39 +4468,38 @@ bool combat_cast_priest_spell()
 		return false;
 	}
 	
-	if (spell_num >= 70)
-		return false;
+	if(spell_num == eSpell::NONE) return false;
 	bonus = stat_adj(current_pc,eSkill::INTELLIGENCE);
 	
 	combat_posing_monster = current_working_monster = current_pc;
 	
 	if (univ.party[current_pc].cur_sp == 0)
 		add_string_to_buf("Cast: No spell points.        ");
-	else if (spell_num < 70) {
+	else if(spell_num != eSpell::NONE) {
 		print_spell_cast(spell_num,eSkill::PRIEST_SPELLS);
-		if (refer_priest[spell_num] == 0) {
+		if ((*spell_num).refer == REFER_YES) {
 			take_ap(5);
 			draw_terrain(2);
 			do_priest_spell(current_pc,spell_num);
 		}
-		else if (refer_priest[spell_num] == 2) {
-			start_spell_targeting(100 + spell_num);
+		else if ((*spell_num).refer == REFER_TARGET) {
+			start_spell_targeting(spell_num);
 		}
-		else if (refer_priest[spell_num] == 3) {
-			start_fancy_spell_targeting(100 + spell_num);
+		else if ((*spell_num).refer == REFER_FANCY) {
+			start_fancy_spell_targeting(spell_num);
 		}
 		else {
 			start_missile_anim();
 			take_ap(5);
 			draw_terrain(2);
 			switch (spell_num) {
-				case 0: case 10:
+				case eSpell::BLESS_MINOR: case eSpell::BLESS:
 //					target = select_pc(11,0);
 					target = store_spell_target;
 					if (target < 6) {
 						store_sound = 4;
-						univ.party[current_pc].cur_sp -= s_cost[1][spell_num];
-						univ.party[target].status[eStatus::BLESS_CURSE] += (spell_num == 0) ? 2 :
+						univ.party[current_pc].cur_sp -= (*spell_num).cost;
+						univ.party[target].status[eStatus::BLESS_CURSE] += (spell_num == eSpell::BLESS_MINOR) ? 2 :
 						max(2,(univ.party[current_pc].level * 3) / 4 + 1 + bonus);
 						sprintf ((char *) c_line, "  %s blessed.              ",
 								 (char *) univ.party[target].name.c_str());
@@ -4529,8 +4508,8 @@ bool combat_cast_priest_spell()
 					}
 					break;
 					
-				case 38:
-					univ.party[current_pc].cur_sp -= s_cost[1][spell_num];
+				case eSpell::BLESS_PARTY:
+					univ.party[current_pc].cur_sp -= (*spell_num).cost;
 					for (i = 0; i < 6; i++)
 						if(univ.party[i].main_status == eMainStatus::ALIVE) {
 							univ.party[i].status[eStatus::BLESS_CURSE] += univ.party[current_pc].level / 3;
@@ -4541,8 +4520,8 @@ bool combat_cast_priest_spell()
 					store_sound = 4;
 					break;
 					
-				case 58:
-					univ.party[current_pc].cur_sp -= s_cost[1][spell_num];
+				case eSpell::AVATAR:
+					univ.party[current_pc].cur_sp -= (*spell_num).cost;
 					sprintf ((char *) c_line, "  %s is an avatar! ",
 							 (char *) univ.party[current_pc].name.c_str());
 					add_string_to_buf((char *) c_line);
@@ -4558,23 +4537,23 @@ bool combat_cast_priest_spell()
 					univ.party[current_pc].status[eStatus::MARTYRS_SHIELD] = 8;
 					break;
 					
-				case 31: case 51: case 53:
-					univ.party[current_pc].cur_sp -= s_cost[1][spell_num];
+				case eSpell::CURSE_ALL: case eSpell::CHARM_MASS: case eSpell::PESTILENCE:
+					univ.party[current_pc].cur_sp -= (*spell_num).cost;
 					store_sound = 24;
 					for (i = 0; i < univ.town->max_monst(); i++) {
 						if ((univ.town.monst[i].active != 0) &&(univ.town.monst[i].attitude % 2 == 1) &&
-							(dist(univ.party[current_pc].combat_pos,univ.town.monst[i].cur_loc) <= priest_range[spell_num])) {
+							(dist(univ.party[current_pc].combat_pos,univ.town.monst[i].cur_loc) <= (*spell_num).range)) {
 							which_m = &univ.town.monst[i];
 							switch (spell_num) {
-								case 31:
+								case eSpell::CURSE_ALL:
 									curse_monst(which_m,3 + bonus);
 									store_m_type = 8;
 									break;
-								case 51:
+								case eSpell::CHARM_MASS:
 									charm_monst(which_m,28 - bonus,eStatus::CHARM,0);
 									store_m_type = 14;
 									break;
-								case 53:
+								case eSpell::PESTILENCE:
 									disease_monst(which_m,3 + bonus);
 									store_m_type = 0;
 									break;
@@ -4587,8 +4566,8 @@ bool combat_cast_priest_spell()
 					
 					break;
 					
-				case 52:
-					univ.party[current_pc].cur_sp -= s_cost[1][spell_num];
+				case eSpell::PROTECTIVE_CIRCLE:
+					univ.party[current_pc].cur_sp -= (*spell_num).cost;
 					play_sound(24);
 					add_string_to_buf("  Protective field created.");
 					place_spell_pattern(protect_pat,univ.party[current_pc].combat_pos,6);
@@ -4609,38 +4588,39 @@ bool combat_cast_priest_spell()
 	else return true;
 }
 
-void start_spell_targeting(short num)
+void start_spell_targeting(eSpell num, bool freebie)
 {
 	
 	// First, remember what spell was cast.
 	spell_being_cast = num;
+	spell_freebie = freebie;
 	
-	// Then, is num >= 1000, it's a freebie, so remove the 1000
-	if (num >= 1000)
-		num -= 1000;
 	sprintf ((char *) create_line, "  Target spell.                ");
 	add_string_to_buf((char *) create_line);
-	if (num < 100)
+	if(isMage(num))
 		add_string_to_buf("  (Hit 'm' to cancel.)");
 	else add_string_to_buf("  (Hit 'p' to cancel.)");
 	overall_mode = MODE_SPELL_TARGET;
-	current_spell_range = (num >= 100) ? priest_range[num - 100] : mage_range[num];
+	current_spell_range = (*num).range;
 	current_pat = single;
 	
 	switch (num) {  // Different spells have different messages and diff. target shapes
-		case 19:
+		case eSpell::CLOUD_SLEEP:
 			current_pat = small_square;
 			break;
-		case 18: case 22: case 141: case 126: case 15: case 119:
+		case eSpell::DISPEL_SQUARE: case eSpell::FIREBALL: case eSpell::CLOUD_STINK:
+		case eSpell::FLAMESTRIKE: case eSpell::FORCEFIELD:
 			current_pat = square;
 			break;
-		case 17: case 40: case 44: case 28: case 51: case 157: case 145: case 64: case 67:
+		case eSpell::CONFLAGRATION: case eSpell::FIRESTORM: case eSpell::SHOCKSTORM: case eSpell::WEB:
+		case eSpell::ANTIMAGIC: case eSpell::WALL_ICE_BALL: case eSpell::CLOUD_SLEEP_LARGE:
+		case eSpell::DIVINE_THUD: case eSpell::DISPEL_SPHERE:
 			current_pat = rad2;
 			break;
-		case 153: case 65: case 66:
+		case eSpell::PESTILENCE: case eSpell::GOO_BOMB: case eSpell::FOUL_VAPOR:
 			current_pat = rad3;
 			break;
-		case 25: case 37: case 159:
+		case eSpell::WALL_FORCE: case eSpell::WALL_ICE: case eSpell::WALL_BLADES:
 			add_string_to_buf("  (Hit space to rotate.)");
 			force_wall_position = 0;
 			current_pat = field[0];
@@ -4648,59 +4628,57 @@ void start_spell_targeting(short num)
 	}
 }
 
-void start_fancy_spell_targeting(short num)
+void start_fancy_spell_targeting(eSpell num, bool freebie)
 {
 	short i;
 	location null_loc(120,0);
 	
 	// First, remember what spell was cast.
 	spell_being_cast = num;
-	// Then, is num >= 1000, it's a freebie, so remove the 1000
-	if (num >= 1000)
-		num -= 1000;
+	spell_freebie = freebie;
 	
 	for (i = 0; i < 8; i++)
 		spell_targets[i] = null_loc;
 	sprintf (create_line, "  Target spell.                ");
-	if (num < 100)
+	if(isMage(num))
 		add_string_to_buf("  (Hit 'm' to cancel.)");
 	else add_string_to_buf("  (Hit 'p' to cancel.)");
 	add_string_to_buf("  (Hit space to cast.)");
 	add_string_to_buf(create_line);
 	overall_mode = MODE_FANCY_TARGET;
 	current_pat = single;
-	current_spell_range = (num >= 100) ? priest_range[num - 100] : mage_range[num];
+	current_spell_range = (*num).range;
 	
 	switch (num) { // Assign special targeting shapes and number of targets
-		case 129: // smite
+		case eSpell::SMITE:
 			num_targets_left = minmax(1,8,univ.party[current_pc].level / 4 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2);
 			break;
-		case 134: // sticks to snakes
+		case eSpell::STICKS_TO_SNAKES:
 			num_targets_left = univ.party[current_pc].level / 5 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2;
 			break;
-		case 143: // summon host
+		case eSpell::SUMMON_HOST:
 			num_targets_left = 5;
 			break;
-		case 27: // flame arrows
+		case eSpell::ARROWS_FLAME:
 			num_targets_left = univ.party[current_pc].level / 4 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2;
 			break;
-		case 36: // venom arrows
+		case eSpell::ARROWS_VENOM:
 			num_targets_left = univ.party[current_pc].level / 5 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2;
 			break;
-		case 61: case 49: // paralysis, death arrows
+		case eSpell::ARROWS_DEATH: case eSpell::PARALYZE:
 			num_targets_left = univ.party[current_pc].level / 8 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 3;
 			break;
-		case 45: // spray fields
+		case eSpell::SPRAY_FIELDS:
 			num_targets_left = univ.party[current_pc].level / 5 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2;
 			current_pat = t;
 			break;
-		case 26: // summon 1
+		case eSpell::SUMMON_WEAK:
 			num_targets_left = minmax(1,7,univ.party[current_pc].level / 4 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2);
 			break;
-		case 43: // summon 2
+		case eSpell::SUMMON:
 			num_targets_left = minmax(1,6,univ.party[current_pc].level / 6 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2);
 			break;
-		case 58: // summon 3
+		case eSpell::SUMMON_MAJOR:
 			num_targets_left = minmax(1,5,univ.party[current_pc].level / 8 + stat_adj(current_pc,eSkill::INTELLIGENCE) / 2);
 			break;
 	}
diff --git a/osx/boe.combat.h b/osx/boe.combat.h
index 1465281b..81392fc3 100644
--- a/osx/boe.combat.h
+++ b/osx/boe.combat.h
@@ -53,8 +53,8 @@ bool out_monst_all_dead();
 void end_combat();
 bool combat_cast_mage_spell();
 bool combat_cast_priest_spell();
-void start_spell_targeting(short num);
-void start_fancy_spell_targeting(short num);
+void start_spell_targeting(eSpell num, bool freebie = false);
+void start_fancy_spell_targeting(eSpell num, bool freebie = false);
 void spell_cast_hit_return();
 void process_fields();
 void scloud_space(short m,short n);
diff --git a/osx/boe.infodlg.cpp b/osx/boe.infodlg.cpp
index fcb1f6d5..c9a3668b 100644
--- a/osx/boe.infodlg.cpp
+++ b/osx/boe.infodlg.cpp
@@ -25,18 +25,15 @@
 #include "restypes.hpp"
 #include <boost/lexical_cast.hpp>
 #include "prefs.hpp"
+#include "spell.hpp"
 
 short mage_spell_pos = 0,priest_spell_pos = 0,skill_pos = 0;
 
-extern std::map<eSkill,std::array<short,62>> spell_w_cast;
-extern short spell_level[62];
 extern short skill_cost[20];
 extern short skill_max[20];
 extern short skill_g_cost[20];
 extern const char* skill_ids[19];
 //extern party_record_type	party;
-extern short mage_range[66],priest_range[66];
-extern std::map<eSkill,std::array<short,62>> spell_cost;
 extern short cur_town_talk_loaded;
 //extern current_town_type univ.town;
 extern bool give_intro_hint;
@@ -77,13 +74,14 @@ static void put_spell_info(cDialog& me, eSkill display_mode) {
 	
 	pos = display_mode == eSkill::MAGE_SPELLS ? mage_spell_pos : priest_spell_pos;
 	res = display_mode == eSkill::MAGE_SPELLS ? "mage-spells" : "priest-spells";
-	ran = display_mode == eSkill::MAGE_SPELLS ? mage_range[pos] : priest_range[pos];
+	eSpell spell = cSpell::fromNum(display_mode, pos);
+	ran = (*spell).range;
 	
 	me["name"].setText(get_str(res, pos * 2 + 1));
 	
-	if (spell_cost[eSkill::MAGE_SPELLS][pos] > 0)
-		store_text << spell_level[pos] << "/" << spell_cost[eSkill::MAGE_SPELLS][pos];
-	else store_text << spell_level[pos] << "/?";
+	if((*spell).cost >= 0)
+		store_text << (*spell).level << "/" << (*spell).cost;
+	else store_text << (*spell).level << "/?";
 	me["cost"].setText(store_text.str());
 	
 	if (ran == 0) {
@@ -92,7 +90,7 @@ static void put_spell_info(cDialog& me, eSkill display_mode) {
 	else me["range"].setTextToNum(ran);
 	
 	me["desc"].setText(get_str(res, pos * 2 + 2));
-	me["when"].setText(get_str("spell-times", 1 + spell_w_cast[display_mode][pos]));
+	me["when"].setText(get_str("spell-times", (*spell).when_cast));
 }
 
 
diff --git a/osx/boe.main.cpp b/osx/boe.main.cpp
index 65598fa8..c2bda3af 100644
--- a/osx/boe.main.cpp
+++ b/osx/boe.main.cpp
@@ -107,7 +107,7 @@ short current_ground = 0,stat_screen_mode = 0;
 short anim_step = -1;
 
 // Spell casting globals
-short store_mage = 0, store_priest = 0;
+eSpell store_mage = eSpell::LIGHT, store_priest = eSpell::BLESS_MINOR;
 short store_mage_lev = 0, store_priest_lev = 0;
 short store_spell_target = 6,pc_casting;
 short num_targets_left = 0;
diff --git a/osx/boe.menus.mac.mm b/osx/boe.menus.mac.mm
index 1dbf96b9..3cbbee68 100644
--- a/osx/boe.menus.mac.mm
+++ b/osx/boe.menus.mac.mm
@@ -15,10 +15,9 @@
 #include "boe.party.h"
 #include "boe.infodlg.h"
 #include "boe.consts.h"
+#include "spell.hpp"
 
 extern short on_spell_menu[2][62];
-extern short spell_level[62];
-extern std::map<eSkill,std::array<short,62>> spell_cost;
 extern short on_monst_menu[256];
 extern const char* mage_s_name[62];
 extern const char* priest_s_name[62];
@@ -188,7 +187,7 @@ void adjust_spell_menus()
 		on_spell_menu[0][i] = -1;
 	}
 	for (i = 0; i < 62; i++)
-		if (pc_can_cast_spell(current_pc,eSkill::MAGE_SPELLS,i)) {
+		if (pc_can_cast_spell(current_pc,cSpell::fromNum(eSkill::MAGE_SPELLS,i))) {
 			on_spell_menu[0][spell_pos] = i;
 			spell_pos++;
 		}
@@ -201,11 +200,10 @@ void adjust_spell_menus()
 		}
 		for (i = 0; i < 62; i++)
 			if (on_spell_menu[0][i] >= 0) {
-				if (spell_cost[eSkill::MAGE_SPELLS][on_spell_menu[0][i]] > 0)
-					sprintf(spell_name," L%d - %s, C %d",spell_level[on_spell_menu[0][i]],
-							mage_s_name[on_spell_menu[0][i]],spell_cost[eSkill::MAGE_SPELLS][on_spell_menu[0][i]]);
-				else sprintf(spell_name," L%d - %s, C ?",spell_level[on_spell_menu[0][i]],
-							 mage_s_name[on_spell_menu[0][i]]);
+				eSpell spell = cSpell::fromNum(eSkill::MAGE_SPELLS, on_spell_menu[0][i]);
+				if((*spell).cost >= 0)
+					sprintf(spell_name," L%d - %s, C %d",(*spell).level, mage_s_name[on_spell_menu[0][i]], (*spell).cost);
+				else sprintf(spell_name," L%d - %s, C ?",(*spell).level, mage_s_name[on_spell_menu[0][i]]);
 				spell_name[0] = strlen((char *) spell_name);
 				//strcpy((char *) (spell_name + 1),mage_s_name[on_spell_menu[0][i]]);
 				NSString* str = [NSString stringWithUTF8String: spell_name];
@@ -224,7 +222,7 @@ void adjust_spell_menus()
 		on_spell_menu[1][i] = -1;
 	}
 	for (i = 0; i < 62; i++)
-		if (pc_can_cast_spell(current_pc,eSkill::PRIEST_SPELLS,i)) {
+		if (pc_can_cast_spell(current_pc,cSpell::fromNum(eSkill::PRIEST_SPELLS,i))) {
 			on_spell_menu[1][spell_pos] = i;
 			spell_pos++;
 		}
@@ -237,13 +235,12 @@ void adjust_spell_menus()
 		}
 		for (i = 0; i < 62; i++)
 			if (on_spell_menu[1][i] >= 0) {
+				eSpell spell = cSpell::fromNum(eSkill::MAGE_SPELLS, on_spell_menu[1][i]);
 				//spell_name[0] = strlen((char *) priest_s_name[on_spell_menu[1][i]]);
 				//strcpy((char *) (spell_name + 1),priest_s_name[on_spell_menu[1][i]]);
-				if (spell_cost[eSkill::PRIEST_SPELLS][on_spell_menu[1][i]] > 0)
-					sprintf(spell_name," L%d - %s, C %d",spell_level[on_spell_menu[1][i]],
-							priest_s_name[on_spell_menu[1][i]],spell_cost[eSkill::PRIEST_SPELLS][on_spell_menu[1][i]]);
-				else sprintf(spell_name," L%d - %s, C ?",spell_level[i],
-							 priest_s_name[on_spell_menu[1][i]]);
+				if ((*spell).cost >= 0)
+					sprintf(spell_name," L%d - %s, C %d",(*spell).level, priest_s_name[on_spell_menu[1][i]], (*spell).cost);
+				else sprintf(spell_name," L%d - %s, C ?",(*spell).level, priest_s_name[on_spell_menu[1][i]]);
 				spell_name[0] = strlen((char *) spell_name);
 				NSString* str = [NSString stringWithUTF8String: spell_name];
 				NSMenuItem* newItem = [spell_menu addItemWithTitle: str action: @selector(spellMenu:) keyEquivalent: @""];
@@ -290,7 +287,7 @@ void handle_help_menu(int item_hit);
 void handle_library_menu(int item_hit);
 void handle_actions_menu(int item_hit);
 void handle_monster_info_menu(int item_hit);
-void handle_menu_spell(short spell_picked,eSkill spell_type);
+void handle_menu_spell(eSpell spell_picked);
 
 @implementation MenuHandler
 -(void) appMenu:(id) sender {
@@ -316,7 +313,7 @@ void handle_menu_spell(short spell_picked,eSkill spell_type);
 
 -(void) spellMenu:(id) sender {
 	SpellWrapper* spell = [sender representedObject];
-	handle_menu_spell([spell num], [spell type]);
+	handle_menu_spell(cSpell::fromNum([spell type], [spell num]));
 }
 
 -(void) libMenu:(id) sender {
diff --git a/osx/boe.party.cpp b/osx/boe.party.cpp
index c6b1d6a5..6f88658e 100644
--- a/osx/boe.party.cpp
+++ b/osx/boe.party.cpp
@@ -36,21 +36,10 @@
 #include <array>
 #include <boost/lexical_cast.hpp>
 #include "button.h"
+#include "spell.hpp"
 
 extern short skill_bonus[21];
 
-short spell_level[62] = {
-	1,1,1,1,1,1,1,1,1,1, 2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,3,3,
-	4,4,4,4,4,4,4,4, 5,5,5,5,5,5,5,5, 6,6,6,6,6,6,6,6, 7,7,7,7,7,7,7,7};
-std::map<eSkill,std::array<short,62>> spell_cost = {
-	{eSkill::MAGE_SPELLS,
-	{1,1,1,1,1,2,50,2,1,3, 2,3,2,2,2,2,4,4,2,6, 3,3,5,3,3,5,6,4,6,4,
-		4,5,4,8,30,-1,8,6, 5,8,8,6,9,10,6,6, 7,6,8,7,12,10,12,20, 12,8,20,10,14,10,50,10},
-	}, {eSkill::PRIEST_SPELLS,
-	{1,1,1,2,1,1,3,5,50,1, 2,2,2,2,3,5,8,6,4,2, 3,4,3,3,3,10,5,3,4,6,
-		5,5,5,15,6,5,5,8, 6,7,25,8,10,12,12,6, 8,7,8,8,14,17,8,7, 10,10,35,10,12,12,30,10}
-	}
-};
 // TODO: Use magic-names.txt instead of these arrays
 const char *mage_s_name[62] = {
 	"Light","Spark","Minor Haste","Strength","Scare",
@@ -92,23 +81,15 @@ const char *alch_names_short[20] = {
 	"Resurrection Bal","Medium Energy Ptn.","Knowledge Brew"	,
 	"Strong Strength","Bliss","Strong Power"
 };
-std::map<eSkill,std::array<short,62>> spell_w_cast = {
-	{eSkill::MAGE_SPELLS,
-	{0,1,1,1,1,1,3,4,1,2, 1,1,1,1,1,1,4,1,4,1, 2,1,1,0,1,1,4,1,1,0,
-		1,1,1,2,4,1,1,1, 2,1,1,2,4,4,1,1, 1,1,1,1,4,4,1,5, 1,4,1,4,4,4,4,1},
-	}, {eSkill::PRIEST_SPELLS,
-	{1,0,0,1,3,1,1,3,2,1, 1,0,1,0,1,4,2,1,1,0, 0,0,1,2,0,3,1,0,0,1,
-		0,1,1,3,4,1,0,0, 1,0,3,1,1,4,2,4, 0,0,0,3,4,1,1,1, 0,1,3,1,4,1,5,0}
-	}
-};
-// 0 - everywhere 1 - combat only 2 - town only 3 - town & outdoor only 4 - town & combat only  5 - outdoor only
 bool get_mage[30] = {1,1,1,1,1,1,0,1,1,0, 1,1,1,1,1,1,0,0,1,1, 1,1,1,1,1,0,0,0,1,1};
 bool get_priest[30] = {1,1,1,1,1,1,0,0,0,1, 1,1,1,1,1,0,0,0,1,1, 1,0,1,1,0,0,0,1,0,0};
 short combat_percent[20] = {
 	150,120,100,90,80,80,80,70,70,70,
 	70,70,67,62,57,52,47,42,40,40};
 
-short town_spell,who_cast,which_pc_displayed;
+short who_cast,which_pc_displayed;
+eSpell town_spell;
+extern bool spell_freebie;
 bool spell_button_active[90];
 extern cItemRec start_items[6];
 
@@ -130,7 +111,7 @@ extern bool spell_forced,save_maps,suppress_stat_screen,boom_anim_active;
 //extern stored_items_list_type stored_items[3];
 //extern CursHandle sword_curs;
 //extern setup_save_type setup_save;
-extern short store_mage, store_priest;
+extern eSpell store_mage, store_priest;
 //extern cOutdoors outdoors[2][2];
 extern short store_mage_lev, store_priest_lev;
 extern short store_spell_target,pc_casting,stat_screen_mode;
@@ -146,8 +127,6 @@ extern short boom_gr[8];
 //extern stored_town_maps_type maps;
 //extern stored_outdoor_maps_type o_maps;
 extern short current_ground;
-extern short mage_need_select[62];
-extern short priest_need_select[62];
 extern short monst_marked_damage[60];
 extern location golem_m_locs[16];
 //extern town_item_list t_i;
@@ -1046,7 +1025,7 @@ bool is_weapon(short pc_num,short item)
 void cast_spell(eSkill type)
 //short type; // 0 - mage  1 - priest
 {
-	short spell;
+	eSpell spell;
 	
 	if ((is_town()) && (univ.town.is_antimagic(univ.town.p_loc.x,univ.town.p_loc.y))) {
 		add_string_to_buf("  Not in antimagic field.");
@@ -1060,7 +1039,7 @@ void cast_spell(eSkill type)
 			return;
 		spell = type == eSkill::MAGE_SPELLS ? store_mage : store_priest;
 	}
-	if (spell < 70) {
+	if(spell != eSpell::NONE) {
 		print_spell_cast(spell,type);
 		
 		if(type == eSkill::MAGE_SPELLS)
@@ -1073,7 +1052,9 @@ void cast_spell(eSkill type)
 
 bool repeat_cast_ok(eSkill type)
 {
-	short store_select,who_would_cast,what_spell;
+	short who_would_cast;
+	eSpellSelect store_select;
+	eSpell what_spell;
 	
 	if (overall_mode == MODE_COMBAT)
 		who_would_cast = current_pc;
@@ -1085,22 +1066,21 @@ bool repeat_cast_ok(eSkill type)
 		what_spell = univ.party[who_would_cast].last_cast[type];
 	else what_spell = type == eSkill::MAGE_SPELLS ? store_mage : store_priest;
 	
-	if (pc_can_cast_spell(who_would_cast,type,what_spell) == false) {
+	if(!pc_can_cast_spell(who_would_cast,what_spell)) {
 		add_string_to_buf("Repeat cast: Can't cast.");
 		return false;
 	}
-	store_select = type == eSkill::MAGE_SPELLS ? mage_need_select[what_spell] :
-	priest_need_select[what_spell];
-	if ((store_select > 0) && (store_spell_target == 6)) {
+	store_select = (*what_spell).need_select;
+	if(store_select != SELECT_NO && store_spell_target == 6) {
 		add_string_to_buf("Repeat cast: No target stored.");
 		return false;
 	}
-	if ((store_select == 2) &&
+	if(store_select == SELECT_ANY &&
 		isAbsent(univ.party[store_spell_target].main_status)) {
 			add_string_to_buf("Repeat cast: No target stored.");
 			return false;
 		}
-	if ((store_select == 1) &&
+	if(store_select == SELECT_ACTIVE &&
 		univ.party[store_spell_target].main_status != eMainStatus::ALIVE) {
 		add_string_to_buf("Repeat cast: No target stored.");
 		return false;
@@ -1141,7 +1121,7 @@ void give_party_spell(short which) ////
 			}
 }
 
-void do_mage_spell(short pc_num,short spell_num)
+void do_mage_spell(short pc_num,eSpell spell_num)
 {
 	short i,j,item,target,r1,adj,store;
 	location where;
@@ -1149,25 +1129,26 @@ void do_mage_spell(short pc_num,short spell_num)
 	where = univ.town.p_loc;
 	play_sound(25);
 	current_spell_range = 8;
+	store_mage = spell_num;
 	
 	adj = stat_adj(who_cast,eSkill::INTELLIGENCE);
 	
 	switch (spell_num) {
-		case 0:  // Light
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+		case eSpell::LIGHT:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			increase_light(50);
 			break;
 			
-		case 6: // Identify
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+		case eSpell::IDENTIFY:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			ASB("All of your items are identified.");
 			for (i = 0; i < 6; i++)
 				for (j = 0; j < 24; j++)
 					univ.party[i].items[j].ident = true;
 			break;
 			
-		case 9: // true sight
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+		case eSpell::TRUE_SIGHT:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			for (where.x = 0; where.x < 64; where.x++)
 				for (where.y = 0; where.y < 64; where.y++)
 					if (dist(where,univ.town.p_loc) <= 2)
@@ -1175,67 +1156,66 @@ void do_mage_spell(short pc_num,short spell_num)
 			clear_map();
 			break;
 			
-		case 16: // summon beast ////
+		case eSpell::SUMMON_BEAST:
 			r1 = get_summon_monster(1);
 			if (r1 < 0) break;
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = get_ran(3,1,4) + adj;
 			if (summon_monster(r1,where,store,2) == false)
 				add_string_to_buf("  Summon failed.");
 			break;
-		case 26: // summon 1
+		case eSpell::SUMMON_WEAK:
 			store = univ.party[who_cast].level / 5 + stat_adj(who_cast,eSkill::INTELLIGENCE) / 3 + get_ran(1,0,2);
 			j = minmax(1,7,store);
 			r1 = get_summon_monster(1); ////
 			if (r1 < 0) break;
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = get_ran(4,1,4) + adj;
 			for (i = 0; i < j; i++)
 				if (summon_monster(r1,where,store,2) == false)
 					add_string_to_buf("  Summon failed.");
 			break;
-		case 43: // summon 2
+		case eSpell::SUMMON:
 			store = univ.party[who_cast].level / 7 + stat_adj(who_cast,eSkill::INTELLIGENCE) / 3 + get_ran(1,0,1);
 			j = minmax(1,6,store);
 			r1 = get_summon_monster(2); ////
 			if (r1 < 0) break;
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = get_ran(5,1,4) + adj;
 			for (i = 0; i < j; i++)
 				if (summon_monster(r1,where,store,2) == false)
 					add_string_to_buf("  Summon failed.");
 			break;
-		case 58: // summon 3
+		case eSpell::SUMMON_MAJOR:
 			store = univ.party[who_cast].level / 10 + stat_adj(who_cast,eSkill::INTELLIGENCE) / 3 + get_ran(1,0,1);
 			j = minmax(1,5,store);
 			r1 = get_summon_monster(3); ////
 			if (r1 < 0) break;
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = get_ran(7,1,4) + stat_adj(who_cast,eSkill::INTELLIGENCE);
 			for (i = 0; i < j; i++)
 				if (summon_monster(r1,where,store,2) == false)
 					add_string_to_buf("  Summon failed.");
 			break;
-		case 50:
+		case eSpell::DEMON:
 			store = get_ran(5,1,4) + 2 * stat_adj(who_cast,eSkill::INTELLIGENCE);
 			if (summon_monster(85,where,store,2) == false)
 				add_string_to_buf("  Summon failed.");
-			else univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+			else univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			break;
 			
-		case 18: // dispel field
+		case eSpell::DISPEL_SQUARE:
 			add_string_to_buf("  Target spell.               ");
 			current_pat = square;
-			overall_mode = MODE_TOWN_TARGET;
-			set_town_spell(spell_num,pc_num);
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 23:  // Long light
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+		case eSpell::LIGHT_LONG:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			increase_light(200);
 			break;
 			
-		case 33:  // Magic map
+		case eSpell::MAGIC_MAP:
 			item = pc_has_abil(pc_num,eItemAbil::SAPPHIRE);
 			if (item == 24)
 				add_string_to_buf("  You need a sapphire.        ");
@@ -1243,7 +1223,7 @@ void do_mage_spell(short pc_num,short spell_num)
 				add_string_to_buf("  The spell fails.                ");
 			else {
 				remove_charge(pc_num,item);
-				univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+				univ.party[pc_num].cur_sp -= (*spell_num).cost;
 				add_string_to_buf("  As the sapphire dissolves,       ");
 				add_string_to_buf("  you have a vision.               ");
 				for (i = 0; i < 64; i++)
@@ -1254,34 +1234,26 @@ void do_mage_spell(short pc_num,short spell_num)
 			break;
 			
 			
-		case 38:  // Stealth
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+		case eSpell::STEALTH:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			PSD[SDF_PARTY_STEALTHY] += max(6,univ.party[pc_num].level * 2);
 			break;
 			
 			
-		case 7: case 20: case 34: case 41:  //  Scry monster, Unlock, disp. barrier, Capture SOul
+		case eSpell::SCRY_MONSTER: case eSpell::UNLOCK: case eSpell::CAPTURE_SOUL: case eSpell::DISPEL_BARRIER:
+		case eSpell::BARRIER_FIRE: case eSpell::BARRIER_FORCE: case eSpell::QUICKFIRE:
 			add_string_to_buf("  Target spell.               ");
 			current_pat = single;
-			overall_mode = MODE_TOWN_TARGET;
-			set_town_spell(spell_num,pc_num);
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 42: case 59: case 60: // fire and force barriers, quickfire
+		case eSpell::ANTIMAGIC:
 			add_string_to_buf("  Target spell.               ");
-			overall_mode = MODE_TOWN_TARGET;
-			current_pat = single;
-			set_town_spell(spell_num,pc_num);
-			break;
-			
-		case 51: // antimagic
-			add_string_to_buf("  Target spell.               ");
-			overall_mode = MODE_TOWN_TARGET;
 			current_pat = rad2;
-			set_town_spell(spell_num,pc_num);
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 53: // fly
+		case eSpell::FLIGHT:
 			if (PSD[SDF_PARTY_FLIGHT] > 0) {
 				add_string_to_buf("  Not while already flying.          ");
 				return;
@@ -1291,17 +1263,17 @@ void do_mage_spell(short pc_num,short spell_num)
 			else if (univ.party.in_horse >= 0) ////
 				add_string_to_buf("  Leave horse first.             ");
 			else {
-				univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
+				univ.party[pc_num].cur_sp -= (*spell_num).cost;
 				add_string_to_buf("  You start flying!               ");
 				PSD[SDF_PARTY_FLIGHT] = 3;
 			}
 			break;
 			
-		case 29: case 57: //  resist magic  protection
+		case eSpell::RESIST_MAGIC: case eSpell::PROTECTION:
 			target = store_spell_target;
 			if (target < 6)
-				univ.party[pc_num].cur_sp -= spell_cost[eSkill::MAGE_SPELLS][spell_num];
-			if ((spell_num == 57) && (target < 6)) {
+				univ.party[pc_num].cur_sp -= (*spell_num).cost;
+			if(spell_num == eSpell::PROTECTION && target < 6) {
 				univ.party[target].status[eStatus::INVULNERABLE] += 2 + stat_adj(pc_num,eSkill::INTELLIGENCE) + get_ran(2,1,2);
 				for (i = 0; i < 6; i++)
 					if(univ.party[i].main_status == eMainStatus::ALIVE) {
@@ -1309,7 +1281,7 @@ void do_mage_spell(short pc_num,short spell_num)
 					}
 				sprintf ((char *) c_line, "  Party protected.                         ");
 			}
-			if ((spell_num == 29) && (target < 6)) {
+			if(spell_num == eSpell::RESIST_MAGIC && target < 6) {
 				univ.party[target].status[eStatus::MAGIC_RESISTANCE] += 2 + stat_adj(pc_num,eSkill::INTELLIGENCE) + get_ran(2,1,2);
 				sprintf ((char *) c_line, "  %s protected.",univ.party[target].name.c_str());
 			}
@@ -1318,7 +1290,7 @@ void do_mage_spell(short pc_num,short spell_num)
 	}
 }
 
-void do_priest_spell(short pc_num,short spell_num) ////
+void do_priest_spell(short pc_num,eSpell spell_num) ////
 {
 	short r1,r2, target, i,item,store,adj,x,y;
 	location loc;
@@ -1332,10 +1304,11 @@ void do_priest_spell(short pc_num,short spell_num) ////
 	
 	play_sound(24);
 	current_spell_range = 8;
+	store_priest = spell_num;
 	
 	switch (spell_num) {
-		case 4: ////
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::LOCATION:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			
 			if (is_town()) {
 				loc = (overall_mode == MODE_OUTDOORS) ? univ.party.p_loc : univ.town.p_loc;
@@ -1352,37 +1325,37 @@ void do_priest_spell(short pc_num,short spell_num) ////
 			add_string_to_buf((char *) c_line);
 			break;
 			
-		case 7: case 25: // manna spells
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::MANNA_MINOR: case eSpell::MANNA:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = univ.party[pc_num].level / 3 + 2 * stat_adj(who_cast,eSkill::INTELLIGENCE) + get_ran(2,1,4);
 			r1 = max(0,store);
-			if (spell_num == 7)
+			if (spell_num == eSpell::MANNA_MINOR)
 				r1 = r1 / 3;
 			sprintf ((char *) c_line, "  You gain %d food.   ",r1);
 			add_string_to_buf((char *) c_line);
 			give_food(r1,true);
 			break;
 			
-		case 8: // Ritual - Sanctify
+		case eSpell::RITUAL_SANCTIFY:
 			add_string_to_buf("  Sanctify which space?               ");
 			current_pat = single;
-			overall_mode = MODE_TOWN_TARGET;
-			set_town_spell(100 + spell_num,pc_num);
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 13:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::LIGHT_DIVINE:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
+			// TODO: Should this call increase_light_level?
 			univ.party.light_level += 210;
 			break;
 			
-		case 15:
+		case eSpell::SUMMON_SPIRIT:
 			store = stat_adj(who_cast,eSkill::INTELLIGENCE);
 			if (summon_monster(125,where,get_ran(2,1,4) + store,2) == false)
 				add_string_to_buf("  Summon failed.");
-			else univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			else univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			break;
-		case 34:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::STICKS_TO_SNAKES:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			r1 = univ.party[who_cast].level / 6 + stat_adj(who_cast,eSkill::INTELLIGENCE) / 3 + get_ran(1,0,1);
 			for (i = 0; i < r1; i++) {
 				r2 = get_ran(1,0,7);
@@ -1391,8 +1364,8 @@ void do_priest_spell(short pc_num,short spell_num) ////
 					add_string_to_buf("  Summon failed.");
 			}
 			break;
-		case 43:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::SUMMON_HOST:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			store = get_ran(2,1,4) + stat_adj(who_cast,eSkill::INTELLIGENCE);
 			if (summon_monster(126,where,store,2) == false)
 				add_string_to_buf("  Summon failed.");
@@ -1402,49 +1375,47 @@ void do_priest_spell(short pc_num,short spell_num) ////
 					add_string_to_buf("  Summon failed.");
 			}
 			break;
-		case 50:
+		case eSpell::SUMMON_GUARDIAN:
 			store = get_ran(6,1,4) + stat_adj(who_cast,eSkill::INTELLIGENCE);
 			if (summon_monster(122,where,store,2) == false)
 				add_string_to_buf("  Summon failed.");
-			else univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			else univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			break;
 			
-		case 16:
+		case eSpell::MOVE_MOUNTAINS: case eSpell::MOVE_MOUNTAINS_MASS:
 			add_string_to_buf("  Destroy what?               ");
-			current_pat = (spell_num == 16) ? single : square;
-			overall_mode = MODE_TOWN_TARGET;
-			set_town_spell(100 + spell_num,pc_num);
+			current_pat = (spell_num == eSpell::MOVE_MOUNTAINS) ? single : square;
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 45: // dispelling fields
+		case eSpell::DISPEL_SPHERE: case eSpell::DISPEL_FIELD:
 			add_string_to_buf("  Target spell.               ");
-			current_pat = (spell_num == 19) ? single : rad2;
-			overall_mode = MODE_TOWN_TARGET;
-			set_town_spell(100 + spell_num,pc_num);
+			current_pat = (spell_num == eSpell::DISPEL_SPHERE) ? rad2 : single;
+			start_town_targeting(spell_num,pc_num);
 			break;
 			
-		case 23: // Detect life
+		case eSpell::DETECT_LIFE:
 			add_string_to_buf("  Monsters now on map.                ");
 			PSD[SDF_PARTY_DETECT_LIFE] += 6 + get_ran(1,0,6);
 			clear_map();
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			break;
-		case 37: // firewalk
+		case eSpell::FIREWALK:
 			add_string_to_buf("  You are now firewalking.                ");
 			PSD[SDF_PARTY_FIREWALK] += univ.party[pc_num].level / 12 + 2;
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			break;
 			
-		case 44: // shatter
+		case eSpell::SHATTER:
 			add_string_to_buf("  You send out a burst of energy. ");
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			for (loc.x = where.x - 1;loc.x < where.x + 2; loc.x++)
 				for (loc.y = where.y - 1;loc.y < where.y + 2; loc.y++)
 					crumble_wall(loc);
 			update_explored(univ.town.p_loc);
 			break;
 			
-		case 60:
+		case eSpell::WORD_RECALL:
 			if (overall_mode > MODE_OUTDOORS) {
 				add_string_to_buf("  Can only cast outdoors. ");
 				return;
@@ -1457,7 +1428,7 @@ void do_priest_spell(short pc_num,short spell_num) ////
 				add_string_to_buf("  Not while on horseback. ");
 				return;
 			}
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			add_string_to_buf("  You are moved... ");
 			force_town_enter(scenario.which_town_start,scenario.where_start);
 			start_town_mode(scenario.which_town_start,9);
@@ -1470,28 +1441,32 @@ void do_priest_spell(short pc_num,short spell_num) ////
 			redraw_screen(REFRESH_ALL);
 			break;
 			
-		case 1: case 20: case 39:  case 2: case 11: case 27: case 28: case 36: case 19: case 24:
+		case eSpell::HEAL_MINOR: case eSpell::HEAL: case eSpell::HEAL_MAJOR:
+		case eSpell::POISON_WEAKEN: case eSpell::POISON_CURE: case eSpell::DISEASE_CURE:
+		case eSpell::RESTORE_MIND: case eSpell::CLEANSE: case eSpell::AWAKEN: case eSpell::PARALYSIS_CURE:
 //			target = select_pc(11,0);
 			target = store_spell_target;
 			if (target < 6) {
-				univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+				univ.party[pc_num].cur_sp -= (*spell_num).cost;
 				switch(spell_num) {
-					case 1: case 20: case 39:
-						r1 = get_ran(2 + 2 * (spell_num / 6), 1, 4);
+					case eSpell::HEAL_MINOR: case eSpell::HEAL: case eSpell::HEAL_MAJOR:
+						if(spell_num == eSpell::HEAL_MINOR)
+							r1 = get_ran(2, 1, 4);
+						else r1 = get_ran(2 + (spell_num == eSpell::HEAL ? 6 : 12), 1, 4);
 						sprintf ((char *) c_line, "  %s healed %d.   ",
 								 (char *) univ.party[target].name.c_str(),r1);
 						heal_pc(target,r1);
 						one_sound(52);
 						break;
 						
-					case 2: case 11:
+					case eSpell::POISON_WEAKEN: case eSpell::POISON_CURE:
 						sprintf ((char *) c_line, "  %s cured.    "
 								 ,(char *) univ.party[target].name.c_str());
-						r1 = ((spell_num == 2) ? 1 : 3) + get_ran(1,0,2) + stat_adj(pc_num,eSkill::INTELLIGENCE) / 2;
+						r1 = ((spell_num == eSpell::POISON_WEAKEN) ? 1 : 3) + get_ran(1,0,2) + stat_adj(pc_num,eSkill::INTELLIGENCE) / 2;
 						cure_pc(target,r1);
 						break;
 						
-					case 19: // awaken
+					case eSpell::AWAKEN:
 						if(univ.party[target].status[eStatus::ASLEEP] <= 0) {
 							sprintf ((char *) c_line, "  %s is already awake!    "
 									 ,(char *) univ.party[target].name.c_str());
@@ -1501,7 +1476,7 @@ void do_priest_spell(short pc_num,short spell_num) ////
 								 ,(char *) univ.party[target].name.c_str());
 						univ.party[target].status[eStatus::ASLEEP] = 0;
 						break;
-					case 24: // cure paralysis
+					case eSpell::PARALYSIS_CURE:
 						if(univ.party[target].status[eStatus::PARALYZED] <= 0) {
 							sprintf ((char *) c_line, "  %s isn't paralyzed!    "
 									 ,(char *) univ.party[target].name.c_str());
@@ -1512,21 +1487,21 @@ void do_priest_spell(short pc_num,short spell_num) ////
 						univ.party[target].status[eStatus::PARALYZED] = 0;
 						break;
 						
-					case 27:
+					case eSpell::DISEASE_CURE:
 						sprintf ((char *) c_line, "  %s recovers.      "
 								 ,(char *) univ.party[target].name.c_str());
 						r1 = 2 + get_ran(1,0,2) + stat_adj(pc_num,eSkill::INTELLIGENCE) / 2;
 						univ.party[target].status[eStatus::DISEASE] = max(0,univ.party[target].status[eStatus::DISEASE] - r1);
 						break;
 						
-					case 28:
+					case eSpell::RESTORE_MIND:
 						sprintf ((char *) c_line, "  %s restored.      "
 								 ,(char *) univ.party[target].name.c_str());
 						r1 = 1 + get_ran(1,0,2) + stat_adj(pc_num,eSkill::INTELLIGENCE) / 2;
 						univ.party[target].status[eStatus::DUMB] = max(0,univ.party[target].status[eStatus::DUMB] - r1);
 						break;
 						
-					case 36:
+					case eSpell::CLEANSE:
 						sprintf ((char *) c_line, "  %s cleansed.      "
 								 ,(char *) univ.party[target].name.c_str());
 						univ.party[target].status[eStatus::DISEASE] = 0;
@@ -1538,29 +1513,28 @@ void do_priest_spell(short pc_num,short spell_num) ////
 			put_pc_screen();
 			break;
 			
-		case 47: case 49: case 40: case 56: case 33: case 5: case 6: case 35:
+		case eSpell::REVIVE: case eSpell::DESTONE: case eSpell::RAISE_DEAD: case eSpell::RESURRECT:
+		case eSpell::CURSE_REMOVE: case eSpell::SANCTUARY: case eSpell::SYMBIOSIS: case eSpell::MARTYRS_SHIELD:
 			target = store_spell_target;
 			
 			if (target < 6) {
-				if ((spell_num == 6) && (target == pc_num)) { // check symbiosis
+				if(spell_num == eSpell::SYMBIOSIS && target == pc_num) {
 					add_string_to_buf("  Can't cast on self.");
 					return;
 				}
 				
-				univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
-				if (spell_num == 35) { // martyr's shield
+				univ.party[pc_num].cur_sp -= (*spell_num).cost;
+				if(spell_num == eSpell::MARTYRS_SHIELD) {
 					sprintf ((char *) c_line, "  %s shielded.         ",
 							 (char *) univ.party[target].name.c_str());
 					r1 = max(1,get_ran((univ.party[pc_num].level + 5) / 5,1,3) + adj);
 					univ.party[target].status[eStatus::MARTYRS_SHIELD] += r1;
-				}
-				if (spell_num == 5) { // sanctuary
+				} else if(spell_num == eSpell::SANCTUARY) {
 					sprintf ((char *) c_line, "  %s hidden.         ",
 							 (char *) univ.party[target].name.c_str());
 					r1 = max(0,get_ran(0,1,3) + univ.party[pc_num].level / 4 + adj);
 					univ.party[target].status[eStatus::INVISIBLE] += r1;
-				}
-				if (spell_num == 6) { // symbiosis
+				} else if(spell_num == eSpell::SYMBIOSIS) {
 					store_victim_health = univ.party[target].cur_health;
 					store_caster_health = univ.party[pc_num].cur_health;
 					targ_damaged = univ.party[target].max_health - univ.party[target].cur_health;
@@ -1579,15 +1553,13 @@ void do_priest_spell(short pc_num,short spell_num) ////
 					add_string_to_buf ((char *) c_line);
 					sprintf ((char *) c_line, "  %s takes %d.         ", (char *) univ.party[pc_num].name.c_str(),
 							 store_caster_health - univ.party[pc_num].cur_health);
-				}
-				if (spell_num == 47) {
+				} else if(spell_num == eSpell::REVIVE) {
 					sprintf ((char *) c_line, "  %s healed.         ",
 							 (char *) univ.party[target].name.c_str());
 					heal_pc(target,250);
 					univ.party[target].status[eStatus::POISON] = 0;
 					one_sound(-53); one_sound(52);
-				}
-				if (spell_num == 49) {
+				} else if(spell_num == eSpell::DESTONE) {
 					if(univ.party[target].main_status == eMainStatus::STONE) {
 						univ.party[target].main_status = eMainStatus::ALIVE;
 						sprintf ((char *) c_line, "  %s destoned.                                  ",
@@ -1595,8 +1567,7 @@ void do_priest_spell(short pc_num,short spell_num) ////
 						play_sound(53);
 					}
 					else sprintf ((char *) c_line,"  Wasn't stoned.              ");
-				}
-				if (spell_num == 33) {
+				} else if(spell_num == eSpell::CURSE_REMOVE) {
 					for (i = 0; i < 24; i++)
 						if (univ.party[target].items[i].cursed){
 							r1 = get_ran(1,0,200) - 10 * stat_adj(pc_num,eSkill::INTELLIGENCE);
@@ -1606,16 +1577,16 @@ void do_priest_spell(short pc_num,short spell_num) ////
 						}
 					play_sound(52);
 					sprintf ((char *) c_line,"  Your items glow.     ");
-				}
+				} else {
 				
-				if(!PSD[SDF_RESURRECT_NO_BALM] && (spell_num == 40 || spell_num == 56)) {
+				if(!PSD[SDF_RESURRECT_NO_BALM]) {
 					if ((item = pc_has_abil(pc_num,eItemAbil::RESSURECTION_BALM)) == 24) {
 						add_string_to_buf("  Need resurrection balm.        ");
-						spell_num = 500;
+						break;
 					}
 					else take_item(pc_num,item);
 				}
-				if (spell_num == 40) {
+				if(spell_num == eSpell::RAISE_DEAD) {
 					if(univ.party[target].main_status == eMainStatus::DEAD)
 						if (get_ran(1,1,univ.party[pc_num].level / 2) == 1) {
 							sprintf ((char *) c_line, "  %s now dust.                          ",
@@ -1637,8 +1608,7 @@ void do_priest_spell(short pc_num,short spell_num) ////
 						}
 						else sprintf ((char *) c_line,"  Didn't work.              ");
 					
-				}
-				if (spell_num == 56) {
+				} else if (spell_num == eSpell::RESURRECT) {
 					if (univ.party[target].main_status != eMainStatus::ALIVE) {
 						univ.party[target].main_status = eMainStatus::ALIVE;
 						for (i = 0; i < 3; i++)
@@ -1653,21 +1623,22 @@ void do_priest_spell(short pc_num,short spell_num) ////
 					}
 					else sprintf ((char *) c_line,"  Was OK.              ");
 				}
+				}
 				add_string_to_buf((char *) c_line);
 				put_pc_screen();
 			}
 			break;
 			
-		case 21: case 46: case 54:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
-			r1 = get_ran(spell_num / 7 + adj, 1, 4);
-			if (spell_num < 54) {
+		case eSpell::HEAL_ALL_LIGHT: case eSpell::HEAL_ALL: case eSpell::REVIVE_ALL:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
+			if(spell_num != eSpell::REVIVE_ALL) {
+				r1 = get_ran((spell_num == eSpell::HEAL_ALL ? 6 : 3) + adj, 1, 4);
 				sprintf ((char *) c_line, "  Party healed %d.       ", r1);
 				add_string_to_buf((char *) c_line);
 				heal_party(r1);
 				play_sound(52);
-			}
-			else if (spell_num == 54) {
+			} else {
+				r1 = get_ran(7 + adj, 1, 4);
 				sprintf ((char *) c_line, "  Party revived.     ");
 				add_string_to_buf((char *) c_line);
 				r1 = r1 * 2;
@@ -1678,33 +1649,35 @@ void do_priest_spell(short pc_num,short spell_num) ////
 			}
 			break;
 			
-		case 30:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::POISON_CURE_ALL:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			sprintf ((char *) c_line, "  Party cured.  ");
 			add_string_to_buf((char *) c_line);
 			cure_party(3 + stat_adj(pc_num,eSkill::INTELLIGENCE));
 			break;
 			
-		case 42: case 61: case 48:
-			univ.party[pc_num].cur_sp -= spell_cost[eSkill::PRIEST_SPELLS][spell_num];
+		case eSpell::SANCTUARY_MASS: case eSpell::CLEANSE_MAJOR: case eSpell::HYPERACTIVITY:
+			univ.party[pc_num].cur_sp -= (*spell_num).cost;
 			switch (spell_num) {
-				case 42: add_string_to_buf("  Party hidden.");break;
-				case 61: add_string_to_buf("  Party cleansed.");break;
-				case 48: add_string_to_buf("  Party is now really, REALLY awake.");break;
+				case eSpell::SANCTUARY_MASS: add_string_to_buf("  Party hidden.");break;
+				case eSpell::CLEANSE_MAJOR: add_string_to_buf("  Party cleansed.");break;
+				case eSpell::HYPERACTIVITY: add_string_to_buf("  Party is now really, REALLY awake.");break;
 			}
 			
 			for (i = 0; i < 6; i++)
 				if(univ.party[i].main_status == eMainStatus::ALIVE) {
-					if (spell_num == 42) {
+					if(spell_num == eSpell::SANCTUARY_MASS) {
 						store = get_ran(0,1,3) + univ.party[pc_num].level / 6 + stat_adj(pc_num,eSkill::INTELLIGENCE);
 						r1 = max(0,store);
 						univ.party[i].status[eStatus::INVISIBLE] += r1;
 					}
-					if (spell_num == 61) {
+					if(spell_num == eSpell::CLEANSE_MAJOR) {
 						univ.party[i].status[eStatus::WEBS] = 0;
 						univ.party[i].status[eStatus::DISEASE] = 0;
 					}
-					if (spell_num == 48) { // Hyperactivity
+					if(spell_num == eSpell::HYPERACTIVITY) {
+						// Looks like this isn't clipped to a positive number. (That's probably intentional.)
+						// TODO: So, should a status icon be added for negative levels of sleep?
 						univ.party[i].status[eStatus::ASLEEP] -= 6 + 2 * stat_adj(pc_num,eSkill::INTELLIGENCE);
 						univ.party[i].status[eStatus::HASTE_SLOW] = max(0,univ.party[i].status[eStatus::HASTE_SLOW]);
 					}
@@ -1728,10 +1701,9 @@ void cast_town_spell(location where) ////
 	}
 	
 	adjust = can_see_light(univ.town.p_loc,where,sight_obscurity);
-	eSkill spell_type = town_spell >= 100 ? eSkill::PRIEST_SPELLS : eSkill::MAGE_SPELLS;
-	if (town_spell < 1000)
-		univ.party[who_cast].cur_sp -= spell_cost[spell_type][town_spell % 100];
-	else town_spell -= 1000;
+	eSkill spell_type = (*town_spell).type;
+	if(!spell_freebie)
+		univ.party[who_cast].cur_sp -= (*town_spell).cost;
 	ter = univ.town->terrain(where.x,where.y);
 	
 	// TODO: Should we do this here? Or in the handling of targeting modes?
@@ -1742,10 +1714,10 @@ void cast_town_spell(location where) ////
 	if (adjust > 4)
 		add_string_to_buf("  Can't see target.       ");
 	else switch (town_spell) {
-		case 7: case 34: // Scry, Capture Soul
+		case eSpell::SCRY_MONSTER: case eSpell::CAPTURE_SOUL:
 			targ = monst_there(where);
 			if (targ < univ.town->max_monst()) {
-				if (town_spell == 7) {
+				if(town_spell == eSpell::SCRY_MONSTER) {
 					univ.party.m_noted[univ.town.monst[targ].number] = true;
 					adjust_monst_menu();
 					display_monst(0,&univ.town.monst[targ],0);
@@ -1755,16 +1727,16 @@ void cast_town_spell(location where) ////
 			else add_string_to_buf("  No monster there.");
 			break;
 			
-		case 119: case 145: case 18:
+		case eSpell::DISPEL_FIELD: case eSpell::DISPEL_SPHERE: case eSpell::DISPEL_SQUARE:
 			add_string_to_buf("  You attempt to dispel.              ");
 			place_spell_pattern(current_pat,where,FIELD_DISPEL,7);
 			break;
-		case 116: // Move M.
+		case eSpell::MOVE_MOUNTAINS:
 			add_string_to_buf("  You blast the area.              ");
 			crumble_wall(where);
 			update_explored(univ.town.p_loc);
 			break;
-		case 42:
+		case eSpell::BARRIER_FIRE:
 			if(sight_obscurity(where.x,where.y) == 5 || monst_there(where) < 90) {
 				add_string_to_buf("  Target space obstructed.");
 				break;
@@ -1774,7 +1746,7 @@ void cast_town_spell(location where) ////
 				add_string_to_buf("  You create the barrier.              ");
 			else add_string_to_buf("  Failed.");
 			break;
-		case 59:
+		case eSpell::BARRIER_FORCE:
 			if(sight_obscurity(where.x,where.y) == 5 || monst_there(where) < 90) {
 				add_string_to_buf("  Target space obstructed.");
 				break;
@@ -1784,14 +1756,14 @@ void cast_town_spell(location where) ////
 				add_string_to_buf("  You create the barrier.              ");
 			else add_string_to_buf("  Failed.");
 			break;
-		case 60:
+		case eSpell::QUICKFIRE:
 			univ.town.set_quickfire(where.x,where.y,true);
 			if (univ.town.is_quickfire(where.x,where.y))
 				add_string_to_buf("  You create quickfire.              ");
 			else add_string_to_buf("  Failed.");
 			break;
 			
-		case 51: // am cloud
+		case eSpell::ANTIMAGIC:
 			add_string_to_buf("  You create an antimagic cloud.              ");
 			for (loc.x = 0; loc.x < univ.town->max_dim(); loc.x++)
 				for (loc.y = 0; loc.y < univ.town->max_dim(); loc.y++)
@@ -1800,11 +1772,12 @@ void cast_town_spell(location where) ////
 						univ.town.set_antimagic(loc.x,loc.y,true);
 			break;
 			
-		case 108: // RItual - sanctify
+		case eSpell::RITUAL_SANCTIFY:
 			// Nothing to do here anymore; the code that used to be here is now just above the switch statement.
 			break;
 			
-		case 20:
+		case eSpell::UNLOCK:
+			// TODO: Is the unlock spell supposed to have a max range?
 			if(scenario.ter_types[ter].special == eTerSpec::UNLOCKABLE){
 				if (scenario.ter_types[ter].flag2.u == 10)
 					r1 = 10000;
@@ -1825,7 +1798,7 @@ void cast_town_spell(location where) ////
 				add_string_to_buf("  Wrong terrain type.               ");
 			break;
 			
-		case 41:
+		case eSpell::DISPEL_BARRIER:
 			if ((univ.town.is_fire_barr(where.x,where.y)) || (univ.town.is_force_barr(where.x,where.y))) {
 				r1 = get_ran(1,1,100) - 5 * stat_adj(who_cast,eSkill::INTELLIGENCE) + 5 * (univ.town.difficulty / 10);
 				if (univ.town.is_fire_barr(where.x,where.y))
@@ -1852,7 +1825,7 @@ void cast_town_spell(location where) ////
 	}
 }
 
-bool cast_spell_on_space(location where, unsigned short spell)
+bool cast_spell_on_space(location where, eSpell spell)
 {
 	short i,s1 = 0,s2 = 0,s3 = 0;
 	
@@ -1863,7 +1836,7 @@ bool cast_spell_on_space(location where, unsigned short spell)
 			if(s3) redraw_terrain();
 			return !s1;
 		}
-	if(spell == 108)
+	if(spell == eSpell::RITUAL_SANCTIFY)
 		add_string_to_buf("  Nothing happens.");
 	return true;
 }
@@ -1979,25 +1952,51 @@ void dispel_fields(short i,short j,short mode)
 		univ.town.set_blade_wall(i,j,false);
 }
 
-bool pc_can_cast_spell(short pc_num,eSkill type,short spell_num)
+bool pc_can_cast_spell(short pc_num,eSkill type) {
+	short store_w_cast;
+	
+	if(type == eSkill::MAGE_SPELLS && !pc_can_cast_spell(pc_num, eSpell::LIGHT))
+	   return false;
+	if(type == eSkill::PRIEST_SPELLS && !pc_can_cast_spell(pc_num, eSpell::BLESS_MINOR))
+		return false;
+	
+	// If they can't cast the most basic level 1 spell, let's just make sure they can't cast any spells.
+	// Find a spell they definitely know, and see if they can cast that.
+	if(type == eSkill::MAGE_SPELLS) {
+		for(int i = 0; i < 62; i++)
+			if(univ.party[pc_num].mage_spells[i])
+				return pc_can_cast_spell(pc_num, eSpell(i));
+	}
+	if(type == eSkill::PRIEST_SPELLS) {
+		for(int i = 0; i < 62; i++)
+			if(univ.party[pc_num].priest_spells[i])
+				return pc_can_cast_spell(pc_num, eSpell(i + 100));
+	}
+	// If we get this far, either they don't know any spells (very unlikely) or they can't cast any of the spells they know.
+	return false;
+}
+
+bool pc_can_cast_spell(short pc_num,eSpell spell_num)
 {
 	short level,store_w_cast;
+	eSkill type = (*spell_num).type;
 	
-	level = spell_level[spell_num];
+	level = (*spell_num).level;
 	
 	if(overall_mode >= MODE_TALKING)
 		return false; // From Windows version. It does kinda make sense, though this function shouldn't even be called in these modes.
-	if ((spell_num < 0) || (spell_num > 61))
+	if(!isMage(spell_num) && !isPriest(spell_num))
 		return false;
 	if (univ.party[pc_num].skills[type] < level)
 		return false;
 	if(univ.party[pc_num].main_status != eMainStatus::ALIVE)
 		return false;
-	if (univ.party[pc_num].cur_sp < spell_cost[type][spell_num])
+	if (univ.party[pc_num].cur_sp < (*spell_num).cost)
 		return false;
-	if(type == eSkill::MAGE_SPELLS && !univ.party[pc_num].mage_spells[spell_num])
+	// TODO: Maybe get rid of the casts here?
+	if(type == eSkill::MAGE_SPELLS && !univ.party[pc_num].mage_spells[int(spell_num)])
 		return false;
-	if(type == eSkill::PRIEST_SPELLS && !univ.party[pc_num].priest_spells[spell_num])
+	if(type == eSkill::PRIEST_SPELLS && !univ.party[pc_num].priest_spells[int(spell_num) - 100])
 		return false;
 	if(univ.party[pc_num].status[eStatus::DUMB] >= 8 - level)
 		return false;
@@ -2006,24 +2005,13 @@ bool pc_can_cast_spell(short pc_num,eSkill type,short spell_num)
 	if(univ.party[pc_num].status[eStatus::ASLEEP] > 0)
 		return false;
 	
-	// TODO: Make an enum for this
-	// 0 - everywhere 1 - combat only 2 - town only 3 - town & outdoor only 4 - town & combat only  5 - outdoor only
-	store_w_cast = spell_w_cast[type][spell_num];
-	if (is_out()) {
-		if ((store_w_cast == 1) || (store_w_cast == 2) || (store_w_cast == 4)) {
+	store_w_cast = (*spell_num).when_cast;
+	if(is_out() && WHEN_OUTDOORS &~ store_w_cast)
 			return false;
-		}
-	}
-	if (is_town()) {
-		if ((store_w_cast == 1) || (store_w_cast == 5)) {
+	if(is_town() && WHEN_TOWN &~ store_w_cast)
 			return false;
-		}
-	}
-	if (is_combat()) {
-		if ((store_w_cast == 2) || (store_w_cast == 3) || (store_w_cast == 5)) {
+	if(is_combat() &&  WHEN_COMBAT &~ store_w_cast)
 			return false;
-		}
-	}
 	return true;
 }
 
@@ -2043,8 +2031,7 @@ static void draw_caster_buttons(cDialog& me, const eSkill store_situation) {
 			}
 		}
 		else {
-			// TODO: This means if spell 0 is removed they can't cast any spells - not good!
-			if(pc_can_cast_spell(i,store_situation,0)) {
+			if(pc_can_cast_spell(i,store_situation)) {
 				me[id].show();
 			}
 			else {
@@ -2054,11 +2041,10 @@ static void draw_caster_buttons(cDialog& me, const eSkill store_situation) {
 	}
 }
 
-static void draw_spell_info(cDialog& me, const eSkill store_situation) {
+static void draw_spell_info(cDialog& me, const eSkill store_situation, const short store_spell) {
 	
 	
-	if ((store_situation == eSkill::MAGE_SPELLS && store_mage == 70) ||
-		(store_situation == eSkill::PRIEST_SPELLS && store_priest == 70)) {	 // No spell selected
+	if(store_spell == 70) { // No spell selected
 		for(int i = 0; i < 6; i++) {
 			std::string id = "target" + boost::lexical_cast<std::string>(i + 1);
 			me[id].hide();
@@ -2070,12 +2056,11 @@ static void draw_spell_info(cDialog& me, const eSkill store_situation) {
 		for(int i = 0; i < 6; i++) {
 			std::string id = "target" + boost::lexical_cast<std::string>(i + 1);
 			// TODO: Make this thing an enum
-			switch (((store_situation == eSkill::MAGE_SPELLS) ?
-					 mage_need_select[store_mage] : priest_need_select[store_priest])) {
-				case 0:
+			switch ((*cSpell::fromNum(store_situation,store_spell)).need_select) {
+				case SELECT_NO:
 					me[id].hide();
 					break;
-				case 1:
+				case SELECT_ACTIVE:
 					if(univ.party[i].main_status != eMainStatus::ALIVE) {
 						me[id].hide();
 					}
@@ -2083,7 +2068,8 @@ static void draw_spell_info(cDialog& me, const eSkill store_situation) {
 						me[id].show();
 					}
 					break;
-				case 2:
+				case SELECT_ANY:
+					// TODO: Split off party members should probably be excluded too?
 					if(univ.party[i].main_status != eMainStatus::ABSENT) {
 						me[id].show();
 					}
@@ -2189,7 +2175,7 @@ static void put_pc_target_buttons(cDialog& me, short& store_last_target_darkened
 }
 
 // TODO: This stuff may be better handled by using an LED group with a custom focus handler
-static void put_spell_led_buttons(cDialog& me, const eSkill store_situation) {
+static void put_spell_led_buttons(cDialog& me, const eSkill store_situation,const short store_spell) {
 	short i,spell_for_this_button;
 	
 	for (i = 0; i < 38; i++) {
@@ -2198,11 +2184,11 @@ static void put_spell_led_buttons(cDialog& me, const eSkill store_situation) {
 		cLed& led = dynamic_cast<cLed&>(me[id]);
 		
 		if (spell_for_this_button < 90) {
-			if ((store_situation == eSkill::MAGE_SPELLS && store_mage == spell_for_this_button) ||
-				(store_situation == eSkill::PRIEST_SPELLS && store_priest == spell_for_this_button)) {
+			eSpell spell = cSpell::fromNum(store_situation, spell_for_this_button);
+			if(store_spell == spell_for_this_button) {
 				led.setState(led_green);
 			}
-			else if (pc_can_cast_spell(pc_casting,store_situation,spell_for_this_button) == true) {
+			else if(pc_can_cast_spell(pc_casting,spell)) {
 				led.setState(led_red);
 			}
 			else {
@@ -2224,12 +2210,10 @@ static void put_spell_list(cDialog& me, const eSkill store_situation) {
 		me["col4"].setText("Level 4:");
 		for (i = 0; i < 38; i++) {
 			std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
-			if(store_situation == eSkill::MAGE_SPELLS) {
-				if (i == 35)
-					sprintf((char *) add_text,"%s (?)",mage_s_name[i]);
-				else sprintf((char *) add_text,"%s (%d)",mage_s_name[i],spell_cost[eSkill::MAGE_SPELLS][i]);
-			}
-			else sprintf((char *) add_text,"%s (%d)",priest_s_name[i],spell_cost[eSkill::PRIEST_SPELLS][i]);
+			auto& names = (store_situation == eSkill::MAGE_SPELLS ? mage_s_name : priest_s_name);
+			if((*cSpell::fromNum(store_situation,i)).cost < 0) { // Simulacrum, which has a variable cost
+					sprintf((char *) add_text,"%s (?)", names[i]);
+			} else sprintf((char *) add_text,"%s (%d)", names[i], (*cSpell::fromNum(store_situation,i)).cost);
 			//for (j = 0; j < 30; i++)
 			//	if (add_text[j] == '&')
 			//		add_text[j] = (char) ((97 + i > 122) ? 65 + (i - 26) : 97 + i);
@@ -2245,12 +2229,9 @@ static void put_spell_list(cDialog& me, const eSkill store_situation) {
 		me["col4"].setText("");
 		for (i = 0; i < 38; i++) {
 			std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
+			auto& names = (store_situation == eSkill::MAGE_SPELLS ? mage_s_name : priest_s_name);
 			if (spell_index[i] < 90) {
-				if(store_situation == eSkill::MAGE_SPELLS)
-					sprintf((char *) add_text,"%s %c %d",mage_s_name[spell_index[i]],
-							(char) ((97 + i > 122) ? 65 + (i - 26) : 97 + i),spell_cost[eSkill::MAGE_SPELLS][spell_index[i]]);
-				else sprintf((char *) add_text,"%s %c %d",priest_s_name[spell_index[i]],
-							 (char) ((97 + i > 122) ? 65 + (i - 26) : 97 + i),spell_cost[eSkill::PRIEST_SPELLS][spell_index[i]]);
+				sprintf(add_text, "%s (%d)", names[spell_index[i]], (*cSpell::fromNum(store_situation,i)).cost);
 				me[id].setText(add_text);
 			}
 			else me[id].hide();
@@ -2258,27 +2239,27 @@ static void put_spell_list(cDialog& me, const eSkill store_situation) {
 	}
 }
 
-static bool pick_spell_caster(cDialog& me, std::string id, const eSkill store_situation, short& last_darkened) {
+static bool pick_spell_caster(cDialog& me, std::string id, const eSkill store_situation, short& last_darkened, short& store_spell) {
 	short item_hit = id[id.length() - 1] - '1';
 	// TODO: This visibility check is probably not needed; wouldn't the dialog framework only trigger on visible elements?
 	if(me[id].isVisible()) {
 		pc_casting = item_hit;
-		if(!pc_can_cast_spell(pc_casting,store_situation,store_situation == eSkill::MAGE_SPELLS ? store_mage : store_priest)) {
+		if(!pc_can_cast_spell(pc_casting,cSpell::fromNum(store_situation,store_spell))) {
 			if (store_situation == eSkill::MAGE_SPELLS)
-				store_mage = 70;
-			else store_priest = 70;
+				store_spell = 70;
+			else store_spell = 70;
 			store_spell_target = 6;
 		}
-		draw_spell_info(me, store_situation);
+		draw_spell_info(me, store_situation,store_spell);
 		draw_spell_pc_info(me);
-		put_spell_led_buttons(me, store_situation);
+		put_spell_led_buttons(me, store_situation,store_spell);
 		put_pc_caster_buttons(me);
 		put_pc_target_buttons(me, last_darkened);
 	}
 	return true;
 }
 
-static bool pick_spell_target(cDialog& me, std::string id, const eSkill store_situation, short& last_darkened) {
+static bool pick_spell_target(cDialog& me, std::string id, const eSkill store_situation, short& last_darkened, const short store_spell) {
 	static const char*const no_target = " No target needed.";
 	static const char*const bad_target = " Can't cast on him/her.";
 	static const char*const got_target = " Target selected.";
@@ -2292,17 +2273,17 @@ static bool pick_spell_target(cDialog& me, std::string id, const eSkill store_si
 	} else {
 		me["feedback"].setText(got_target);
 		store_spell_target = item_hit;
-		draw_spell_info(me, store_situation);
+		draw_spell_info(me, store_situation, store_spell);
 		put_pc_target_buttons(me, last_darkened);
 	}
 	return true;
 }
 
-static bool pick_spell_event_filter(cDialog& me, std::string item_hit, const eSkill store_situation) {
+static bool pick_spell_event_filter(cDialog& me, std::string item_hit, const eSkill store_situation, const short store_spell) {
 	if(item_hit == "other") {
 		on_which_spell_page = 1 - on_which_spell_page;
 		put_spell_list(me, store_situation);
-		put_spell_led_buttons(me, store_situation);
+		put_spell_led_buttons(me, store_situation, store_spell);
 	} else if(item_hit == "help") {
 		univ.party.help_received[7] = 0;
 		give_help(207,8,me);
@@ -2310,7 +2291,7 @@ static bool pick_spell_event_filter(cDialog& me, std::string item_hit, const eSk
 	return true;
 }
 
-static bool pick_spell_select_led(cDialog& me, std::string id, eKeyMod mods, const eSkill store_situation, short& last_darkened) {
+static bool pick_spell_select_led(cDialog& me, std::string id, eKeyMod mods, const eSkill store_situation, short& last_darkened, short& store_spell) {
 	static const char*const choose_target = " Now pick a target.";
 	static const char*const bad_spell = " Spell not available.";
 	short item_hit = boost::lexical_cast<short>(id.substr(5)) - 1;
@@ -2323,16 +2304,16 @@ static bool pick_spell_select_led(cDialog& me, std::string id, eKeyMod mods, con
 	}
 	else {
 		if(store_situation == eSkill::MAGE_SPELLS)
-			store_mage = (on_which_spell_page == 0) ? item_hit : spell_index[item_hit];
-		else store_priest = (on_which_spell_page == 0) ? item_hit : spell_index[item_hit];
-		draw_spell_info(me, store_situation);
-		put_spell_led_buttons(me, store_situation);
+			store_spell = (on_which_spell_page == 0) ? item_hit : spell_index[item_hit];
+		else store_spell = (on_which_spell_page == 0) ? item_hit : spell_index[item_hit];
+		draw_spell_info(me, store_situation, store_spell);
+		put_spell_led_buttons(me, store_situation, store_spell);
 		
 		if (store_spell_target < 6) {
 			std::string targ = "target" + boost::lexical_cast<std::string>(store_spell_target + 1);
 			if(!me[targ].isVisible()) {
 				store_spell_target = 6;
-				draw_spell_info(me, store_situation);
+				draw_spell_info(me, store_situation, store_spell);
 				put_pc_target_buttons(me, last_darkened);
 			}
 		}
@@ -2340,7 +2321,7 @@ static bool pick_spell_select_led(cDialog& me, std::string id, eKeyMod mods, con
 		std::string targ = "target" + boost::lexical_cast<std::string>(pc_casting + 1);
 		if ((store_spell_target == 6) && me[targ].isVisible()) {
 			me["feedback"].setText(choose_target);
-			draw_spell_info(me, store_situation);
+			draw_spell_info(me, store_situation, store_spell);
 			play_sound(45); // formerly force_play_sound
 		}
 		else if(!me[targ].isVisible()) {
@@ -2352,10 +2333,8 @@ static bool pick_spell_select_led(cDialog& me, std::string id, eKeyMod mods, con
 	return true;
 }
 
-static bool finish_pick_spell(cDialog& me, bool spell_toast, const short store_store_target, const short store_mage_store, const short store_priest_store, const eSkill store_situation) {
+static bool finish_pick_spell(cDialog& me, bool spell_toast, const short store_store_target, const short& store_spell, const eSkill store_situation) {
 	if (spell_toast == true) {
-		store_mage = store_mage_store;
-		store_priest = store_priest_store;
 		store_spell_target = store_store_target ;
 		if (store_situation == eSkill::MAGE_SPELLS)
 			store_last_cast_mage = pc_casting;
@@ -2365,57 +2344,52 @@ static bool finish_pick_spell(cDialog& me, bool spell_toast, const short store_s
 		return true;
 	}
 	
-	if((store_situation == eSkill::MAGE_SPELLS && store_mage == 70) ||
-		(store_situation == eSkill::PRIEST_SPELLS && store_priest == 70)) {
+	eSpell picked_spell = cSpell::fromNum(store_situation,store_spell);
+	if(store_spell == 70) {
 		add_string_to_buf("Cast: No spell selected.");
-		store_mage = store_mage_store;
-		store_priest = store_priest_store;
 		store_spell_target = store_store_target ;
 		me.toast(false);
 		me.setResult<short>(70);
 		return true;
 	}
-	if(store_situation == eSkill::MAGE_SPELLS && mage_need_select[store_mage] == 0) {
+	if(store_situation == eSkill::MAGE_SPELLS && (*picked_spell).need_select == SELECT_NO) {
 		store_last_cast_mage = pc_casting;
-		univ.party[pc_casting].last_cast[store_situation] = store_mage;
+		univ.party[pc_casting].last_cast[store_situation] = picked_spell;
 		me.toast(false);
-		me.setResult<short>(store_mage);
+		me.setResult<short>(store_spell);
 		return true;
 	}
-	if(store_situation == eSkill::PRIEST_SPELLS && priest_need_select[store_priest] == 0) {
+	if(store_situation == eSkill::PRIEST_SPELLS && (*picked_spell).need_select == SELECT_NO) {
 		store_last_cast_priest = pc_casting;
-		univ.party[pc_casting].last_cast[store_situation] = store_priest;
+		univ.party[pc_casting].last_cast[store_situation] = picked_spell;
 		me.toast(false);
-		me.setResult<short>(store_priest);
+		me.setResult<short>(store_spell);
 		return true;
 	}
 	if (store_spell_target == 6) {
 		add_string_to_buf("Cast: Need to select target.");
-		store_mage = store_mage_store;
-		store_priest = store_priest_store;
 		store_spell_target = store_store_target ;
 		me.toast(false);
 		give_help(39,0,me);
 		me.setResult<short>(70);
 		return true;
 	}
-	me.setResult<short>((store_situation == eSkill::MAGE_SPELLS) ? store_mage : store_priest);
+	me.setResult<short>((store_situation == eSkill::MAGE_SPELLS) ? store_spell : store_spell);
 	if(store_situation == eSkill::MAGE_SPELLS)
 		store_last_cast_mage = pc_casting;
 	else store_last_cast_priest = pc_casting;
-	univ.party[pc_casting].last_cast[store_situation] = (store_situation == eSkill::MAGE_SPELLS ? store_mage : store_priest);
+	univ.party[pc_casting].last_cast[store_situation] = picked_spell;
 	me.toast(true);
 	return true;
 }
 
-short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
+eSpell pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 //short pc_num; // if 6, anyone
 //short type; // 0 - mage   1 - priest
 //short situation; // 0 - out  1 - town  2 - combat
 {
 	using namespace std::placeholders;
-	short former_mage = store_mage;
-	short former_priest = store_priest;
+	eSpell store_spell = type == eSkill::MAGE_SPELLS ? store_mage : store_priest;
 	short former_target = store_spell_target;
 //	store_situation = type;
 	short dark = 6;
@@ -2427,17 +2401,16 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 	
 	if (pc_num == 6) { // See if can keep same caster
 		can_choose_caster = true;
-		// TODO: This means that removing spell 0 prevents them from casting any spells - not good!
-		if(!pc_can_cast_spell(pc_casting,type,0)) {
+		if(!pc_can_cast_spell(pc_casting,type)) {
 			int i;
 			for(i = 0; i < 6; i++)
-				if (pc_can_cast_spell(i,type,0)) {
+				if (pc_can_cast_spell(i,type)) {
 					pc_casting = i;
 					i = 500;
 				}
 			if (i == 6) {
 				add_string_to_buf("Cast: Nobody can.");
-				return 70;
+				return eSpell::NONE;
 			}
 		}
 	}
@@ -2450,11 +2423,11 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 		if(univ.party[pc_num].skills[type] == 0) {
 			if(type == eSkill::MAGE_SPELLS) add_string_to_buf("Cast: No mage skill.");
 			else add_string_to_buf("Cast: No priest skill.");
-			return 70;
+			return eSpell::NONE;
 		}
 		if (univ.party[pc_casting].cur_sp == 0) {
 			add_string_to_buf("Cast: No spell points.");
-			return 70;
+			return eSpell::NONE;
 		}
 		
 	}
@@ -2462,34 +2435,31 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 	// If in combat, make the spell being cast this PCs most recent spell
 	if (is_combat()) {
 		if(type == eSkill::MAGE_SPELLS)
-			store_mage = univ.party[pc_casting].last_cast[eSkill::MAGE_SPELLS];
-		else store_priest = univ.party[pc_casting].last_cast[eSkill::PRIEST_SPELLS];
+			store_spell = univ.party[pc_casting].last_cast[eSkill::MAGE_SPELLS];
+		else store_spell = univ.party[pc_casting].last_cast[eSkill::PRIEST_SPELLS];
 	}
 	
 	// Keep the stored spell, if it's still castable
-	if(!pc_can_cast_spell(pc_casting,type,(type == eSkill::MAGE_SPELLS ? store_mage : store_priest))) {
+	if(!pc_can_cast_spell(pc_casting,store_spell)) {
 		if(type == eSkill::MAGE_SPELLS) {
-			store_mage = 0;
-			store_mage_lev = 1;
+			store_spell = eSpell::LIGHT;
 		}
 		else {
-			store_priest = 1;
-			store_priest_lev = 1;
+			store_spell = eSpell::HEAL_MINOR;
 		}
 	}
 	
 	// If a target is needed, keep the same target if that PC still targetable
 	if(store_spell_target < 6) {
-		if ((type == eSkill::MAGE_SPELLS && mage_need_select[store_mage] > 0) ||
-			(type == eSkill::PRIEST_SPELLS && priest_need_select[store_priest] > 0)) {
+		if((*store_spell).need_select != SELECT_NO) {
 			if(univ.party[store_spell_target].main_status != eMainStatus::ALIVE)
 				store_spell_target = 6;
 		} else store_spell_target = 6;
 	}
 	
+	short former_spell = int(store_spell) % 100;
 	// Set the spell page, based on starting spell
-	if((type == eSkill::MAGE_SPELLS && store_mage >= 38) || (type == eSkill::PRIEST_SPELLS && store_priest >= 38))
-		on_which_spell_page = 1;
+	if(former_spell >= 38) on_which_spell_page = 1;
 	else on_which_spell_page = 0;
 	
 	
@@ -2497,11 +2467,11 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 	
 	cDialog castSpell("cast-spell.xml");
 	
-	castSpell.attachClickHandlers(std::bind(pick_spell_caster, _1, _2, type, std::ref(dark)), {"caster1","caster2","caster3","caster4","caster5","caster6"});
-	castSpell.attachClickHandlers(std::bind(pick_spell_target,_1,_2, type, dark), {"target1","target2","target3","target4","target5","target6"});
-	castSpell.attachClickHandlers(std::bind(pick_spell_event_filter, _1, _2, type), {"other", "help"});
-	castSpell["cast"].attachClickHandler(std::bind(finish_pick_spell, _1, false, former_target, former_mage, former_priest, type));
-	castSpell["cancel"].attachClickHandler(std::bind(finish_pick_spell, _1, true, former_target, former_mage, former_priest, type));
+	castSpell.attachClickHandlers(std::bind(pick_spell_caster, _1, _2, type, std::ref(dark), std::ref(former_spell)), {"caster1","caster2","caster3","caster4","caster5","caster6"});
+	castSpell.attachClickHandlers(std::bind(pick_spell_target,_1,_2, type, dark, former_spell), {"target1","target2","target3","target4","target5","target6"});
+	castSpell.attachClickHandlers(std::bind(pick_spell_event_filter, _1, _2, type, former_spell), {"other", "help"});
+	castSpell["cast"].attachClickHandler(std::bind(finish_pick_spell, _1, false, former_target, std::ref(former_spell), type));
+	castSpell["cancel"].attachClickHandler(std::bind(finish_pick_spell, _1, true, former_target, std::ref(former_spell), type));
 	
 	dynamic_cast<cPict&>(castSpell["pic"]).setPict(14 + (type == eSkill::PRIEST_SPELLS),PIC_DLOG);
 	for(int i = 0; i < 38; i++) {
@@ -2513,17 +2483,17 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 		cLed& led = dynamic_cast<cLed&>(castSpell[id]);
 		led.attachKey(key);
 		castSpell.addLabelFor(id, {i > 25 ? toupper(key.c) : key.c}, LABEL_LEFT, 8, true);
-		led.setState((pc_can_cast_spell(pc_casting,type, (on_which_spell_page == 0) ? i : spell_index[i]))
+		led.setState((pc_can_cast_spell(pc_casting,cSpell::fromNum(type,on_which_spell_page == 0 ? i : spell_index[i])))
 					 ? led_red : led_green);
-		led.attachClickHandler(std::bind(pick_spell_select_led, _1, _2, _3, type, dark));
+		led.attachClickHandler(std::bind(pick_spell_select_led, _1, _2, _3, type, std::ref(dark), std::ref(former_spell)));
 	}
 	
 	put_spell_list(castSpell, type);
-	draw_spell_info(castSpell, type);
+	draw_spell_info(castSpell, type, former_spell);
 	put_pc_caster_buttons(castSpell);
 	draw_spell_pc_info(castSpell);
 	draw_caster_buttons(castSpell, type);
-	put_spell_led_buttons(castSpell, type);
+	put_spell_led_buttons(castSpell, type, former_spell);
 	
 	if (univ.party.help_received[7] == 0) {
 		// TODO: Not sure if this initial draw is needed
@@ -2533,13 +2503,14 @@ short pick_spell(short pc_num,eSkill type)  // 70 - no spell OW spell num
 	
 	castSpell.run();
 	
-	return castSpell.getResult<short>();
+	return cSpell::fromNum(type, castSpell.getResult<short>());
 }
 
 
-void print_spell_cast(short spell_num,eSkill which)
+void print_spell_cast(eSpell spell,eSkill which)
 //short which; // 0 - mage  1 - priest
 {
+	short spell_num = (which == eSkill::PRIEST_SPELLS ? int(spell) - 100 : int(spell));
 	sprintf ((char *) c_line, "Spell: %s                  ",
 			 (which == eSkill::MAGE_SPELLS) ? (char *) mage_s_name[spell_num] : (char *) priest_s_name[spell_num]);
 	add_string_to_buf((char *) c_line);
@@ -2568,10 +2539,11 @@ short stat_adj(short pc_num,eSkill which) {
 	return tr;
 }
 
-void set_town_spell(short s_num,short who_c)
-{
+void start_town_targeting(eSpell s_num,short who_c,bool freebie) {
+	overall_mode = MODE_TOWN_TARGET;
 	town_spell = s_num;
 	who_cast = who_c;
+	spell_freebie = freebie;
 }
 
 void do_alchemy() ////
diff --git a/osx/boe.party.h b/osx/boe.party.h
index 859a23b2..1bfbccaf 100644
--- a/osx/boe.party.h
+++ b/osx/boe.party.h
@@ -1,3 +1,7 @@
+
+#ifndef BOE_GAME_PARTY_H
+#define BOE_GAME_PARTY_H
+
 class cDialog;
 __declspec(deprecated) void init_party(short mode);
 __declspec(deprecated) void init_party_scen_data();
@@ -26,17 +30,18 @@ bool is_weapon(short pc_num,short item);
 void cast_spell(eSkill type);
 bool repeat_cast_ok(eSkill type);
 void give_party_spell(short which);
-void do_mage_spell(short pc_num,short spell_num);
-void do_priest_spell(short pc_num,short spell_num);
+void do_mage_spell(short pc_num,eSpell spell_num);
+void do_priest_spell(short pc_num,eSpell spell_num);
 void cast_town_spell(location where);
-bool cast_spell_on_space(location where, unsigned short spell);
+bool cast_spell_on_space(location where, eSpell spell);
 void crumble_wall(location where);
 void do_mindduel(short pc_num,cCreature *monst);
 void dispel_fields(short i,short j,short mode);
-bool pc_can_cast_spell(short pc_num,eSkill type,short spell_num);
-short pick_spell(short pc_num,eSkill type);
+bool pc_can_cast_spell(short pc_num,eSpell spell_num);
+bool pc_can_cast_spell(short pc_num,eSkill spell_num);
+eSpell pick_spell(short pc_num,eSkill type);
 short stat_adj(short pc_num,eSkill which);
-void set_town_spell(short s_num,short who_c);
+void start_town_targeting(eSpell s_num,short who_c,bool freebie = false);
 void do_alchemy();
 short alch_choice(short pc_num);
 bool pick_pc_graphic(short pc_num,short mode,cDialog* parent_num);
@@ -58,9 +63,11 @@ void take_ap(short num);
 short trait_present(eTrait which_trait);
 short race_present(eRace which_race);
 short wilderness_lore_present();
-void print_spell_cast(short spell_num,eSkill which);
+void print_spell_cast(eSpell spell,eSkill which);
 void put_party_in_scen(std::string scen_name);
 short party_size(bool only_living);
 
 // This is defined in pc.editors.cpp since it is also used by the character editor
 bool spend_xp(short pc_num, short mode, cDialog* parent);
+
+#endif
diff --git a/osx/boe.specials.cpp b/osx/boe.specials.cpp
index 8fc9f935..2278f56b 100644
--- a/osx/boe.specials.cpp
+++ b/osx/boe.specials.cpp
@@ -46,7 +46,7 @@ extern effect_pat_type current_pat;
 //extern town_item_list	univ.town;
 extern cOutdoors::cWandering store_wandering_special;
 extern short monst_marked_damage[60];
-extern short spell_being_cast, town_spell;
+extern eSpell spell_being_cast, town_spell;
 extern sf::RenderWindow mini_map;
 extern bool fast_bang,end_scenario;
 //extern short town_size[3];
@@ -1030,27 +1030,27 @@ void use_item(short pc,short item)
 				// spell effects
 			case eItemAbil::FLAME:
 				add_string_to_buf("  It fires a bolt of flame.");
-				start_spell_targeting(1011);
+				start_spell_targeting(eSpell::FLAME, true);
 				break;
 			case eItemAbil::FIREBALL:
 				add_string_to_buf("  It shoots a fireball.         ");
-				start_spell_targeting(1022);
+				start_spell_targeting(eSpell::FIREBALL, true);
 				break;
 			case eItemAbil::FIRESTORM:
 				add_string_to_buf("  It shoots a huge fireball. ");
-				start_spell_targeting(1040);
+				start_spell_targeting(eSpell::FIRESTORM, true);
 				break;
 			case eItemAbil::KILL:
 				add_string_to_buf("  It shoots a black ray.  ");
-				start_spell_targeting(1048);
+				start_spell_targeting(eSpell::KILL, true);
 				break;
 			case eItemAbil::ICE_BOLT:
 				add_string_to_buf("  It fires a ball of ice.   ");
-				start_spell_targeting(1031);
+				start_spell_targeting(eSpell::ICE_BOLT, true);
 				break;
 			case eItemAbil::SLOW:
 				add_string_to_buf("  It fires a purple ray.   ");
-				start_spell_targeting(1012);
+				start_spell_targeting(eSpell::SLOW, true);
 				break;
 			case eItemAbil::SHOCKWAVE:
 				add_string_to_buf("  The ground shakes!        ");
@@ -1058,11 +1058,11 @@ void use_item(short pc,short item)
 				break;
 			case eItemAbil::DISPEL_UNDEAD:
 				add_string_to_buf("  It shoots a white ray.   ");
-				start_spell_targeting(1132);
+				start_spell_targeting(eSpell::DISPEL_UNDEAD, true);
 				break;
 			case eItemAbil::DISPEL_SPIRIT:
 				add_string_to_buf("  It shoots a golden ray.   ");
-				start_spell_targeting(1155);
+				start_spell_targeting(eSpell::RAVAGE_SPIRIT, true);
 				break;
 			case eItemAbil::SUMMONING:
 				if (summon_monster(str,user_loc,50,2) == false)
@@ -1076,35 +1076,35 @@ void use_item(short pc,short item)
 				break;
 			case eItemAbil::ACID_SPRAY:
 				add_string_to_buf("  Acid sprays from the tip!   ");
-				start_spell_targeting(1068);
+				start_spell_targeting(eSpell::ACID_SPRAY,  true);
 				break;
 			case eItemAbil::STINKING_CLOUD:
 				add_string_to_buf("  It creates a cloud of gas.   ");
-				start_spell_targeting(1066);
+				start_spell_targeting(eSpell::FOUL_VAPOR, true);
 				break;
 			case eItemAbil::SLEEP_FIELD:
 				add_string_to_buf("  It creates a shimmering cloud.   ");
-				start_spell_targeting(1019);
+				start_spell_targeting(eSpell::CLOUD_SLEEP, true);
 				break;
 			case eItemAbil::VENOM:
 				add_string_to_buf("  A green ray emerges.        ");
-				start_spell_targeting(1030);
+				start_spell_targeting(eSpell::POISON, true);
 				break;
 			case eItemAbil::SHOCKSTORM:
 				add_string_to_buf("  Sparks fly.");
-				start_spell_targeting(1044);
+				start_spell_targeting(eSpell::SHOCKSTORM, true);
 				break;
 			case eItemAbil::PARALYSIS:
 				add_string_to_buf("  It shoots a silvery beam.   ");
-				start_spell_targeting(1069);
+				start_spell_targeting(eSpell::PARALYZE_BEAM, true);
 				break;
 			case eItemAbil::WEB:
 				add_string_to_buf("  It explodes!");
-				start_spell_targeting(1065);
+				start_spell_targeting(eSpell::GOO_BOMB, true);
 				break;
 			case eItemAbil::STRENGTHEN_TARGET:
 				add_string_to_buf("  It shoots a fiery red ray.   ");
-				start_spell_targeting(1062);
+				start_spell_targeting(eSpell::STRENGTHEN_TARGET, true);
 				break;
 			case eItemAbil::QUICKFIRE:
 				add_string_to_buf("Fire pours out!");
@@ -1135,33 +1135,22 @@ void use_item(short pc,short item)
 			case eItemAbil::DISPEL_BARRIER:
 				add_string_to_buf("  It fires a blinding ray.");
 				add_string_to_buf("  Target spell.    ");
-				overall_mode = MODE_TOWN_TARGET;
 				current_pat = single;
-				set_town_spell(1041,current_pc);
+				start_town_targeting(eSpell::DISPEL_BARRIER,current_pc, true);
 				break;
 			case eItemAbil::ICE_WALL:
 				add_string_to_buf("  It shoots a blue sphere.   ");
-				start_spell_targeting(1064);
+				start_spell_targeting(eSpell::WALL_ICE_BALL, true);
 				break;
 			case eItemAbil::CHARM_SPELL:
 				add_string_to_buf("  It fires a lovely, sparkling beam.");
-				start_spell_targeting(1117);
+				start_spell_targeting(eSpell::CHARM_FOE, true);
 				break;
 			case eItemAbil::ANTIMAGIC_CLOUD:
 				add_string_to_buf("  Your hair stands on end.   ");
-				start_spell_targeting(1051);
+				start_spell_targeting(eSpell::ANTIMAGIC, true);
 				break;
 		}
-		// Special spells:
-		//   62 - Carrunos
-		//	 63 - Summon Rat
-		//	 64 - Ice Wall Balls
-		//	 65 - Goo Bomb
-		//   66 - Foul Vapors
-		//   67 - Sleep cloud
-		//	 68 - spray acid
-		//	 69 - paralyze
-		//   70 - mass sleep
 	}
 	
 	put_pc_screen();
@@ -3273,7 +3262,7 @@ void ifthen_spec(eSpecCtx which_mode,cSpecial cur_node,short cur_spec_type,
 				case 16: // Target spell
 					if(which_mode == eSpecCtx::TARGET) {
 						// TODO: I'm not quite sure if this covers every way of determining which spell was cast
-						if(spec.ex1b == -1 || (is_town() && town_spell == spec.ex1b) || (is_combat() && spell_being_cast == spec.ex1b))
+						if(spec.ex1b == -1 || (is_town() && int(town_spell) == spec.ex1b) || (is_combat() && int(spell_being_cast) == spec.ex1b))
 							*next_spec = spec.ex1c;
 					}
 					break;
diff --git a/osx/classes/pc.h b/osx/classes/pc.h
index f58e34de..2aa389a7 100644
--- a/osx/classes/pc.h
+++ b/osx/classes/pc.h
@@ -46,7 +46,7 @@ public:
 	short direction;
 	short ap;
 	// transient stuff
-	std::map<eSkill,short> last_cast;
+	std::map<eSkill,eSpell> last_cast;
 	location combat_pos;
 	short marked_damage, dir, parry, last_attacked;
 	
diff --git a/osx/classes/simpletypes.h b/osx/classes/simpletypes.h
index 40d3505b..306c9dc7 100644
--- a/osx/classes/simpletypes.h
+++ b/osx/classes/simpletypes.h
@@ -808,4 +808,158 @@ enum eFieldType {
 	// TODO: Sfx fields, objects
 };
 
+enum class eSpell {
+	NONE = -1,
+	// Mage spells
+	LIGHT = 0,
+	SPARK = 1,
+	HASTE_MINOR = 2,
+	STRENGTH = 3,
+	SCARE = 4,
+	CLOUD_FLAME = 5,
+	IDENTIFY = 6,
+	SCRY_MONSTER = 7,
+	GOO = 8,
+	TRUE_SIGHT = 9,
+	POISON_MINOR = 10,
+	FLAME = 11,
+	SLOW = 12,
+	DUMBFOUND = 13,
+	ENVENOM = 14,
+	CLOUD_STINK = 15,
+	SUMMON_BEAST = 16,
+	CONFLAGRATION = 17,
+	DISPEL_SQUARE = 18,
+	CLOUD_SLEEP = 19,
+	UNLOCK = 20,
+	HASTE = 21,
+	FIREBALL = 22,
+	LIGHT_LONG = 23,
+	FEAR = 24,
+	WALL_FORCE = 25,
+	SUMMON_WEAK = 26,
+	ARROWS_FLAME = 27,
+	WEB = 28,
+	RESIST_MAGIC = 29,
+	POISON = 30,
+	ICE_BOLT = 31,
+	SLOW_GROUP = 32,
+	MAGIC_MAP = 33,
+	CAPTURE_SOUL = 34,
+	SIMULACRUM = 35,
+	ARROWS_VENOM = 36,
+	WALL_ICE = 37,
+	STEALTH = 38,
+	HASTE_MAJOR = 39,
+	FIRESTORM = 40,
+	DISPEL_BARRIER = 41,
+	BARRIER_FIRE = 42,
+	SUMMON = 43,
+	SHOCKSTORM = 44,
+	SPRAY_FIELDS = 45,
+	POISON_MAJOR = 46,
+	FEAR_GROUP = 47,
+	KILL = 48,
+	PARALYZE = 49,
+	DEMON = 50,
+	ANTIMAGIC = 51,
+	MINDDUEL = 52,
+	FLIGHT = 53,
+	SHOCKWAVE = 54,
+	BLESS_MAJOR = 55,
+	PARALYSIS_MASS = 56,
+	PROTECTION = 57,
+	SUMMON_MAJOR = 58,
+	BARRIER_FORCE = 59,
+	QUICKFIRE = 60,
+	ARROWS_DEATH = 61,
+	// Special spells
+	STRENGTHEN_TARGET = 62,
+	SUMMON_RAT = 63,
+	WALL_ICE_BALL = 64,
+	GOO_BOMB = 65,
+	FOUL_VAPOR = 66,
+	CLOUD_SLEEP_LARGE = 67,
+	ACID_SPRAY = 68,
+	PARALYZE_BEAM = 69,
+	SLEEP_MASS = 70,
+	RAVAGE_ENEMIES = 71,
+	// Priest spells
+	BLESS_MINOR = 100,
+	HEAL_MINOR = 101,
+	POISON_WEAKEN = 102,
+	TURN_UNDEAD = 103,
+	LOCATION = 104,
+	SANCTUARY = 105,
+	SYMBIOSIS = 106,
+	MANNA_MINOR = 107,
+	RITUAL_SANCTIFY = 108,
+	STUMBLE = 109,
+	BLESS = 110,
+	POISON_CURE = 111,
+	CURSE = 112,
+	LIGHT_DIVINE = 113,
+	WOUND = 114,
+	SUMMON_SPIRIT = 115,
+	MOVE_MOUNTAINS = 116,
+	CHARM_FOE = 117,
+	DISEASE = 118,
+	AWAKEN = 119,
+	HEAL = 120,
+	HEAL_ALL_LIGHT = 121,
+	HOLY_SCOURGE = 122,
+	DETECT_LIFE = 123,
+	PARALYSIS_CURE = 124,
+	MANNA = 125,
+	FORCEFIELD = 126,
+	DISEASE_CURE = 127,
+	RESTORE_MIND = 128,
+	SMITE = 129,
+	POISON_CURE_ALL = 130,
+	CURSE_ALL = 131,
+	DISPEL_UNDEAD = 132,
+	CURSE_REMOVE = 133,
+	STICKS_TO_SNAKES = 134,
+	MARTYRS_SHIELD = 135,
+	CLEANSE = 136,
+	FIREWALK = 137,
+	BLESS_PARTY = 138,
+	HEAL_MAJOR = 139,
+	RAISE_DEAD = 140,
+	FLAMESTRIKE = 141,
+	SANCTUARY_MASS = 142,
+	SUMMON_HOST = 143,
+	SHATTER = 144,
+	DISPEL_SPHERE = 145,
+	HEAL_ALL = 146,
+	REVIVE = 147,
+	HYPERACTIVITY = 148,
+	DESTONE = 149,
+	SUMMON_GUARDIAN = 150,
+	CHARM_MASS = 151,
+	PROTECTIVE_CIRCLE = 152,
+	PESTILENCE = 153,
+	REVIVE_ALL = 154,
+	RAVAGE_SPIRIT = 155,
+	RESURRECT = 156,
+	DIVINE_THUD = 157,
+	AVATAR = 158,
+	WALL_BLADES = 159,
+	WORD_RECALL = 160,
+	CLEANSE_MAJOR = 161,
+	// Special spells
+	DISPEL_FIELD = 162,
+	MOVE_MOUNTAINS_MASS = 163,
+};
+
+inline bool isMage(eSpell spell) {
+	int code = (int) spell;
+	return code >= 0 && code < 62;
+}
+
+inline bool isPriest(eSpell spell) {
+	int code = (int) spell;
+	return code >= 100 && code < 162;
+}
+
 #endif
diff --git a/osx/classes/spell.cpp b/osx/classes/spell.cpp
new file mode 100644
index 00000000..bb02467e
--- /dev/null
+++ b/osx/classes/spell.cpp
@@ -0,0 +1,363 @@
+//
+//  spell.cpp
+//  BoE
+//
+//  Created by Celtic Minstrel on 14-12-12.
+//
+//
+
+#include "spell.hpp"
+
+std::map<eSpell,cSpell> cSpell::dictionary;
+
+cSpell::cSpell(eSpell id) : num(id), refer(REFER_YES), cost(0), range(0), level(0), need_select(SELECT_NO), type(eSkill::INVALID), when_cast(0) {
+	
+}
+
+cSpell& cSpell::withRefer(eSpellRefer r) {
+	refer = r;
+	return *this;
+}
+
+cSpell& cSpell::withCost(int c) {
+	cost = c;
+	return *this;
+}
+
+cSpell& cSpell::withRange(int r) {
+	range = r;
+	return *this;
+}
+
+cSpell& cSpell::asLevel(int lvl) {
+	level = lvl;
+	return *this;
+}
+
+cSpell& cSpell::asType(eSkill t) {
+	type = t;
+	return *this;
+}
+
+cSpell& cSpell::needsSelect(eSpellSelect sel) {
+	need_select = sel;
+	return *this;
+}
+
+cSpell& cSpell::when(eSpellWhen when) {
+	when_cast |= when;
+	return *this;
+}
+
+const cSpell& cSpell::finish() {
+	dictionary[num] = *this;
+	return *this;
+}
+
+const cSpell& operator*(eSpell spell_num) {
+	return cSpell::dictionary[spell_num];
+}
+
+eSpell cSpell::fromNum(eSkill type, int num) {
+	if(num < 0 || num >= 62) return eSpell::NONE;
+	if(type == eSkill::MAGE_SPELLS)
+		return eSpell(num);
+	else if(type == eSkill::PRIEST_SPELLS)
+		return eSpell(num + 100);
+	return eSpell::NONE;
+}
+
+// Mage Spells
+cSpell M_LIGHT = cSpell(eSpell::LIGHT).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withCost(1).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell M_SPARK = cSpell(eSpell::SPARK).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withRange(6).withCost(1).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_HASTE_MINOR = cSpell(eSpell::HASTE_MINOR).asType(eSkill::MAGE_SPELLS).when(WHEN_COMBAT).asLevel(1)
+	.withCost(1).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_STRENGTH = cSpell(eSpell::STRENGTH).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withCost(1).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_SCARE = cSpell(eSpell::SCARE).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withRange(7).withCost(1).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_CLOUD_FLAME = cSpell(eSpell::CLOUD_FLAME).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withRange(7).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_IDENTIFY = cSpell(eSpell::IDENTIFY).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withCost(50).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell M_SCRY_MONSTER = cSpell(eSpell::SCRY_MONSTER).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withRange(14).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_GOO = cSpell(eSpell::GOO).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withRange(8).withCost(1).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_TRUE_SIGHT = cSpell(eSpell::TRUE_SIGHT).asType(eSkill::MAGE_SPELLS).asLevel(1)
+	.withCost(3).when(WHEN_TOWN).finish();
+
+cSpell M_POISON_MINOR = cSpell(eSpell::POISON_MINOR).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(6).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_FLAME = cSpell(eSpell::FLAME).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(8).withCost(3).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_SLOW = cSpell(eSpell::SLOW).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(7).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_DUMBFOUND = cSpell(eSpell::DUMBFOUND).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(10).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_ENVENOM = cSpell(eSpell::ENVENOM).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withCost(2).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_CLOUD_STINK = cSpell(eSpell::CLOUD_STINK).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(8).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_SUMMON_BEAST = cSpell(eSpell::SUMMON_BEAST).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(3).withCost(4).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_CONFLAGRATION = cSpell(eSpell::CONFLAGRATION).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(8).withCost(4).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_DISPEL_SQUARE = cSpell(eSpell::DISPEL_SQUARE).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(10).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_CLOUD_SLEEP = cSpell(eSpell::CLOUD_SLEEP).asType(eSkill::MAGE_SPELLS).asLevel(2)
+	.withRange(6).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+
+cSpell M_UNLOCK = cSpell(eSpell::UNLOCK).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withCost(3).when(WHEN_TOWN).finish();
+cSpell M_HASTE = cSpell(eSpell::HASTE).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withCost(3).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_FIREBALL = cSpell(eSpell::FIREBALL).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(12).withCost(5).needsSelect().withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_LIGHT_LONG = cSpell(eSpell::LIGHT_LONG).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withCost(3).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+// TODO: ^ Is it right for long light to be castable outdoors?
+cSpell M_FEAR = cSpell(eSpell::FEAR).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(10).withCost(3).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_WALL_FORCE = cSpell(eSpell::WALL_FORCE).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(12).withCost(5).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_SUMMON_WEAK = cSpell(eSpell::SUMMON_WEAK).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(4).withCost(6).withRefer(REFER_FANCY).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_ARROWS_FLAME = cSpell(eSpell::ARROWS_FLAME).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(10).withCost(4).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+cSpell M_WEB = cSpell(eSpell::WEB).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withRange(8).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_RESIST_MAGIC = cSpell(eSpell::RESIST_MAGIC).asType(eSkill::MAGE_SPELLS).asLevel(3)
+	.withCost(4).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+
+cSpell M_POISON = cSpell(eSpell::POISON).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(8).withCost(4).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_ICE_BOLT = cSpell(eSpell::ICE_BOLT).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(12).withCost(5).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_SLOW_GROUP = cSpell(eSpell::SLOW_GROUP).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(12).withCost(4).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_MAGIC_MAP = cSpell(eSpell::MAGIC_MAP).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withCost(8).when(WHEN_TOWN).finish();
+cSpell M_CAPTURE_SOUL = cSpell(eSpell::CAPTURE_SOUL).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(10).withCost(30).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_SIMULACRUM = cSpell(eSpell::SIMULACRUM).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(4).withCost(-1).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_ARROWS_VENOM = cSpell(eSpell::ARROWS_VENOM).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(8).withCost(8).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+cSpell M_WALL_ICE = cSpell(eSpell::WALL_ICE).asType(eSkill::MAGE_SPELLS).asLevel(4)
+	.withRange(8).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+
+cSpell M_STEALTH = cSpell(eSpell::STEALTH).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withCost(5).when(WHEN_TOWN).finish();
+cSpell M_HASTE_MAJOR = cSpell(eSpell::HASTE_MAJOR).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withCost(8).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_FIRESTORM = cSpell(eSpell::FIRESTORM).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withRange(14).withCost(8).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_DISPEL_BARRIER = cSpell(eSpell::DISPEL_BARRIER).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withCost(6).when(WHEN_TOWN).finish();
+cSpell M_BARRIER_FIRE = cSpell(eSpell::BARRIER_FIRE).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withRange(2).withCost(9).withRefer(REFER_TARGET).when(WHEN_TOWN).when(WHEN_COMBAT).finish();
+cSpell M_SUMMON = cSpell(eSpell::SUMMON).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withRange(4).withCost(10).withRefer(REFER_FANCY).when(WHEN_TOWN).when(WHEN_COMBAT).finish();
+cSpell M_SHOCKSTORM = cSpell(eSpell::SHOCKSTORM).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withRange(10).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_SPRAY_FIELDS = cSpell(eSpell::SPRAY_FIELDS).asType(eSkill::MAGE_SPELLS).asLevel(5)
+	.withRange(12).withCost(6).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+
+cSpell M_POISON_MAJOR = cSpell(eSpell::POISON_MAJOR).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(8).withCost(7).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_FEAR_GROUP = cSpell(eSpell::FEAR_GROUP).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(12).withCost(6).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_KILL = cSpell(eSpell::KILL).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(6).withCost(8).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_PARALYZE = cSpell(eSpell::PARALYZE).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(8).withCost(7).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+cSpell M_DEMON = cSpell(eSpell::DEMON).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(5).withCost(12).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_ANTIMAGIC = cSpell(eSpell::ANTIMAGIC).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(8).withCost(10).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_MINDDUEL = cSpell(eSpell::MINDDUEL).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withRange(40).withCost(12).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell M_FLIGHT = cSpell(eSpell::FLIGHT).asType(eSkill::MAGE_SPELLS).asLevel(6)
+	.withCost(20).when(WHEN_OUTDOORS).finish();
+
+cSpell M_SHOCKWAVE = cSpell(eSpell::SHOCKWAVE).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withCost(12).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_BLESS_MAJOR = cSpell(eSpell::BLESS_MAJOR).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withCost(8).withRefer(REFER_IMMED).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_PARALYSIS_MASS = cSpell(eSpell::PARALYSIS_MASS).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withRange(8).withCost(20).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell M_PROTECTION = cSpell(eSpell::PROTECTION).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withCost(10).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_SUMMON_MAJOR = cSpell(eSpell::SUMMON_MAJOR).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withRange(4).withCost(14).withRefer(REFER_FANCY).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_BARRIER_FORCE = cSpell(eSpell::BARRIER_FORCE).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withRange(2).withCost(10).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_QUICKFIRE = cSpell(eSpell::QUICKFIRE).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withRange(4).withCost(50).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell M_ARROWS_DEATH = cSpell(eSpell::ARROWS_DEATH).asType(eSkill::MAGE_SPELLS).asLevel(7)
+	.withRange(6).withCost(10).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+
+// Priest spells
+cSpell P_BLESS_MINOR = cSpell(eSpell::BLESS_MINOR).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(1).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_HEAL_MINOR = cSpell(eSpell::HEAL_MINOR).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(1).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_POISON_WEAKEN = cSpell(eSpell::POISON_WEAKEN).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(1).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_TURN_UNDEAD = cSpell(eSpell::TURN_UNDEAD).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withRange(8).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_LOCATION = cSpell(eSpell::LOCATION).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(1).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_SANCTUARY = cSpell(eSpell::SANCTUARY).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(1).needsSelect().when(WHEN_COMBAT).finish();
+cSpell P_SYMBIOSIS = cSpell(eSpell::SYMBIOSIS).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(3).needsSelect().when(WHEN_COMBAT).finish();
+cSpell P_MANNA_MINOR = cSpell(eSpell::MANNA_MINOR).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(5).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_RITUAL_SANCTIFY = cSpell(eSpell::RITUAL_SANCTIFY).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withCost(50).when(WHEN_TOWN).finish();
+cSpell P_STUMBLE = cSpell(eSpell::STUMBLE).asType(eSkill::PRIEST_SPELLS).asLevel(1)
+	.withRange(10).withCost(1).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+
+cSpell P_BLESS = cSpell(eSpell::BLESS).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withCost(2).needsSelect().withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_POISON_CURE = cSpell(eSpell::POISON_CURE).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withCost(2).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_CURSE = cSpell(eSpell::CURSE).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withRange(10).withCost(2).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_LIGHT_DIVINE = cSpell(eSpell::LIGHT_DIVINE).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withCost(2).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+// TODO: ^ Is it right for light to be castable outdoors?
+cSpell P_WOUND = cSpell(eSpell::WOUND).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withRange(6).withCost(3).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_SUMMON_SPIRIT = cSpell(eSpell::SUMMON_SPIRIT).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withRange(4).withCost(5).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell P_MOVE_MOUNTAINS = cSpell(eSpell::MOVE_MOUNTAINS).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withCost(8).when(WHEN_TOWN).finish();
+cSpell P_CHARM_FOE = cSpell(eSpell::CHARM_FOE).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withRange(6).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_DISEASE = cSpell(eSpell::DISEASE).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withRange(6).withCost(4).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+cSpell P_AWAKEN = cSpell(eSpell::AWAKEN).asType(eSkill::PRIEST_SPELLS).asLevel(2)
+	.withCost(2).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+// Note: Awaken used to have a range of 8, but I removed it since it doesn't seem to be used (seems to be a relic of something else).
+
+cSpell P_HEAL = cSpell(eSpell::HEAL).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(3).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_HEAL_ALL_LIGHT = cSpell(eSpell::HEAL_ALL_LIGHT).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(4).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_HOLY_SCOURGE = cSpell(eSpell::HOLY_SCOURGE).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withRange(8).withCost(3).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_DETECT_LIFE = cSpell(eSpell::DETECT_LIFE).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(3).when(WHEN_TOWN).finish();
+cSpell P_PARALYSIS_CURE = cSpell(eSpell::PARALYSIS_CURE).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(3).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+// Note: Cure paralysis used to have a range of 10; I removed it because it doesn't seem to be used and doesn't make sense.
+cSpell P_MANNA = cSpell(eSpell::MANNA).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(10).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_FORCEFIELD = cSpell(eSpell::FORCEFIELD).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withRange(8).withCost(5).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_DISEASE_CURE = cSpell(eSpell::DISEASE_CURE).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(3).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_RESTORE_MIND = cSpell(eSpell::RESTORE_MIND).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withCost(4).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_SMITE = cSpell(eSpell::SMITE).asType(eSkill::PRIEST_SPELLS).asLevel(3)
+	.withRange(8).withCost(6).withRefer(REFER_FANCY).when(WHEN_COMBAT).finish();
+
+cSpell P_POISON_CURE_ALL = cSpell(eSpell::POISON_CURE_ALL).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withCost(5).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_CURSE_ALL = cSpell(eSpell::CURSE_ALL).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withRange(10).withCost(5).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_DISPEL_UNDEAD = cSpell(eSpell::DISPEL_UNDEAD).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withRange(8).withCost(5).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_CURSE_REMOVE = cSpell(eSpell::CURSE_REMOVE).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withCost(15).needsSelect().when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_STICKS_TO_SNAKES = cSpell(eSpell::STICKS_TO_SNAKES).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withRange(6).withCost(6).withRefer(REFER_FANCY).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell P_MARTYRS_SHIELD = cSpell(eSpell::MARTYRS_SHIELD).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withCost(5).needsSelect().when(WHEN_COMBAT).finish();
+cSpell P_CLEANSE = cSpell(eSpell::CLEANSE).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withCost(5).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_FIREWALK = cSpell(eSpell::FIREWALK).asType(eSkill::PRIEST_SPELLS).asLevel(4)
+	.withCost(8).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+
+cSpell P_BLESS_PARTY = cSpell(eSpell::BLESS_PARTY).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withCost(6).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_HEAL_MAJOR = cSpell(eSpell::HEAL_MAJOR).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withCost(7).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_RAISE_DEAD = cSpell(eSpell::RAISE_DEAD).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withCost(25).needsSelect(SELECT_ANY).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_FLAMESTRIKE = cSpell(eSpell::FLAMESTRIKE).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withRange(9).withCost(8).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_SANCTUARY_MASS = cSpell(eSpell::SANCTUARY_MASS).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withCost(10).when(WHEN_COMBAT).finish();
+cSpell P_SUMMON_HOST = cSpell(eSpell::SUMMON_HOST).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withRange(4).withCost(12).withRefer(REFER_FANCY).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell P_SHATTER = cSpell(eSpell::SHATTER).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withCost(12).when(WHEN_TOWN).finish();
+cSpell P_DISPEL_SPHERE = cSpell(eSpell::DISPEL_SPHERE).asType(eSkill::PRIEST_SPELLS).asLevel(5)
+	.withRange(8).withCost(6).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+
+cSpell P_HEAL_ALL = cSpell(eSpell::HEAL_ALL).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withCost(8).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_REVIVE = cSpell(eSpell::REVIVE).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withCost(7).needsSelect().when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_HYPERACTIVITY = cSpell(eSpell::HYPERACTIVITY).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withCost(8).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+// Note: Hyperactivity used to have a range of 10; I removed it because it doesn't seem to be used and doesn't make sense.
+cSpell P_DESTONE = cSpell(eSpell::DESTONE).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withCost(8).needsSelect(SELECT_ANY).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_SUMMON_GUARDIAN = cSpell(eSpell::SUMMON_GUARDIAN).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withRange(4).withCost(14).withRefer(REFER_TARGET).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell P_CHARM_MASS = cSpell(eSpell::CHARM_MASS).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withRange(8).withCost(17).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_PROTECTIVE_CIRCLE = cSpell(eSpell::PROTECTIVE_CIRCLE).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withCost(8).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+cSpell P_PESTILENCE = cSpell(eSpell::PESTILENCE).asType(eSkill::PRIEST_SPELLS).asLevel(6)
+	.withRange(8).withCost(7).withRefer(REFER_IMMED).when(WHEN_COMBAT).finish();
+
+cSpell P_REVIVE_ALL = cSpell(eSpell::REVIVE_ALL).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withCost(10).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_RAVAGE_SPIRIT = cSpell(eSpell::RAVAGE_SPIRIT).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withRange(4).withCost(10).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_RESURRECT = cSpell(eSpell::RESURRECT).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withCost(35).needsSelect(SELECT_ANY).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+cSpell P_DIVINE_THUD = cSpell(eSpell::DIVINE_THUD).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withRange(12).withCost(10).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_AVATAR = cSpell(eSpell::AVATAR).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withCost(12).withRefer(REFER_IMMED).when(WHEN_COMBAT).when(WHEN_TOWN).finish();
+cSpell P_WALL_BLADES = cSpell(eSpell::WALL_BLADES).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withRange(10).withCost(12).withRefer(REFER_TARGET).when(WHEN_COMBAT).finish();
+cSpell P_WORD_RECALL = cSpell(eSpell::WORD_RECALL).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withCost(30).when(WHEN_OUTDOORS).finish();
+cSpell P_CLEANSE_MAJOR = cSpell(eSpell::CLEANSE_MAJOR).asType(eSkill::PRIEST_SPELLS).asLevel(7)
+	.withCost(10).when(WHEN_COMBAT).when(WHEN_TOWN).when(WHEN_OUTDOORS).finish();
+
+// Special spells
+cSpell S_STRENGTHEN_TARGET = cSpell(eSpell::STRENGTHEN_TARGET)
+	.withRange(10).finish();
+cSpell S_SUMMON_RAT = cSpell(eSpell::SUMMON_RAT)
+	.withRange(8).finish();
+cSpell S_WALL_ICE_BALL = cSpell(eSpell::WALL_ICE_BALL)
+	.withRange(8).finish();
+cSpell S_GOO_BOMB = cSpell(eSpell::GOO_BOMB)
+	.withRange(12).finish();
+cSpell S_FOUL_VAPOR = cSpell(eSpell::FOUL_VAPOR)
+	.withRange(8).finish();
+cSpell S_CLOUD_SLEEP_LARGE = cSpell(eSpell::CLOUD_SLEEP_LARGE)
+	.withRange(10).finish();
+cSpell S_ACID_SPRAY = cSpell(eSpell::ACID_SPRAY)
+	.withRange(10).finish();
+cSpell S_PARALYZE_BEAM = cSpell(eSpell::PARALYZE_BEAM)
+	.withRange(10).finish();
+cSpell S_SLEEP_MASS = cSpell(eSpell::SLEEP_MASS)
+	.withRange(10).finish();
+cSpell S_RAVAGE_ENEMIES = cSpell(eSpell::RAVAGE_ENEMIES)
+	.withRange(12).finish();
+cSpell S_DISPEL_FIELD = cSpell(eSpell::DISPEL_FIELD)
+	.withRange(10).finish();
+cSpell S_MOVE_MOUNTAINS_MASS = cSpell(eSpell::MOVE_MOUNTAINS_MASS)
+	.withRange(8).finish();
diff --git a/osx/classes/spell.hpp b/osx/classes/spell.hpp
new file mode 100644
index 00000000..28ee5363
--- /dev/null
+++ b/osx/classes/spell.hpp
@@ -0,0 +1,46 @@
+//
+//  spell.hpp
+//  BoE
+//
+//  Created by Celtic Minstrel on 14-12-12.
+//
+//
+
+#ifndef BoE_DATA_SPELL_HPP
+#define BoE_DATA_SPELL_HPP
+
+#include <map>
+#include <simpletypes.h>
+
+enum eSpellRefer {REFER_YES, REFER_IMMED, REFER_TARGET, REFER_FANCY};
+enum eSpellSelect {SELECT_NO, SELECT_ACTIVE, SELECT_ANY};
+// This one is meant for indexing a bit field
+enum eSpellWhen {WHEN_COMBAT = 1, WHEN_TOWN = 2, WHEN_OUTDOORS = 4};
+
+class cSpell {
+	static std::map<eSpell,cSpell> dictionary;
+	friend const cSpell& operator*(eSpell spell_num);
+public:
+	cSpell() {} // This is just here because the map doesn't work without it
+	cSpell(eSpell id);
+	cSpell& withRefer(eSpellRefer r);
+	cSpell& withCost(int c);
+	cSpell& withRange(int r);
+	cSpell& asLevel(int lvl);
+	cSpell& asType(eSkill type);
+	cSpell& needsSelect(eSpellSelect sel = SELECT_ACTIVE);
+	cSpell& when(eSpellWhen when);
+	const cSpell& finish();
+	eSpell num;
+	eSpellRefer refer;
+	int cost, range, level;
+	eSpellSelect need_select;
+	eSkill type;
+	int when_cast;
+	static eSpell fromNum(eSkill type, int num);
+};
+
+// Need to declare this a second time in order for it to be in scope where it's needed
+const cSpell& operator*(eSpell spell_num);
+
+#endif
diff --git a/rsrc/strings/spell-times.txt b/rsrc/strings/spell-times.txt
index 699b9a53..887081f8 100644
--- a/rsrc/strings/spell-times.txt
+++ b/rsrc/strings/spell-times.txt
@@ -1,10 +1,10 @@
-Can cast everywhere.
 Combat only.
 Town only.
-Town and outdoor only.
 Town & combat only.
 Outdoor only.
-                                                                                                                                                      
+Outdoor & combat only.
+Town and outdoor only.
+Can cast everywhere.
 Mage Spells
 Priest Spells
 Exile III was created on a PowerMac 6100 using CodeWarrior, development system of the Gods. It is written in C. Plain, ordinary C.