--- a/ggrtf-alch.tf	Thu Mar 09 17:41:48 2006 +0000
+++ b/ggrtf-alch.tf	Thu Mar 09 18:06:32 2006 +0000
@@ -28,66 +28,66 @@
 ;; General helper functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Return herb handlename for given long "real name"
-/def herb_get1 = /let qts=Unknown%;\
-	/if ({*}=~"A black vine seed")/let qts=seed%;\
-	/elseif ({*}=~"A green mistletoe")/let qts=mistletoe%;\
-	/elseif ({*}=~"Arnica flower")/let qts=arnica%;\
-	/elseif ({*}=~"A snow-white crystalline plant")/let qts=crystalline%;\
-	/elseif ({*}=~"Barberry")/let qts=barberry%;\
-	/elseif ({*}=~"Blood moss")/let qts=blood_moss%;\
-	/elseif ({*}=~"Bloodroot root")/let qts=bloodroot%;\
-	/elseif ({*}=~"Blueberry")/let qts=blueberry%;\
-	/elseif ({*}=~"Boneset flower")/let qts=boneset%;\
-	/elseif ({*}=~"Borage flower")/let qts=borage%;\
-	/elseif ({*}=~"Brown potato")/let qts=potato%;\
-	/elseif ({*}=~"Burdock leaf")/let qts=burdock%;\
-	/elseif ({*}=~"Chickweed root")/let qts=chickweed%;\
-	/elseif ({*}=~"Chicory root")/let qts=chicory%;\
-	/elseif ({*}=~"Comfrey root")/let qts=comfrey%;\
-	/elseif ({*}=~"Costmary flower")/let qts=costmary%;\
-	/elseif ({*}=~"Cotton ball")/let qts=cotton%;\
-	/elseif ({*}=~"Elder berry")/let qts=elder%;\
-	/elseif ({*}=~"Foxglove leaf")/let qts=foxglove%;\
-	/elseif ({*}=~"Garlic nail")/let qts=garlic%;\
-	/elseif ({*}=~"Ginseng root")/let qts=ginseng%;\
-	/elseif ({*}=~"H'cliz leaf")/let qts=hcliz%;\
-	/elseif ({*}=~"Head of cabbage")/let qts=cabbage%;\
-	/elseif ({*}=~"Head of cauliflower")/let qts=cauliflower%;\
-	/elseif ({*}=~"Head of lettuce")/let qts=lettuce%;\
-	/elseif ({*}=~"Hemlock fruit")/let qts=hemlock%;\
-	/elseif ({*}=~"Henbane leaf")/let qts=henbane%;\
-	/elseif ({*}=~"Holly berry")/let qts=holly%;\
-	/elseif ({*}=~"Honeysuckle flower")/let qts=honeysuckle%;\
-	/elseif ({*}=~"Jaslah leaf")/let qts=jaslah%;\
-	/elseif ({*}=~"Jimsonweed flower")/let qts=jimsonweed%;\
-	/elseif ({*}=~"Light green pear")/let qts=pear%;\
-	/elseif ({*}=~"Lobelia flower")/let qts=lobelia%;\
-	/elseif ({*}=~"Lungwort flower")/let qts=lungwort%;\
-	/elseif ({*}=~"Mandrake root")/let qts=mandrake%;\
-	/elseif ({*}=~"Mangrel leaf")/let qts=mangrel%;\
-	/elseif ({*}=~"Mugwort leaf")/let qts=mugwort%;\
-	/elseif ({*}=~"Mystic carrot")/let qts=mystic_carrot%;\
-	/elseif ({*}=~"Mystic spinach leaf")/let qts=mystic_spinach%;\
-	/elseif ({*}=~"Orange carrot")/let qts=carrot%;\
-	/elseif ({*}=~"Orange nightshade flower")/let qts=nightshade%;\
-	/elseif ({*}=~"Purplish plum")/let qts=plum%;\
-	/elseif ({*}=~"Red apple")/let qts=apple%;\
-	/elseif ({*}=~"Red raspberry")/let qts=raspberry%;\
-	/elseif ({*}=~"Red rhubarb stem")/let qts=rhubarb%;\
-	/elseif ({*}=~"Red strawberry")/let qts=strawberry%;\
-	/elseif ({*}=~"Red tomato")/let qts=tomato%;\
-	/elseif ({*}=~"Soapwort root")/let qts=soapwort%;\
-	/elseif ({*}=~"Spinach leaf")/let qts=spinach%;\
-	/elseif ({*}=~"Sponge mushroom")/let qts=mushroom%;\
-	/elseif ({*}=~"Sweet flag root")/let qts=sweet_flag%;\
-	/elseif ({*}=~"Thistle thorn")/let qts=thistle%;\
-	/elseif ({*}=~"Water lily flower")/let qts=water_lily%;\
-	/elseif ({*}=~"White onion bulb")/let qts=onion%;\
-	/elseif ({*}=~"White turnip")/let qts=turnip%;\
-	/elseif ({*}=~"Wolfbane flower")/let qts=wolfbane%;\
-	/elseif ({*}=~"Wormwood leaf")/let qts=wormwood%;\
-	/elseif ({*}=~"Yarrow flower")/let qts=yarrow%;\
-	/endif%;/return qts
+/def herb_get1 = /let _hst=Unknown%;\
+	/if ({*}=~"A black vine seed")/let _hst=seed%;\
+	/elseif ({*}=~"A green mistletoe")/let _hst=mistletoe%;\
+	/elseif ({*}=~"Arnica flower")/let _hst=arnica%;\
+	/elseif ({*}=~"A snow-white crystalline plant")/let _hst=crystalline%;\
+	/elseif ({*}=~"Barberry")/let _hst=barberry%;\
+	/elseif ({*}=~"Blood moss")/let _hst=blood_moss%;\
+	/elseif ({*}=~"Bloodroot root")/let _hst=bloodroot%;\
+	/elseif ({*}=~"Blueberry")/let _hst=blueberry%;\
+	/elseif ({*}=~"Boneset flower")/let _hst=boneset%;\
+	/elseif ({*}=~"Borage flower")/let _hst=borage%;\
+	/elseif ({*}=~"Brown potato")/let _hst=potato%;\
+	/elseif ({*}=~"Burdock leaf")/let _hst=burdock%;\
+	/elseif ({*}=~"Chickweed root")/let _hst=chickweed%;\
+	/elseif ({*}=~"Chicory root")/let _hst=chicory%;\
+	/elseif ({*}=~"Comfrey root")/let _hst=comfrey%;\
+	/elseif ({*}=~"Costmary flower")/let _hst=costmary%;\
+	/elseif ({*}=~"Cotton ball")/let _hst=cotton%;\
+	/elseif ({*}=~"Elder berry")/let _hst=elder%;\
+	/elseif ({*}=~"Foxglove leaf")/let _hst=foxglove%;\
+	/elseif ({*}=~"Garlic nail")/let _hst=garlic%;\
+	/elseif ({*}=~"Ginseng root")/let _hst=ginseng%;\
+	/elseif ({*}=~"H'cliz leaf")/let _hst=hcliz%;\
+	/elseif ({*}=~"Head of cabbage")/let _hst=cabbage%;\
+	/elseif ({*}=~"Head of cauliflower")/let _hst=cauliflower%;\
+	/elseif ({*}=~"Head of lettuce")/let _hst=lettuce%;\
+	/elseif ({*}=~"Hemlock fruit")/let _hst=hemlock%;\
+	/elseif ({*}=~"Henbane leaf")/let _hst=henbane%;\
+	/elseif ({*}=~"Holly berry")/let _hst=holly%;\
+	/elseif ({*}=~"Honeysuckle flower")/let _hst=honeysuckle%;\
+	/elseif ({*}=~"Jaslah leaf")/let _hst=jaslah%;\
+	/elseif ({*}=~"Jimsonweed flower")/let _hst=jimsonweed%;\
+	/elseif ({*}=~"Light green pear")/let _hst=pear%;\
+	/elseif ({*}=~"Lobelia flower")/let _hst=lobelia%;\
+	/elseif ({*}=~"Lungwort flower")/let _hst=lungwort%;\
+	/elseif ({*}=~"Mandrake root")/let _hst=mandrake%;\
+	/elseif ({*}=~"Mangrel leaf")/let _hst=mangrel%;\
+	/elseif ({*}=~"Mugwort leaf")/let _hst=mugwort%;\
+	/elseif ({*}=~"Mystic carrot")/let _hst=mystic_carrot%;\
+	/elseif ({*}=~"Mystic spinach leaf")/let _hst=mystic_spinach%;\
+	/elseif ({*}=~"Orange carrot")/let _hst=carrot%;\
+	/elseif ({*}=~"Orange nightshade flower")/let _hst=nightshade%;\
+	/elseif ({*}=~"Purplish plum")/let _hst=plum%;\
+	/elseif ({*}=~"Red apple")/let _hst=apple%;\
+	/elseif ({*}=~"Red raspberry")/let _hst=raspberry%;\
+	/elseif ({*}=~"Red rhubarb stem")/let _hst=rhubarb%;\
+	/elseif ({*}=~"Red strawberry")/let _hst=strawberry%;\
+	/elseif ({*}=~"Red tomato")/let _hst=tomato%;\
+	/elseif ({*}=~"Soapwort root")/let _hst=soapwort%;\
+	/elseif ({*}=~"Spinach leaf")/let _hst=spinach%;\
+	/elseif ({*}=~"Sponge mushroom")/let _hst=mushroom%;\
+	/elseif ({*}=~"Sweet flag root")/let _hst=sweet_flag%;\
+	/elseif ({*}=~"Thistle thorn")/let _hst=thistle%;\
+	/elseif ({*}=~"Water lily flower")/let _hst=water_lily%;\
+	/elseif ({*}=~"White onion bulb")/let _hst=onion%;\
+	/elseif ({*}=~"White turnip")/let _hst=turnip%;\
+	/elseif ({*}=~"Wolfbane flower")/let _hst=wolfbane%;\
+	/elseif ({*}=~"Wormwood leaf")/let _hst=wormwood%;\
+	/elseif ({*}=~"Yarrow flower")/let _hst=yarrow%;\
+	/endif%;/return _hst
 
 ;; Return herb long "real name" for given handlename
 /def herb_jar_get = /let qtjar=????%;\
