--- a/ggrtf-merchant.tf	Wed May 30 08:36:41 2007 +0000
+++ b/ggrtf-merchant.tf	Fri Jun 01 01:09:08 2007 +0000
@@ -134,7 +134,7 @@
 ;A dark grey elm tree stands here.
 ;A cedar tree with smooth bark stands here.
 ;A maple tree is growing here.
-/def -i -F -p1 -mregexp -t"^.........  .* ([a-z][a-z]+) tree " glumberjack_grep =\
+/def -i -F -p1 -mregexp -t"^.+  .* ([a-z][a-z]+) tree " glumberjack_grep =\
 	@@grep 'It can be cut down for ' look at %{P1} on ground%;/set lj_target=%{P1}
 
 /def -i -p9999 -ag -msimple -t"No matches for \'It can be cut down for \'." glumberjack_gag
@@ -150,7 +150,7 @@
 		/test gwieldtool(mtool_lj)%;\
 	/endif%;\
 	/msq Lumberjacking '%{lj_target}' ...%;\
-	@@use lumberjacking at %{lj_target}
+	/send @@use lumberjacking at %{lj_target}
 
 
 /def -i -p9999 -mregexp -t"^You chop up the [a-z ]+ into ([0-9]+) useable logs\.$" glumberjack_get =\
@@ -257,6 +257,7 @@
 ;; Autotargetting
 /set mine_target=
 /set mine_amount=
+/set mine_grep=0
 
 ;A slab of crystal is embedded in the ground.
 ;A protrusion of granite is embedded in the ground.
@@ -265,13 +266,22 @@
 ;A crag of marble is embedded in the ground.
 ;A deposit of chalk is embedded in the ground.
 
-/def -i -p2 -mregexp -t"^.........  .*An? (graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss) of ([a-z ]+) ore" gmine_at1 =\
-	@@grep 'contains roughly' look at %{P1} on ground%;/set mine_target=%{P2}
+;/def -i -p2 -mregexp -t"^.........  .*An? (graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss) of ([a-z ]+) ore" gmine_at1 =\
+;	@@grep 'contains roughly' look at %{P1} on ground%;/set mine_target=%{P2}
+;/def -i -p1 -mregexp -t"^.........  .*An? (graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss) of ([a-z ]+) is" gmine_at2 =\
+;	@@grep 'contains roughly' look at %{P1} on ground%;/set mine_target=%{P2}
+
+/def -i -p4 -mregexp -t"(graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss) of ([a-z ]+) (ore|is)?" gmine_at1 =\
+	/set mine_target=%{P2}%;/set mine_grep=0%;@@grep 'contains roughly' look at %{P1} on ground
 
-/def -i -p1 -mregexp -t"^.........  .*An? (graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss) of ([a-z ]+) is" gmine_at2 =\
-	@@grep 'contains roughly' look at %{P1} on ground%;/set mine_target=%{P2}
+/def -i -p3 -mregexp -t"An? (graveyard|crag|slab|protrusion|lode|deposit|gloss|abyss)" gmine_at2 =\
+	/set mine_grep=1%;/set mine_type=%{P1}
 
-/def -i -p9999 -ag -msimple -t"No matches for \'contains roughly\'." gmine_gag1
+/def -i -p1 -Emine_grep==1 -mregexp -t" ([a-z ]+) (ore)? is embedded " gmine_at3 =\
+	/set mine_target=%{P1}%;/set mine_grep=0%;@@grep 'contains roughly' look at %{mine_type} on ground
+
+
+/def -i -p9999 -ag -msimple -t"No matches for 'contains roughly'." gmine_gag1
 
 /def -i -p9999 -ag -mregexp -t"^The ([a-z]+) contains roughly ([0-9]+) kg of ([a-z ]+)\.$" gmine_amount =\
 	/set mine_amount=%{P2}%;/set mine_target=%{P3}%;\