changeset 1266:7910e501e680

Use /gdef instead of /def where appropriate.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 22 Dec 2010 19:53:44 +0000
parents d1d7c9ecd971
children 9f9d34a50837
files ggrtf.tf gm-chann.tf gm-hcbat.tf gm-magical.tf gm-merchant.tf gm-nun.tf gm-tarma.tf gm-tiger.tf salve.tf
diffstat 9 files changed, 56 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/ggrtf.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -1122,12 +1122,12 @@
 
 ;; Define a conjuprot trigger (function)
 /def -i prdefconju =\
-	/def -i -F -p9999 -aCgreen -msimple -t"%{3}" rec_%{2}_on=\
+	/gdef -i -F -p9999 -aCgreen -msimple -t"%{3}" rec_%{2}_on=\
 		/if (prot_%{1}_p==1) /gprot_on %{1}%{4}/endif%%;\
 		/set prot_%{1}_p=0
 
 /def -i prdeffolk =\
-	/def -i -F -p9999 -aCgreen -mregexp -t"%{3}" rec_%{2}_on=/gprot_on %{1}%{4}
+	/gdef -i -F -p9999 -aCgreen -mregexp -t"%{3}" rec_%{2}_on=/gprot_on %{1}%{4}
 
 
 ;; Clear/setup all variables related to prot
--- a/gm-chann.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-chann.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -47,46 +47,46 @@
 ;; Energy Aura
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Aura weakening
-/def -i -p9999 -aCred -msimple -t"Your aura is starting to weaken!" rec_auraweak =\
+/gdef -i -p9999 -aCred -msimple -t"Your aura is starting to weaken!" rec_auraweak =\
 	/set prot_eaura_weak=on%;/set prot_eaura_weak_t=$[time()]%;\
 	/gstatus_update%;\
 	/msr Energy Aura WEAKENING! $[prgetstime(prot_eaura_t)] / $[prgetstime(prot_eaura_t2)]
 
 ;; Aura recharged
-/def -i -p9999 -aCred -mregexp -t"^(Not all is lost, however, you did just recharge your aura|You try your hardest but cannot focus enough energy|You try to focus more magic energy into your aura but get no useful result).$" rec_aurarecharged =\
+/gdef -i -p9999 -aCred -mregexp -t"^(Not all is lost, however, you did just recharge your aura|You try your hardest but cannot focus enough energy|You try to focus more magic energy into your aura but get no useful result).$" rec_aurarecharged =\
 	/set prot_eaura_weak=off%;\
 	/set prot_eaura_t=$[time()]%;\
 	/gstatus_update%;\
 	/msr Energy Aura Reloaded! 
 
 ;; Aura off
-/def -i -p9999 -aCred -msimple -t"Your aura of glowing light fades to nothing." rec_auraoff =\
+/gdef -i -p9999 -aCred -msimple -t"Your aura of glowing light fades to nothing." rec_auraoff =\
 	/set prot_eaura_weak=off%;\
 	/gprot_off eaura
 
 ;; Aura changes
-/def -i -p9999 -aCred -msimple -t"You turn your aura down a step from red to gold." rec_aurach1 =\
+/gdef -i -p9999 -aCred -msimple -t"You turn your aura down a step from red to gold." rec_aurach1 =\
 	/set prot_eaura=1%;/gstatus_update
 
-/def -i -p9999 -aCred -msimple -t"You turn your aura down a step from blue to red." rec_aurach2 =\
+/gdef -i -p9999 -aCred -msimple -t"You turn your aura down a step from blue to red." rec_aurach2 =\
 	/set prot_eaura=2%;/gstatus_update
 
 ;; Aura on
-/def -i -p9999 -aCred -msimple -t"Suddenly a softly glowing aura of yellow light comes into being around you." rec_aura1 =\
+/gdef -i -p9999 -aCred -msimple -t"Suddenly a softly glowing aura of yellow light comes into being around you." rec_aura1 =\
 	/gprot_on eaura [Yellow]%;\
 	/set prot_eaura=1%;\
 	/set prot_eaura_weak=off%;\
 	/gstatus_update%;\
 	/set prot_eaura_t2=%{prot_eaura_t}
 
