From 0c7f70add7fb2847f99fdc280ecf9cef2f6cf525 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Tue, 28 May 2019 11:53:38 +0800
Subject: [PATCH] test

---
 rules.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/rules.go b/rules.go
index 5edec3c..dfd9a3a 100644
--- a/rules.go
+++ b/rules.go
@@ -121,13 +121,14 @@ func resetMsgParsingRules() {
 								,(5000, ` + strconv.Itoa(objSubTypeMessageTimeout) + `, "Generic timeout", "^Too late. Action is not available.$")
 								,(5000, ` + strconv.Itoa(objSubTypeMessageMeAck) + `, "Me ack", "^(?s:.*)Battle of the seven castles in .* minutes!\\n` +
 		`(?s:.*)\\n` +
-		`Level:(?P<Level>[0-9]+)\\n` +
-		`Atk:(?P<Atk>[0-9]+) Def:(?P<Def>[0-9]+)\\n` +
-		`Exp:(?P<ExpNow>[0-9]+)/(?P<ExpLvl>[0-9]+)\\n` +
-		`Stamina:(?P<StaminaNow>[0-9]+)/(?P<StaminaMax>[0-9]+)\\n` +
-		`(Gold(?P<Gold>[0-9]+)){0,1}(Pogs(?P<Pogs>[0-9]+)){0,1}(Gems(?P<Gems>[0-9]+)){0,1}\\n\\n` +
-		`Equipment +(?P<AtkGear>[0-9]+) +(?P<DefGear>[0-9]+)` +
-		`Bag:  (?P<BagUsed>[0-9]+)/(?P<BagDispo>[0-9]+) /inv\\n\\n` +
+		`(?P<CastleIcon>.)(?P<Player>.*) of (?<Castle>[a-zA-Z]*) Castle\\n` +
+		`.Level: (?P<Level>[0-9]+)\\n` +
+		`.Atk: (?P<Atk>[0-9]+) .Def: (?P<Def>[0-9]+)\\n` +
+		`.Exp: (?P<ExpNow>[0-9]+)/(?P<ExpLvl>[0-9]+)\\n` +
+		`.Stamina: (?P<StaminaNow>[0-9]+)/(?P<StaminaMax>[0-9]+).*\\n` +
+		`(💰(?P<Gold>(-){0,1}[0-9]+)){0,1}( 👝(?P<Pogs>[0-9]+)){0,1}( 💎(?P<Gems>[0-9]+)){0,1}\\n\\n` +
+		`🎽Equipment +(?P<AtkGear>[0-9]+). +(?P<DefGear>[0-9]+).\\n` +
+		`🎒Bag: (?P<BagUsed>[0-9]+)/(?P<BagDispo>[0-9]+) /inv\\n\\n` +
 		`State:\\n(?P<State>.*)\\n\\n` +
 		`More:/hero(?s:.*)$")
 		;`)