Mercurial > hg > batmud > ggrtf
changeset 611:610b1bda74e1
Some trees were not "detected", when the room desc wrapped in certain way. Fixed.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 01 Jun 2007 23:34:34 +0000 |
| parents | 9900973f3e85 |
| children | e07cda5a5d73 |
| files | ggrtf-merchant.tf |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ggrtf-merchant.tf Fri Jun 01 01:58:51 2007 +0000 +++ b/ggrtf-merchant.tf Fri Jun 01 23:34:34 2007 +0000 @@ -133,11 +133,21 @@ ;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 =\ - /set lj_target=%{P1}%;/let _tmps=%{P1}%;\ - /if (regmatch("^pine|holly$",_tmps)) /set lj_target=%{_tmps} tree%;/let _tmps=tree%;/endif%;\ +/def -i glumberjack_grep =\ + /if (regmatch("^pine|holly$",{1}))\ + /set lj_target=%{1} tree%;\ + /let _tmps=tree%;\ + /else \ + /set lj_target=%{1}%;\ + /let _tmps=%{1}%;\ + /endif%;\ @@grep 'It can be cut down for ' look at %{_tmps} on ground + +/def -i -F -p3 -mregexp -t"^.+ .* ([a-z][a-z]+) tree" glumberjack_at1 =\ + /test glumberjack_grep({P1}) + + /def -i -p9999 -ag -msimple -t"No matches for 'It can be cut down for '." glumberjack_gag /def -i -p9999 -ag -mregexp -t"^It can be cut down for ([0-9]) logs? of ([a-z]+)\.$" glumberjack_amount =\