-/def -i -p9999 -aCred -msimple -t"With a burst of energy, your aura changes from soft yellow to bright red." rec_aura2 =\
+/gdef -i -p9999 -aCred -msimple -t"With a burst of energy, your aura changes from soft yellow to bright red." rec_aura2 =\
 	/gprot_on eaura [Red]%;\
 	/set prot_eaura=2%;\
 	/set prot_eaura_weak=off%;\
 	/gstatus_update%;\
 	/set prot_eaura_t2=%{prot_eaura_t}
 
-/def -i -p9999 -aCred -mregexp -t"^Tendrils of lightning flit around you as your aura changes from flame red" rec_aura3 =\
+/gdef -i -p9999 -aCred -mregexp -t"^Tendrils of lightning flit around you as your aura changes from flame red" rec_aura3 =\
 	/gprot_on eaura [Blue]%;\
 	/set prot_eaura=3%;\
 	/set prot_eaura_weak=off%;\
--- a/gm-hcbat.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-hcbat.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -64,25 +64,25 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Unstun (NS)
 
-/def -i -F -aCgreen -mregexp -t"^[A-Z][A-Za-z]+\'s chanting appears to do absolutely nothing.$" rec_unstun_on =\
+/gdef -i -F -aCgreen -mregexp -t"^[A-Z][A-Za-z]+\'s chanting appears to do absolutely nothing.$" rec_unstun_on =\
 	/gprot_on unstun%;/set prot_unstun_w=0
 
-/def -i -F -aCgreen -msimple -t"You are STUNNED." rec_stun_start =\
+/gdef -i -F -aCgreen -msimple -t"You are STUNNED." rec_stun_start =\
 	/set stun_st=on
 
-/def -i -F -aCgreen -mregexp -t"\.\.\.BUT you break it off" rec_stun_mano =\
+/gdef -i -F -aCgreen -mregexp -t"\.\.\.BUT you break it off" rec_stun_mano =\
 	/set stun_st=off
 
-/def -i -F -aCgreen -mregexp -t" paralyzes you with its mind\.$" rec_paralyzed_start =\
+/gdef -i -F -aCgreen -mregexp -t" paralyzes you with its mind\.$" rec_paralyzed_start =\
 	/gspell_interrupt%;/gskill_interrupt%;/set stun_st=on%;/gprot_off unstun
 
-/def -i -F -aCgreen -msimple -t"You are no longer stunned." rec_stun_end =\
+/gdef -i -F -aCgreen -msimple -t"You are no longer stunned." rec_stun_end =\
 	/set stun_st=off%;/msr No longer stunned
 
-/def -i -F -aCgreen -msimple -t"It doesn't hurt as much as it normally does!" rec_unstun_off =\
+/gdef -i -F -aCgreen -msimple -t"It doesn't hurt as much as it normally does!" rec_unstun_off =\
 	/gprot_off unstun
 
