--- a/ggrtf-misc.tf	Tue Jul 24 01:23:24 2007 +0000
+++ b/ggrtf-misc.tf	Wed Jul 25 20:07:56 2007 +0000
@@ -38,15 +38,15 @@
 /def -i -Econs_st==1 -ag -mregexp -t"^You would get (.*) experience for " gconsider_rep1 =\
 	/set cons_exp=%{P1}
 
-/def -i defconspr =\
+/def -i gdefconspr =\
 	/def -i -Econs_st==1 -ag -mregexp -t"^[A-Za-z<> ,.'-]+ %{2}$$" gconsider_pr%{1} =\
 		/set cons_pr=%{3}
 
-/test defconspr(1, "has a soft skin.", "soft", 0)
-/test defconspr(2, "seems to have a bit hardened skin.", "bit hardened", 0)
-/test defconspr(3, "has somewhat hardened skin.", "somewhat hardened", 0)
-/test defconspr(4, "skin could fold up a rapier!", "could fold up a rapier!", 0)
-/test defconspr(5, "skin seems to be virtually impenetrable!", "impenetrable!", 0)
+/test gdefconspr(1, "has a soft skin.", "soft", 0)
+/test gdefconspr(2, "seems to have a bit hardened skin.", "bit hardened", 0)
+/test gdefconspr(3, "has somewhat hardened skin.", "somewhat hardened", 0)
+/test gdefconspr(4, "skin could fold up a rapier!", "could fold up a rapier!", 0)
+/test gdefconspr(5, "skin seems to be virtually impenetrable!", "impenetrable!", 0)
 
 /def -i -ag -mregexp -t"^The final estimation is that (.*)$" gconsider_final =\
 	/if (cons_st) \
@@ -262,33 +262,32 @@
 /def -i grpouch_report =\
 	/substitute -p @{BCyellow}$[pad({1},5)]@{n} | @{BCgreen}$[pad({6},-25)]@{n} (@{BCred}$[pad({2},4)]@{n},@{Cgreen}$[pad({3},4)]@{n},@{Cyellow}$[pad({4},4)]@{n}) @{BCgray}(%{5})@{n}
 
-/def -i grpouch_def =\
-	/let _tmps=$[replace(" ","_",tolower({2}))]%;\
-	/def -i -mregexp -t"^(One|Two|Three|Four|Five|Six|Seven|Eight|Nine|[0-9]+) (%{1}) \\(([0-9]+) power, ([0-9]+) standard, ([0-9]+) poor\\)$$" grpouch_%{_tmps} =\
+/def -i gdefrpouch =\
+	/let _tmps=$[replace(" ","_", tolower({2}))]%;\
+	/def -i -p9999 -mregexp -t"^(One|Two|Three|Four|Five|Six|Seven|Eight|Nine|[0-9]+) (%{1}) \\(([0-9]+) power, ([0-9]+) standard, ([0-9]+) poor\\)$$" grpouch_%{_tmps} =\
 		/test grpouch_report({P1},{P3},{P4},{P5},{P2},"%{2}")
 
-
-/test grpouch_def("handfuls? of olivine powder",	"Acid Blast")
-/test grpouch_def("stone cubes?",			"Acid Shield")
-/test grpouch_def("pairs? of interlocked bloodstone rings", "Acid Storm")
-/test grpouch_def("small highsteel discs?",		"Armour of Aether")
-/test grpouch_def("tiny leather bags? \(empty\)",	"Aura of Wind")
-/test grpouch_def("bronze marbles?",			"Blast Vacuum")
-/test grpouch_def("steel arrowheads?",			"Cold Ray")
-/test grpouch_def("small pieces? of electrum wire",	"Electrocution")
-/test grpouch_def("small glass cones?",			"Flame Shield")
-/test grpouch_def("grey fur triangles?",		"Frost Shield")
-/test grpouch_def("copper rods?",			"Golden Arrow")
-/test grpouch_def("handfuls? of onyx gravel",		"Hailstorm")
-/test grpouch_def("ebony tubes?",			"Killing Cloud")
-/test grpouch_def("granite spheres?",			"Lava Blast")
-/test grpouch_def("blue cobalt cups?",			"Lava Storm")
-/test grpouch_def("small iron rods?",			"Lightning Shield")
-/test grpouch_def("clusters? of tungsten wires",	"Lightning Storm")
-/test grpouch_def("tiny platinum hammers?",		"Magic Eruption")
-/test grpouch_def("quartz prisms?",			"Repulsor Aura")
-/test grpouch_def("tiny amethyst crystals?",		"Shield of Detoxification")
-/test grpouch_def("silvery bark chips?",		"Summon Carnal Spores")
+/test gdefrpouch("handfuls? of olivine powder",		"Acid Blast")
+/test gdefrpouch("stone cubes?",			"Acid Shield")
+/test gdefrpouch("pairs? of interlocked bloodstone rings", "Acid Storm")
+/test gdefrpouch("small highsteel discs?",		"Armour of Aether")
+/test gdefrpouch("tiny leather bags? \(empty\)",	"Aura of Wind")
+/test gdefrpouch("bronze marbles?",			"Blast Vacuum")
+/test gdefrpouch("steel arrowheads?",			"Cold Ray")
+/test gdefrpouch("small pieces? of electrum wire",	"Electrocution")
+/test gdefrpouch("small glass cones?",			"Flame Shield")
+/test gdefrpouch("grey fur triangles?",			"Frost Shield")
+/test gdefrpouch("copper rods?",			"Golden Arrow")
+/test gdefrpouch("handfuls? of onyx gravel",		"Hailstorm")
+/test gdefrpouch("ebony tubes?",			"Killing Cloud")
+/test gdefrpouch("granite spheres?",			"Lava Blast")
+/test gdefrpouch("blue cobalt cups? \(empty\)",		"Lava Storm")
+/test gdefrpouch("small iron rods?",			"Lightning Shield")
+/test gdefrpouch("clusters? of tungsten wires",		"Lightning Storm")
+/test gdefrpouch("tiny platinum hammers?",		"Magic Eruption")
+/test gdefrpouch("quartz prisms?",			"Repulsor Aura")
+/test gdefrpouch("tiny amethyst crystals?",		"Shield of Detoxification")
+/test gdefrpouch("silvery bark chips?",			"Summon Carnal Spores")
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -459,13 +458,15 @@
 /prdefhitspec -n"dodges" -t"You dodge."
 /prdefhitspec -n"parries" -t"You parry."
 /prdefhitspec -n"ripostes" -t"...AND riposte."
-/prdefhitspec -n"tumbles" -t"^You tumble .*'s dodge\.$" -r
+/prdefhitspec -n"tumbles" -t"^You tumble .+'s dodge\.$" -r
 /prdefhitspec -n"stuns" -t"^You STUN " -r
 
 
 ;; Non-weapon
 /test prdefhit("brawl", 01, "spank")
 
+/test prdefhit("brawl", 02, "smack")
+
 
 ;; Slashing weapons (axes and long blades)
 /test prdefhit("axes", 01, "solidly slash")