@@ -206,11 +206,11 @@
 /def prporg =\
 	/eval /set qtval=$$[acan_c_%{1}]%;\
 	/if (qtval > 0)\
-		/let qts=[@{BCwhite}%{qtval}@{n}] @{BCgreen}%{1}s@{n}%;\
-		/if (prstr!~"")\
-			/set prstr=%{prstr}, %{qts}%;\
+		/let _hst=[@{BCwhite}%{qtval}@{n}] @{BCgreen}%{1}s@{n}%;\
+		/if (conts_str!~"")\
+			/set conts_str=%{conts_str}, %{_hst}%;\
 		/else%;\
-			/set prstr=%{qts}%;\
+			/set conts_str=%{_hst}%;\
 		/endif%;\
 	/endif
 
@@ -263,7 +263,7 @@
 	/eval /set acan_c_%{P1}=$$[acan_c_%{P1} + 1]
 
 /def -E(acan_st==6) -ag -mregexp -t"^It looks ([A-z ]+)\.$" acan_final =\
-	/set acan_st=0%;/set prstr=%;\
+	/set acan_st=0%;/set conts_str=%;\
 	/prporg Unknown%;\
 	/prporg antenna%;\
 	/prporg arm%;\
@@ -289,7 +289,7 @@
 	/prporg tendril%;\
 	/prporg wing%;\
 	/msq Can @{Cyellow}'%{acan_label}'@{n} (@{Cgreen}%{acan_num}@{n}/@{Cred}%{acan_max}@{n}) [@{BCwhite}%{P1}@{n}] contains:%;\
