changeset 665:fbe727e4dd9b

Fixed an old problem in sc/prompt handling triggers, noticed by Renilauv.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 19 Sep 2007 15:15:15 +0000
parents 74b1f07a72c8
children 8722a7a1b306
files ggrtf.tf
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Sun Sep 09 14:11:18 2007 +0000
+++ b/ggrtf.tf	Wed Sep 19 15:15:15 2007 +0000
@@ -884,20 +884,20 @@
 
 
 ;; Grab SHORT SCORE (sc)
-/def -i -F -ag -p9999 -mregexp -t"^H:([+-]*[0-9]+)/([0-9]+) S:([+-]*[0-9]+)/([0-9]+) E:([+-]*[0-9]+)/([0-9]+) \$:([0-9]+) exp:([0-9]+)$" gstatus_sc1=\
+/def -i -F -ag -p9999 -mregexp -t"^H:(-?[0-9]+)/(-?[0-9]+) S:(-?[0-9]+)/(-?[0-9]+) E:(-?[0-9]+)/(-?[0-9]+) \$:(-?[0-9]+) exp:(-?[0-9]+)$" gstatus_sc1=\
 	/if (opt_gagsc!~"on")\
 	/msw H:$[prgetqd({P1},{P2},status_qhp)] S:$[prgetqd({P3},{P4},status_qsp)] E:$[prgetqd({P5},{P6},status_qep)] \$:%{P7} $[prgetdiff({P7},status_qmoney)] exp:%{P8} $[prgetdiff({P8},status_qexp)]%;\
 	/endif%;\
 	/test gstatus_scupd({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8})
 
-/def -i -F -p9999 -mregexp -t"^H:([+-]*[0-9]+)/([0-9]+) \[[+-]*[0-9]*\] S:([+-]*[0-9]+)/([0-9]+) \[[+-]*[0-9]*\] E:([+-]*[0-9]+)/([0-9]+) \[[+-]*[0-9]*\] \$:([0-9]+) \[[+-]*[0-9]*\] exp:([0-9]+) \[[+-]*[0-9]*\]$" gstatus_sc2=\
+/def -i -F -p9999 -mregexp -t"^H:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] S:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] E:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] \$:(-?[0-9]+) \[[+-]?[0-9]*\] exp:(-?[0-9]+) \[[+-]?[0-9]*\]$" gstatus_sc2=\
 	/test gstatus_scupd({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8})%;\
 	/if (opt_gagsc=~"on")/substitute -ag%;/endif
 
 
 ;; Grab PROMPT
 ;"H:336/336 S:1049/1049 E:243/243 >"
-/def -i -mregexp -h"PROMPT H:([+-]*[0-9]+)/([0-9]+) S:([+-]*[0-9]+)/([0-9]+) E:([+-]*[0-9]+)/([0-9]+) >$" gstatus_prompt=\
+/def -i -mregexp -h"PROMPT H:(-?[0-9]+)/(-?[0-9]+) S:(-?[0-9]+)/(-?[0-9]+) E:(-?[0-9]+)/(-?[0-9]+) >$" gstatus_prompt=\
 	/set status_hp=%{P1}%;/set status_hpmax=%{P2}%;\
 	/set status_sp=%{P3}%;/set status_spmax=%{P4}%;\
 	/set status_ep=%{P5}%;/set status_epmax=%{P6}%;\