Mercurial > hg > batmud > ggrtf

changeset 1342:692872487dd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"Fix" battle rounds flag triggering, again. Hopefully it won't get changed anymore.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 25 Feb 2011 16:26:04 +0200
parents b7c15bf36a5e
children aa5e08538992
files ggrtf.tf
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Wed Feb 23 12:29:52 2011 +0200
+++ b/ggrtf.tf	Fri Feb 25 16:26:04 2011 +0200
@@ -1936,7 +1936,7 @@
 	/endif
 
 ;; New round
-/def -i -F -mregexp -t"^\*{10}" gbattle_round =\
+/def -i gbattle_round =\
 	/set battle_round=$[battle_round+1]%;\
 	/set battle_round_t=$[time()]%;\
 	/if (!battle_st) /gbattle_init%;/endif%;\
@@ -1945,6 +1945,12 @@
 	/prexecfuncs %{event_battle_round}%;\
 	/gstatus_update
 
+/def -i -F -mregexp -t"^\*{10,25} (Round \d+|Round \d+ \(\d+\)) \*{10,25}$" gbattle_round1 =\
+	/gbattle_round
+
+/def -i -F -msimple -t"*****************************************************" gbattle_round2 =\
+	/gbattle_round
+
 
 ;; Grab target via several methods
 /def -i -F -p9999 -mregexp -t"^You are now targetting ([A-Za-z ,.'-]+)\.$" gbattle_target3 =\