-	/msq %{prstr}
+	/msq %{conts_str}
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Can handling
@@ -298,11 +298,11 @@
 /def prpherb =\
 	/eval /set qtval=$$[ajar_c_%{1}]%;\
 	/if (qtval > 0)\
-		/let qts=[@{BCwhite}%{qtval}@{n}] @{BCgreen}%{1}]@{n}%;\
-		/if (prstr!~"")\
-			/set prstr=%{prstr}, %{qts}%;\
+		/let _hst=[@{BCwhite}%{qtval}@{n}] @{BCgreen}%{1}]@{n}%;\
+		/if (conts_str!~"")\
+			/set conts_str=%{conts_str}, %{_hst}%;\
 		/else%;\
-			/set prstr=%{qts}%;\
+			/set conts_str=%{_hst}%;\
 		/endif%;\
 	/endif
 
@@ -390,7 +390,7 @@
 	/eval /set ajar_c_%{ajar_q1}=$$[ajar_c_%{ajar_q1} + 1]
 
 /def -E(ajar_st=6) -ag -mregexp -t"^It looks ([A-z ]+)\.$" ajar_final =\
-	/set ajar_st=0%;/set prstr=%;\
+	/set ajar_st=0%;/set conts_str=%;\
 	/prpherb Unknown%;\
 	/prpherb seed%;\
 	/prpherb mistletoe%;\
