changeset 962:ca05f7617c88

Clean up heal targetting code slightly.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 22 Mar 2009 11:12:48 +0000
parents b12463a6e836
children 268ad044be31
files gm-tarma.tf
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gm-tarma.tf	Sun Mar 22 10:21:49 2009 +0000
+++ b/gm-tarma.tf	Sun Mar 22 11:12:48 2009 +0000
@@ -92,11 +92,11 @@
 
 ;; Cast a spell at current target
 /def -i prcast =\
-	/if (heal_target!~"")\
-		/if (spell_st!~"on" | heal_target!~heal_ctarget | {*}!~heal_cspell)\
-			/set heal_ctarget=%{heal_target}%;\
+	/if (cast_target!~"")\
+		/if (spell_st!~"on" | cast_target!~heal_ctarget | {*}!~heal_cspell)\
+			/set heal_ctarget=%{cast_target}%;\
 			/set heal_cspell=%{*}%;\
-			@@cast '%{*}' %{heal_target}%;\
+			@@cast '%{*}' %{cast_target}%;\
 		/endif%;\
 	/else \
 		/msq @{BCred}No target set!@{n}%;\
@@ -112,18 +112,18 @@
 ;; targetting of spells.
 
 /def -i prmove_heal =\
-	/if	({1}=~"nw")	/let t=1_1%;\
-	/elseif ({1}=~"n")	/let t=1_2%;\
-	/elseif ({1}=~"ne")	/let t=1_3%;\
-	/elseif ({1}=~"w")	/let t=2_1%;\
-	/elseif ({1}=~"X")	/let t=2_2%;\
-	/elseif ({1}=~"e")	/let t=2_3%;\
-	/elseif ({1}=~"sw")	/let t=3_1%;\
-	/elseif ({1}=~"s")	/let t=3_2%;\
-	/elseif ({1}=~"se")	/let t=3_3%;\
-	/else /set heal_target=%;/break%;/endif%;\
-	/eval /set heal_target=$$[gparty_%{t}_s]%;\
-	/msq @{Cyellow}Cast Target@{n} -> @{BCwhite}%{heal_target}@{n}
+	/if	({1}=~"nw")	/let _t=1_1%;\
+	/elseif ({1}=~"n")	/let _t=1_2%;\
+	/elseif ({1}=~"ne")	/let _t=1_3%;\
+	/elseif ({1}=~"w")	/let _t=2_1%;\
+	/elseif ({1}=~"X")	/let _t=2_2%;\
+	/elseif ({1}=~"e")	/let _t=2_3%;\
+	/elseif ({1}=~"sw")	/let _t=3_1%;\
+	/elseif ({1}=~"s")	/let _t=3_2%;\
+	/elseif ({1}=~"se")	/let _t=3_3%;\
+	/else /set cast_target=%;/break%;/endif%;\
+	/set cast_target=$[prgetval(strcat("gparty_",_t,"_s"))]%;\
+	/msq @{Cyellow}Cast Target@{n} -> @{BCwhite}%{cast_target}@{n}
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;