-/def -i -F -aCgreen -msimple -t"It doesn't hurt at all!" rec_unstun_notall =\
+/gdef -i -F -aCgreen -msimple -t"It doesn't hurt at all!" rec_unstun_notall =\
 	/gspell_interrupt%;/gskill_interrupt%;\
 	/set prot_unstun_w=$[prot_unstun_w+1]%;\
 	/msr Unstun weakened [#%{prot_unstun_w}]%;\
--- a/gm-magical.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-magical.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -125,7 +125,7 @@
 ;; Start of spell
 
 
-/def -i -p9999 -msimple -t"You start chanting." gspell_start =\
+/def -i -F -p9999 -msimple -t"You start chanting." gspell_start =\
 	/if (ceremony_st2=~"on")/let _cere=[@{BCgreen}CERE@{n}]%;/else /let _cere=%;/endif%;\
 	/set ceremony_st2=off%;\
 	/set spell_t=$[time()]%;\
@@ -142,7 +142,7 @@
 
 
 ;; Spell done
-/def -i -p9999 -msimple -t"You are done with the chant." gspell_end =\
+/def -i -F -p9999 -msimple -t"You are done with the chant." gspell_end =\
 	/set cnt_trounds=$[cnt_trounds+spell_rcount]%;\
 	/set cnt_scasts=$[cnt_scasts+1]%;\
 	/set spell_st=off%;\
@@ -154,12 +154,12 @@
 
 
 ;; Cast info
-/def -i -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\'.$" gspell_info1 =\
+/def -i -F -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\'.$" gspell_info1 =\
 	/set cast_info_n=%{P1}%;\
 	/set cast_info_t=%;\
 	/gshow_info
 
-/def -i -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\' at \'([A-Za-z0-9_ ,.'-]+)\'.$" gspell_info2 =\
+/def -i -F -p9999 -ag -mregexp -t"^You are casting \'([a-z ]+)\' at \'([A-Za-z0-9_ ,.'-]+)\'.$" gspell_info2 =\
 	/set cast_info_n=%{P1}%;\
 	/set cast_info_t=%{P2}%;\
 	/gshow_info
@@ -192,16 +192,16 @@
 		/prexecfuncs %{event_spell_intr}%;\
 	/endif
 
-/def -i -p9999 -ag -mregexp -t"^You( interrupt|r movement prevents you from casting| have insufficient strength to cast| lose your concentration and cannot cast) the spell.$" gspell_interrupt1 =\
+/def -i -F -p9999 -ag -mregexp -t"^You( interrupt|r movement prevents you from casting| have insufficient strength to cast| lose your concentration and cannot cast) the spell.$" gspell_interrupt1 =\
 	/gspell_interrupt
 
-/def -i -p9999 -ag -mregexp -t"^You (get hit SO HARD that you have to stop your spell|lose your concentration and stop your spell casting|massage your wounds and forget your spell).$" gspell_interrupt2 =\
+/def -i -F -p9999 -ag -mregexp -t"^You (get hit SO HARD that you have to stop your spell|lose your concentration and stop your spell casting|massage your wounds and forget your spell).$" gspell_interrupt2 =\
 	/gspell_interrupt
 
-/def -i -p9999 -ag -msimple -t"The ground shakes violently! EARTHQUAKE!" gspell_interrupt3 =\
+/def -i -F -p9999 -ag -msimple -t"The ground shakes violently! EARTHQUAKE!" gspell_interrupt3 =\
 	/gspell_interrupt
 
-/def -i -p9999 -ag -msimple -t"You interrupt the chant in order to start a new chant." gspell_interrupt4 =\
+/def -i -F -p9999 -ag -msimple -t"You interrupt the chant in order to start a new chant." gspell_interrupt4 =\
 	/gspell_interrupt
 
 
@@ -221,14 +221,14 @@
 
 
 ;; Cast burden/slow
-/def -i -p9999 -aCgreen -msimple -t"Your heavy burden slows down your casting." gspell_burden =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"Your heavy burden slows down your casting." gspell_burden =\
 	/set spell_rleft=$[spell_rleft+1]%;\
 	/set spell_rcount=$[spell_rcount+1]%;\
 	/mrrounds%;/mrmagic slows down
 
 
 ;; Cast haste
-/def -i -p9999 -aCgreen -msimple -t"You skillfully cast the spell with haste." gspell_haste =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You skillfully cast the spell with haste." gspell_haste =\
 	/set spell_rleft=$[spell_rleft-1]%;\
 	/set spell_rcount=$[spell_rcount-1]%;\
 	/set cnt_hastes=$[cnt_hastes+1]%;\
@@ -236,14 +236,14 @@
 
 
 ;; Cast greater haste
-/def -i -p9999 -aCgreen -msimple -t"You skillfully cast the spell with greater haste." gspell_ghaste =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You skillfully cast the spell with greater haste." gspell_ghaste =\
 	/set spell_rleft=$[spell_rleft-2]%;\
 	/set spell_rcount=$[spell_rcount-2]%;\
 	/set cnt_ghastes=$[cnt_ghastes+1]%;\
 	/mrrounds%;/mrmagic ghastes
 
 ;; Cast quick lips
