Mercurial > hg > batmud > ggrtf

changeset 1332:49b4fd8d5e51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix round flag trigger, again.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 15 Feb 2011 19:40:17 +0200
parents 3c454e206b06
children be6a67bd5033
files ggrtf.tf
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Tue Feb 15 08:09:02 2011 +0200
+++ b/ggrtf.tf	Tue Feb 15 19:40:17 2011 +0200
@@ -1936,7 +1936,8 @@
 	/endif
 
 ;; New round
-/def -i gbattle_round =\
+/def -i -F -mregexp -t"^\*{15}" gbattle_round =\
+	/set battle_round=$[battle_round+1]%;\
 	/set battle_round_t=$[time()]%;\
 	/if (!battle_st) /gbattle_init%;/endif%;\
 	/if (set_round!~"") %{set_round}%;/endif%;\
@@ -1944,14 +1945,6 @@
 	/prexecfuncs %{event_battle_round}%;\
 	/gstatus_update
 
-/def -i -F -mregexp -t"^\*\*\*\*\*\*\*\*\*+ Round (\d+) \*\*\*\*\*\*\*\*\*+$" gbattle_round1 =\
-	/set battle_round=%{P1}%;\
-	/gbattle_round
-
-/def -i -F -mregexp -t"^\*\*\*\*\*\*\*\*\*+$" gbattle_round2 =\
-	/set battle_round=$[battle_round+1]%;\
-	/gbattle_round
-
 
 ;; Grab target via several methods
 /def -i -F -p9999 -mregexp -t"^You are now targetting ([A-Za-z ,.'-]+)\.$" gbattle_target3 =\