Mercurial > hg > batmud > ggrtf
changeset 1654:a599a9429928
Implement 'grepcmd' setting (/grepcmd, /opts), which can be used to
configure what BatMUD command is sent when GgrTF greps for things. The
default is 'grep', of course.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 28 Sep 2021 02:11:30 +0300 |
| parents | a704cb020566 |
| children | 356c3c26aee6 |
| files | ggrtf.tf gm-barb.tf gm-merchant.tf |
| diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ggrtf.tf Fri Mar 12 14:47:58 2021 +0200 +++ b/ggrtf.tf Tue Sep 28 02:11:30 2021 +0300 @@ -93,6 +93,7 @@ /set set_ripcommand=@whee%;\ /set set_peer=embedded%;\ /set set_gprompt=%%{status_prompt}>%;\ + /set set_grepcmd=grep%;\ /set set_roundmin=2%;\ /set set_sysinit=1%;\ /msq System variables initialized. @@ -910,6 +911,12 @@ /prdeftoggle -n"rcda" -d"Combat Damage Analysis reporting" /set opt_rcda=on +;@command /grepcmd [grep command] +;@desc Set what BatMUD command GgrTF uses for all 'grep' actions. +;@desc Default value is 'grep'. The value is automatically prefixed with '@@'. +/prdefvalue -n"grepcmd" -d"BatMUD 'grep' command ('@@' prefix is added)" + + /def -i pss = @@party status short @@ -1010,8 +1017,8 @@ /if ({1}=~"n" | {1}=~"s") /let pd1=west%;/let pd2=east%;\ /elseif ({1}=~"w" | {1}=~"e") /let pd1=north%;/let pd2=south%;\ /else /break%;/endif%;\ - @@grep '(%{set_peer})' peer %{pd1}%;\ - @@grep '(%{set_peer})' peer %{pd2} + @@%{set_grepcmd} '(%{set_peer})' peer %{pd1}%;\ + @@%{set_grepcmd} '(%{set_peer})' peer %{pd2} ;; Main handling macro for binding movemement keys, etc. ;@command /move <type>
--- a/gm-barb.tf Fri Mar 12 14:47:58 2021 +0200 +++ b/gm-barb.tf Tue Sep 28 02:11:30 2021 +0300 @@ -75,7 +75,7 @@ /def -i showrep =\ /set barbrep_gag=1%;\ - @@grep '[[]' barbarian binfo %{set_plrname}%;\ + @@%{set_grepcmd} '[[]' barbarian binfo %{set_plrname}%;\ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/gm-merchant.tf Fri Mar 12 14:47:58 2021 +0200 +++ b/gm-merchant.tf Tue Sep 28 02:11:30 2021 +0300 @@ -241,7 +241,7 @@ /set lj_target=%{1}%;\ /let _tmps=%{1}%;\ /endif%;\ - @@grep 'It can be cut down for ' look at %{_tmps} on ground + @@%{set_grepcmd} 'It can be cut down for ' look at %{_tmps} on ground /def -i -F -p9999 -mregexp -t"^.+ .* ([a-z][a-z]+) tree" glumberjack_at1 =\ @@ -429,7 +429,7 @@ /set mine_match=0%;\ /set mine_grep=0%;\ /set mine_target=%{P2}%;\ - @@grep 'contains roughly' look at %{P1} on ground%;\ + @@%{set_grepcmd} 'contains roughly' look at %{P1} on ground%;\ /endif /def -i -F -p999 -mregexp -t"An? (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)" gmine_at2 =\ @@ -443,7 +443,7 @@ /if (mine_grep)\ /set mine_grep=0%;\ /set mine_target=%{P1}%;\ - @@grep 'contains roughly' look at %{mine_type} on ground%;\ + @@%{set_grepcmd} 'contains roughly' look at %{mine_type} on ground%;\ /endif @@ -474,7 +474,7 @@ /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 + @@%{set_grepcmd} 'contains roughly' look at %{P1} on ground /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}) @@ -733,7 +733,7 @@ /set gwbt_match=%{-1}%;\ /gwbt_clear %{gwbt_minerals}%;\ /set gwbt_minerals=%;\ - /test send(strcat("@@grep '",gwbt_match,"|^It looks ' look at ",{1})) + /test send(strcat("@@",set_grepcmd," '",gwbt_match,"|^It looks ' look at ",{1})) /prdefgbind -s"wbl" -c"/wbgrep" @@ -745,7 +745,7 @@ /def -i mrchk_check_types =\ /while ({#})\ - /test send("@@grep 'leader\.\$' kneel %{1}")%;\ + /test send("@@%{set_grepcmd} 'leader\.\$' kneel %{1}")%;\ /shift%;\ /done