-/def -i -p9999 -aCgreen -msimple -t"ASDFZ." gspell_qlips1 =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"ASDFZ." gspell_qlips1 =\
 	/set spell_rleft=$[spell_rleft-2]%;\
 	/set spell_rcount=$[spell_rcount-2]%;\
 	/set cnt_qlips1=$[cnt_qlips1+1]%;\
@@ -315,22 +315,22 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Damage criticality
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i -p9999 -aCgreen -msimple -t"You feel like your spell gained additional power." gspell_dcrit1 =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You feel like your spell gained additional power." gspell_dcrit1 =\
 	/set cnt_damcrits=$[cnt_damcrits+1]%;\
 	/set cnt_dcrit1=$[cnt_dcrit1+1]%;\
 	/msr Damcrit (1)
 
-/def -i -p9999 -aCgreen -msimple -t"You feel like you managed to channel additional POWER to your spell." gspell_dcrit2 =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You feel like you managed to channel additional POWER to your spell." gspell_dcrit2 =\
 	/set cnt_damcrits=$[cnt_damcrits+1]%;\
 	/set cnt_dcrit2=$[cnt_dcrit2+1]%;\
 	/msr Damcrit (2)
 
-/def -i -p9999 -aCgreen -msimple -t"Your fingertips are surrounded with swirling ENERGY as you cast the spell." gspell_dcrit3 =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"Your fingertips are surrounded with swirling ENERGY as you cast the spell." gspell_dcrit3 =\
 	/set cnt_damcrits=$[cnt_damcrits+1]%;\
 	/set cnt_dcrit3=$[cnt_dcrit3+1]%;\
 	/msr Damcrit (3)
 
-/def -i -p9999 -aCgreen -mregexp -t"^You feel in contact with the essence of ([a-z]+).$" gspell_ecrit1 =\
+/gdef -i -F -p9999 -aCgreen -mregexp -t"^You feel in contact with the essence of ([a-z]+).$" gspell_ecrit1 =\
 	/set cnt_damcrits=$[cnt_damcrits+1]%;\
 	/set cnt_dcrit4=$[cnt_dcrit4+1]
 
@@ -338,11 +338,11 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Miscellaneous
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i -p9999 -aCgreen -msimple -t"You sizzle with magical energy." gmagic_sizzle =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You sizzle with magical energy." gmagic_sizzle =\
 	/mrmagic vibrates noisily.
 
-/def -i -p9999 -aCgreen -msimple -t"You surreptitiously conceal your spell casting." gmagic_conceal =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You surreptitiously conceal your spell casting." gmagic_conceal =\
 	/mrmagic conceals ...
 
-/def -i -p9999 -aCgreen -msimple -t"You feel your skills in handling elemental forces improve." gmagic_essence =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You feel your skills in handling elemental forces improve." gmagic_essence =\
 	/mrmagic gains essence!
--- a/gm-merchant.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-merchant.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -352,13 +352,13 @@
 	/msq Alloying '%{*}' in '%{mwb_forge}' with '%{mwb_tool}' ...%;\
 	@@use alloying at %{*} in %{mwb_forge}
 
-/def -F -i -msimple -t"You slip up and fumble your attempt." galloy_fumble =\
+/def -i -F -msimple -t"You slip up and fumble your attempt." galloy_fumble =\
 	/set alloy_fumble=1
 
 /def -i prurify =\
 	/return replace(" ", "+", strip_attr({*}))
 
-/def -F -i -p9999 -aBCwhite -mregexp -t"^You mix [a-z ,]+ and create a quantity of ([a-z ]+)\.?$" galloy_check =\
+/gdef -i -F -p9999 -aBCwhite -mregexp -t"^You mix [a-z ,]+ and create a quantity of ([a-z ]+)\.?$" galloy_check =\
 	/let _match=%{P0}%;/set _result=%{P1}%;\
 	@@look at %{_result} in %{mwb_forge}
 	
