changeset 935:59e4cb71bfac

Improve output and loosen command parsing a bit.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 21 Mar 2009 04:27:47 +0000
parents 38f6c1c124b8
children 7d600be7a513
files gm-rpouch.tf
diffstat 1 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gm-rpouch.tf	Sat Mar 21 02:56:48 2009 +0000
+++ b/gm-rpouch.tf	Sat Mar 21 04:27:47 2009 +0000
@@ -241,7 +241,7 @@
 		/set rpouch_name=from%;\
 		/set rpouch_target=%{rpouch_from}%;\
 		@@look at %{rpouch_from}%;\
-	/elseif (regmatch("^(rset|set) +([A-Za-z][A-Za-z ]+) to ([0-9]+)$", _args))\
+	/elseif (regmatch("^(rset|set) +([A-Za-z][A-Za-z ]+) to ([0-9]+)", _args))\
 		/if ({P1}=~"set")\
 			/let _tmps=$[replace(" ","_",tolower({P2}))]%;\
 			/eval /set _rpas=$$[rpouch_reg_%{_tmps}]%;\
@@ -254,19 +254,21 @@
 		/else \
 			/gerror This setting does not work yet!%;\
 		/endif%;\
-	/elseif (regmatch("^adjust +([0-9]+)$", _args))\
+	/elseif (regmatch("^adjust +([0-9]+)", _args))\
 		/grpouch_adjust %{P1} %{rpouch_regs}%;\
-	/elseif (regmatch("^all +([0-9]+)$", _args))\
+	/elseif (regmatch("^all +([0-9]+)", _args))\
 		/grpouch_set_all %{P1} %{rpouch_regs}%;\
 	/elseif (_args=~"list")\
 		/grpouch_list %{rpouch_regs}%;\
 	/else \
-		/msq @{BCgreen}GgrTF@{n} - @{Cyellow}Reagent Pouch Manager@{n}%;\
-		/msq -----------------------------%;\
-		/msq /rpouch @{BCwhite}(fill|check)@{n} @{Cgreen}<to pouch>@{n} @{BCwhite}from@{n} @{Cred}<from pouch>@{n} [@{BCwhite}in@{n} @{Cyellow}<container>@{n}]%;\
-		/msq /rpouch @{BCwhite}set@{n} @{Cgreen}<spell>@{n} @{BCwhite}to@{n} <amount>%;\
-		/msq /rpouch @{BCwhite}rset@{n} @{Cgreen}<reagent>@{n} @{BCwhite}to@{n} <amount>%;\
-		/msq /rpouch @{BCwhite}adjust@{n} @{Cgreen}<amount>@{n}%;\
-		/msq /rpouch @{BCwhite}all@{n} @{Cgreen}<amount>@{n}%;\
-		/msq /rpouch @{BCwhite}list@{n}%;\
+		/msw ,-------------------------------.%;\
+		/msw | @{BCgreen}GgrTF@{n} - @{Cyellow}Reagent Pouch Manager@{n} |%;\
+		/msw +-------------------------------+-----------------------------------------.%;\
+		/msw | /rpouch @{BCwhite}(fill|check)@{n} @{Cgreen}<to pouch>@{n} @{BCwhite}from@{n} @{Cred}<from pouch>@{n} [@{BCwhite}in@{n} @{Cyellow}<container>@{n}]      |%;\
+		/msw | /rpouch @{BCwhite}set@{n} @{Cgreen}<spell>@{n} @{BCwhite}to@{n} <amount>                                         |%;\
+		/msw | /rpouch @{BCwhite}rset@{n} @{Cgreen}<reagent>@{n} @{BCwhite}to@{n} <amount>                                      |%;\
+		/msw | /rpouch @{BCwhite}adjust@{n} @{Cgreen}<amount>@{n}                                                 |%;\
+		/msw | /rpouch @{BCwhite}all@{n} @{Cgreen}<amount>@{n}                                                    |%;\
+		/msw | /rpouch @{BCwhite}list@{n}                                                            |%;\
+		/msw `-------------------------------------------------------------------------'%;\
 	/endif