From bb8ba764040dc79d200b3c4e520eb1c2f98e3263 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sun, 9 Feb 2020 15:30:40 +0800
Subject: [PATCH] test war report

---
 data/msg_rules.json | 2 +-
 msg.go              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/msg_rules.json b/data/msg_rules.json
index 1f5fabc..7bda5cc 100644
--- a/data/msg_rules.json
+++ b/data/msg_rules.json
@@ -2,7 +2,7 @@
   {
     "prio": 5000,
     "descn": "Player war report",
-    "rule": "^(?P<Castle>[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<User>([A-Za-z0-9 ]*)) ⚔:(?P<Attack>[0-9]+)(?P<AttackMod>\\((-|\\+)[0-9]+\\)){0,1} 🛡:(?P<Defense>[0-9]+) Lvl: (?P<Level>[0-9]+)\\nYour result on the battlefield:\\n(🔥Exp: (?P<Exp>[0-9]+)){0,1}(\\n)*(💰Gold: (?P<Gold>\\-{0,1}[0-9]+)){0,1}(\\n)*(📦Stock: (?P<Stock>\\-{0,1}[0-9]+)){0,1}(\\n)*(❤️Hp: (?P<HP>\\-[0-9]+)){0,1}(\\n)*((?P<Stamina>(🔋Stamina restored))){0,1}(\\n(?P<Crit>(⚡Critical strike))){0,1}$",
+    "rule": "^(?P<Castle>[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<User>([A-Za-z0-9 ]*)) ⚔:(?P<Attack>[0-9]+)(?P<AttackMod>\\((-|\\+)[0-9]+\\)){0,1} 🛡:(?P<Defense>[0-9]+) Lvl: (?P<Level>[0-9]+)\\nYour result on the battlefield:\\n(🔥Exp: (?P<Exp>[0-9]+)){0,1}(\\n)*(💰Gold: (?P<Gold>\\-{0,1}[0-9]+)){0,1}(\\n)*(📦Stock: (?P<Stock>\\-{0,1}[0-9]+)){0,1}(\\n)*(❤️Hp: (?P<HP>\\-[0-9]+)){0,1}(\\n)(?P<Extra>(?s:.*))$",
     "msg_type": "msg_report_ack",
     "chat_id": 0,
     "user_id": 0
diff --git a/msg.go b/msg.go
index 64c0741..b74828c 100644
--- a/msg.go
+++ b/msg.go
@@ -175,6 +175,7 @@ func parseSubTypeMessageStockAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar
 
 func parseSubTypeMessageReportAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageReportAck, error) {
 	cwm := ChatWarsMessageReportAck{}
+	log.Printf("parseSubTypeMessageReport : Extra : %s\n", r.ReplaceAllString(m.Text, "${Extra}"))
 	/*
 		log.Printf("parseSubTypeMessageReport : War report identified\n")
 		log.Printf("parseSubTypeMessageReport : Castle : %s\n", r.ReplaceAllString(m.Text, "${Castle}"))