@@ -385,7 +385,7 @@
 	@@use gem cutting at %{gcut_gem} in %{mwb_forge}
 
 
-/def -i -p9999 -aBCwhite -t"You skillfully cut the gem ore into a beautiful gem." ggcut_get1 =\
+/gdef -i -F -p9999 -aBCwhite -t"You skillfully cut the gem ore into a beautiful gem." ggcut_get1 =\
 	/if (mwb_mode=~"gcut" & skill_st2=~"on")\
 		@@get gem from %{mwb_forge}%;\
 		/gmatmove_item gem%;\
@@ -401,7 +401,7 @@
 /set mine_amount=
 /set mine_grep=0
 
-/def -i -F -p9 -P0BCgreen -mregexp -t"(exits|Exits:)" gmine_init =\
+/gdef -i -F -p9 -P0BCgreen -mregexp -t"(exits|Exits:)" gmine_init =\
 	/set mine_match=1
 
 /def -i -F -p9999 -P2BCred -mregexp -t"(abyss|chunky|coil|crag|deposit|gloss|graveyard|hill|hit|lode|lump|mass|mound|mountain|nest|network|pile|pocket|pool|protrusion|puddle|shard|slab|stack|tangle|torrent) of ([a-z]+|moss agate|petrified wood) *(ore|is|$)" gmine_at1 =\
@@ -452,11 +452,11 @@
 		/gmatmove_item %{1}%;\
 	/endif
 
-/def -i -p9999 -aBCwhite -mregexp -t"^You begin mining the [a-z ]+ ([a-z]+) and you manage to retrieve an? ([a-z ]+)\." gmine_get1 =\
+/gdef -i -p9999 -aBCwhite -mregexp -t"^You begin mining the [a-z ]+ ([a-z]+) and you manage to retrieve an? ([a-z ]+)\." gmine_get1 =\
 	/test gmine_move({P2},{P1})%;\
 	@@grep 'contains roughly' look at %{P1} on ground
 
-/def -i -p9999 -aBCwhite -mregexp -t"^You mine the [a-z]+ ([a-z]+) and retrieve an? ([a-z ]+)\." gmine_get2 =\
+/gdef -i -p9999 -aBCwhite -mregexp -t"^You mine the [a-z]+ ([a-z]+) and retrieve an? ([a-z ]+)\." gmine_get2 =\
 	/test gmine_move({P2},{P1})
 
 
@@ -520,7 +520,7 @@
 
 
 ;; Automagically weigh the remaining material after crafting, if belt is enabled
-/def -i -F -p9999 -aCgreen -msimple -t"You craft some spell reagents." gmmr_done =\
+/gdef -i -F -p9999 -aCgreen -msimple -t"You craft some spell reagents." gmmr_done =\
 	/if (opt_havebelt=~"on") @@weigh %{mmr_target}%;/endif
 
 
