From 82ecd69df4aec1ae3a78c8d639074aa71c4b0b4c Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Tue, 28 May 2019 12:35:03 +0800
Subject: [PATCH] test

---
 msg.go   | 1 +
 rules.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/msg.go b/msg.go
index c9a03cf..ded143e 100644
--- a/msg.go
+++ b/msg.go
@@ -31,6 +31,7 @@ func parseSubTypeMessageMeAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMe
 	cwm := ChatWarsMessageMeAck{}
 	log.Printf("parseSubTypeMessageReport : Me report identified\n")
 	log.Printf("parseSubTypeMessageReport : Player : %s\n", r.ReplaceAllString(m.Text, "${Player}"))
+	log.Printf("parseSubTypeMessageReport : Guild : %s\n", r.ReplaceAllString(m.Text, "${Guild}"))
 	log.Printf("parseSubTypeMessageReport : Class : %s\n", r.ReplaceAllString(m.Text, "${Class}"))
 	log.Printf("parseSubTypeMessageReport : Castle : %s\n", r.ReplaceAllString(m.Text, "${Castle}"))
 	log.Printf("parseSubTypeMessageReport : Level : %s\n", r.ReplaceAllString(m.Text, "${Level}"))
diff --git a/rules.go b/rules.go
index 69e385d..dd6bc3e 100644
--- a/rules.go
+++ b/rules.go
@@ -120,7 +120,7 @@ func resetMsgParsingRules() {
 								,(4900, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war rep only fair", "^(🏠Trade union news:\n){0}(?P<Union>(?s:.*))(🎪State of exclusive rights:\n)(?P<Fair>(?s:.*))$")
 								,(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` +
-		`(?P<CastleIcon>.)(?P<Player>.*?) ((?P<Class>(Knight|Ranger|Sentinel|Collector|Blacksmith|Alchemist)) ){0,1}of (?P<Castle>[a-zA-Z]*) Castle\\n` +
+		`(?P<CastleIcon>.)(\\[(?P<Guild>[A-Z0-9]+)\\]){0,1}(?P<Player>.*?) ((?P<Class>(Knight|Ranger|Sentinel|Collector|Blacksmith|Alchemist)) ){0,1}of (?P<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` +