Mercurial > hg > batmud > ggrtf

changeset 1328:c960f8d8ac71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cope with the new format of flowerbat battle round flags.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 15 Feb 2011 00:12:30 +0200
parents a442f4b19047
children c8b919bacaea
files ggrtf.tf
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Sun Feb 13 17:33:47 2011 +0200
+++ b/ggrtf.tf	Tue Feb 15 00:12:30 2011 +0200
@@ -1936,8 +1936,7 @@
 	/endif
 
 ;; New round
-/def -i -F -msimple -t"*****************************************************" gbattle_round =\
-	/set battle_round=$[battle_round+1]%;\
+/def -i gbattle_round =\
 	/set battle_round_t=$[time()]%;\
 	/if (!battle_st) /gbattle_init%;/endif%;\
 	/if (set_round!~"") %{set_round}%;/endif%;\
@@ -1945,6 +1944,15 @@
 	/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 =\
 	/msk @{BCyellow}Targetting@{n} -> @{BCred}%{P1}@{n}%;\