--- a/gm-nun.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-nun.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -1,4 +1,4 @@
-;;
+[6~;;
 ;; GgrTF::Nun - Sisters of Las guild support @ BatMUD
 ;; (C) Copyright 2006-2008 Ealoren Pupunen & Matti Hämäläinen (Ggr)
 ;;
@@ -85,11 +85,11 @@
 	@@clean %{1}%;@@insert honeycomb to %{1} slot %{2}%;\
 	/endif
 
-/def -i -aCyellow -Enun_beemaint -p9999 -mregexp -t"^But honeycomb slot [0-9]+ is empty\." gnun_combend =\
+/gdef -i -aCyellow -Enun_beemaint -p9999 -mregexp -t"^But honeycomb slot [0-9]+ is empty\." gnun_combend =\
 	/set nun_beemaint=0%;\
 	/repeat -1 1 @@close %{nun_beehive}
 
-/def -i -aCyellow -Enun_beemaint -p9999 -mregexp -t"^You put the honeycomb to the slot ([1-8])\." gnun_combok =\
+/gdef -i -aCyellow -Enun_beemaint -p9999 -mregexp -t"^You put the honeycomb to the slot ([1-8])\." gnun_combok =\
 	/set nun_bk=$[{P1}+1]%;\
 	/if (nun_bk < 9) /repeat -1 1 /test gnun_combmaint(nun_beehive,nun_bk)%;/endif
 
--- a/gm-tarma.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-tarma.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -46,10 +46,10 @@
 		/msq @{BCgreen}No heal alls detected!@{n}%;\
 	/endif
 
-/def -i -p9999 -aCyellow -mregexp -t"^You feel like ([A-Z][a-z]+)(| the christmas gnome| the christmas elf) healed you a bit\.$" ghealall_got =\
+/gdef -i -p9999 -aCyellow -mregexp -t"^You feel like ([A-Z][a-z]+)(| the christmas gnome| the christmas elf) healed you a bit\.$" ghealall_got =\
 	/set healall_n=%{P1}%;/set healall_t=$[time()]
 
-/def -i -p9999 -aCyellow -mregexp -t"^You feel like you healed ([0-9]+ players|one player)\.$" ghealall_heal =\
+/gdef -i -p9999 -aCyellow -mregexp -t"^You feel like you healed ([0-9]+ players|one player)\.$" ghealall_heal =\
 	/set healall_n=%{set_plrname}%;/set healall_t=$[time()]
 
 
--- a/gm-tiger.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/gm-tiger.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -24,20 +24,20 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Claw messages
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i -mregexp -aCgreen -t"^As .+ drops to (his|her|its) knees you leap in for the kill!$" gtiger_claw_hit =\
+/gdef -i -F -mregexp -aCgreen -t"^As .+ drops to (his|her|its) knees you leap in for the kill!$" gtiger_claw_hit =\
 	/mrtiger Claw in!
 
-/def -i -mregexp -aCred -t"^.+ manages to resist your claws!$" gtiger_claw_resist =\
+/gdef -i -F -mregexp -aCred -t"^.+ manages to resist your claws!$" gtiger_claw_resist =\
 	/mrtiger Claw resisted.
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Miscellaneous
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i -mregexp -aCcyan -t"^You feel how you fracture several of (.+) bones with your attack!" gtiger_claw_damage =\
-	/if (opt_rtiger=~"on") @cackle%;/endif
+/gdef -i -F -mregexp -aCcyan -t"^You feel how you fracture several of (.+) bones with your attack!" gtiger_claw_damage =\
+	/if (opt_rtiger=~"on") @@cackle%;/endif
 
-/def -i -msimple -aCyellow -t"You feel more connected to Curath than ever before!" gtiger_claw_repu
+/gdef -i -F -msimple -aCyellow -t"You feel more connected to Curath than ever before!" gtiger_claw_repu
 
-/def -i -msimple -aCyellow -t"You learn to focus power from the deepest core of your being!" gtiger_mak_repu
+/gdef -i -F -msimple -aCyellow -t"You learn to focus power from the deepest core of your being!" gtiger_mak_repu
 
--- a/salve.tf	Wed Dec 22 19:41:47 2010 +0000
+++ b/salve.tf	Wed Dec 22 19:53:44 2010 +0000
@@ -67,14 +67,14 @@
 		/endif%;\
 	/endif
 
-/def -i -aBCmagenta -msimple -t"You finish applying the salve." salve_begin =\
+/gdef -i -aBCmagenta -msimple -t"You finish applying the salve." salve_begin =\
 	/set salve_st=on%;\
 	/set salve_m=off%;\
 	/set salve_t=$[time()]%;\
 	/msq Salve timer started, waiting effects ...%;\
 	/repeat -10 1 @report stats
 
-/def -i -aBCmagenta -msimple -t"You feel your body returning to normal." salve_end =\
+/gdef -i -aBCmagenta -msimple -t"You feel your body returning to normal." salve_end =\
 	/set salve_st=off%;/set salve_st2=on%;\
 	/msq Salve duration: $[prgetstime(salve_t)]%;\
 	@report stats