Beginning Combat Spell integration.

glife.qproj

@@ -1098,6 +1098,7 @@
 	<Location name="BanSexType"/>
 	<Folder name="Magic">
 		<Location name="castSpell"/>
+		<Location name="spellList"/>
 		<Location name="spell_teleport"/>
 		<Location name="treeCircle"/>
 		<Location name="treeCircActs"/>

locations/castSpell.qsrc

@@ -9,16 +9,7 @@
 !	Example:
 !		gs 'castSpell', 'teleport', 'CentralPark'
 
-!teleport
-spellMana['teleport'] = 1000
-spellTime['teleport'] = 20
-spellWill['teleport'] = 20
-spellDiff['teleport'] = 20
-!glamour
-spellMana['glamour'] = 500
-spellTime['glamour'] = 1
-spellWill['glamour'] = 15
-spellDiff['glamour'] = 30
+gs 'spellList'
 
 spellSuccess = 0
 
@@ -79,7 +70,7 @@ gs 'stat'
 
 $SpellExec = "gs 'spell_<<$SpellName>>', '<<spellSuccess>>'<<$SpellArgs>>"
 
-dynamic $SpellExec
+result = dyneval($SpellExec)
 
 killvar '$SpellName'
 killvar '$SpellArgs'

locations/spellList.qsrc

@@ -0,0 +1,22 @@
+#spellList
+
+!teleport
+spellMana['teleport'] = 1000
+spellTime['teleport'] = 20
+spellDiff['teleport'] = 20
+$spellName['teleport'] = "Teleport"
+$spellDesc['teleport'] = "You can move from one Fairy Circle to another."
+!glamour
+spellMana['glamour'] = 500
+spellTime['glamour'] = 1
+spellDiff['glamour'] = 30
+$spellName['teleport'] = "Glamour"
+$spellDesc['teleport'] = "Change your appearance."
+
+
+
+! List Combat Spells for use in fight scenerios
+combatSpells[0] = ''
+
+
+--- spellList ---------------------------------

locations/spell_teleport.qsrc

@@ -38,4 +38,6 @@ killvar '$randomLoc'
 killvar '$NewLocation'
 killvar didItWork
 
+result = ""
+
 -- spell_teleport ---------------------------------