@@ -451,5 +451,5 @@
 	/prpherb wormwood%;\
 	/prpherb yarrow%;\
 	/msq Jar @{Cyellow}'%{ajar_label}'@{n} (@{Cgreen}%{ajar_num}@{n}/@{Cred}%{ajar_max}@{n}) [@{BCwhite}%{P1}@{n}] contains:%;\
-	/msq %{prstr}
+	/msq %{conts_str}
 

--- a/ggrtf.tf	Thu Mar 09 17:41:48 2006 +0000
+++ b/ggrtf.tf	Thu Mar 09 18:06:32 2006 +0000
@@ -99,47 +99,47 @@
 ;; Return a string containing a floating point value,
 ;; truncated to specified number of decimal digits maximum.
 /def -i prround =\
-	/let _rt=%{1}%;\
-	/let _ri=$[strchr(_rt,".")]%;\
-	/if (_ri >= 0)\
+	/let _rval=%{1}%;\
+	/let _rpos=$[strchr(_rval,".")]%;\
+	/if (_rpos >= 0)\
 		/if ({2} > 0)\
-			/return strcat(substr(_rt,0,_ri),substr(_rt,_ri,{2}+1))%;\
+			/return strcat(substr(_rval,0,_rpos),substr(_rval,_rpos,{2}+1))%;\
 		/else \
-			/return substr(_rt,0,_ri)%;\
+			/return substr(_rval,0,_rpos)%;\
 		/endif%;\
 	/else \
-		/return _rt%;\
+		/return _rval%;\
 	/endif
 
 ;; Return string describing time elapsed from given timestamp parameter
 /def -i prgettime =\
 	/if ({1} > 0)\
-		/let jtime=$[trunc({1})]%;\
-		/let jtimeh=$[jtime / 3600]%;\
-		/let jtimeq=$[mod(jtime,3600)]%;\
-		/if (jtimeh >= 1)\
-			/let jstr=%{jtimeh}h%;\
+		/let _jtime=$[trunc({1})]%;\
+		/let _jtimeh=$[_jtime/3600]%;\
+		/let _jtimeq=$[mod(_jtime,3600)]%;\
+		/if (_jtimeh >= 1)\
+			/let _jstr=%{_jtimeh}h%;\
 		/else \
-			/let jstr=%;\
+			/let _jstr=%;\
 		/endif%;\
-		/let jstr=%{jstr}$[jtimeq / 60]m$[mod(jtimeq,60)]s%;\
-		/return jstr%;\
+		/let _jstr=%{_jstr}$[_jtimeq/60]m$[mod(_jtimeq,60)]s%;\
+		/return _jstr%;\
 	/else \
 		/return 0%;\
 	/endif
 
 /def -i prgetstime =\
 	/if ({1} > 0)\
-		/let jtime=$[trunc(time() - {1})]%;\
-		/let jtimeh=$[jtime / 3600]%;\
-		/let jtimeq=$[mod(jtime,3600)]%;\
-		/if (jtimeh > 0)\
-			/let jstr=[%{jtimeh}h%;\
+		/let _jtime=$[trunc(time()-{1})]%;\
+		/let _jtimeh=$[_jtime/3600]%;\
+		/let _jtimeq=$[mod(_jtime,3600)]%;\
+		/if (_jtimeh > 0)\
+			/let _jstr=[%{_jtimeh}h%;\
 		/else \
-			/let jstr=[%;\
+			/let _jstr=[%;\
 		/endif%;\
-		/let jstr=%{jstr}$[jtimeq / 60]m$[mod(jtimeq,60)]s]%;\
-		/return jstr%;\
+		/let _jstr=%{_jstr}$[_jtimeq/60]m$[mod(_jtimeq,60)]s]%;\
+		/return _jstr%;\
 	/else \
 		/return%;\
 	/endif