# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1297721550 -7200
# Node ID c960f8d8ac710326e227ae5b6f4a6ff549474af4
# Parent  a442f4b19047c802124718c6b0a0cf53908902d2
Cope with the new format of flowerbat battle round flags.

diff -r a442f4b19047 -r c960f8d8ac71 ggrtf.tf
--- 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}%;\