From 8f36668dfb537217d7ec71e196302452c5f20318 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Thu, 6 Feb 2020 10:44:10 +0800
Subject: [PATCH] update main shop ack parse

---
 def.go | 11 ++++++++---
 msg.go |  5 +++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/def.go b/def.go
index 181652b..3070263 100644
--- a/def.go
+++ b/def.go
@@ -368,9 +368,14 @@ type ChatWarsMessageTributesStatsAck struct {
 }
 
 type ChatWarsMessageShopMainAck struct {
-	Msg    *ChatWarsMessage `json:"msg"`
-	Name   string           `json:"name"`
-	Number string           `json:"number"`
+	Msg       *ChatWarsMessage `json:"msg"`
+	Name      string           `json:"name"`
+	Number    string           `json:"number"`
+	User      string           `json:"userr"`
+	Mana      string           `json:"mana"`
+	ManaTotal string           `json:"mana_total"`
+	Class     string           `json:"class"`
+	Castle    string           `json:"castle"`
 }
 
 type MessageParsingRule struct {
diff --git a/msg.go b/msg.go
index 0b2dbf9..01dff62 100644
--- a/msg.go
+++ b/msg.go
@@ -304,6 +304,11 @@ func parseSubTypeMessageShopMainAck(m *ChatWarsMessage, r *regexp.Regexp) (*Chat
 
 	cwm.Name = r.ReplaceAllString(m.Text, "${Name}")
 	cwm.Number = r.ReplaceAllString(m.Text, "${Number}")
+	cwm.User = r.ReplaceAllString(m.Text, "${User}")
+	cwm.Mana = r.ReplaceAllString(m.Text, "${Mana}")
+	cwm.ManaTotal = r.ReplaceAllString(m.Text, "${ManaTotal}")
+	cwm.Class = r.ReplaceAllString(m.Text, "${Class}")
+	cwm.Castle = r.ReplaceAllString(m.Text, "${Castle}")
 
 	log.Printf("parseSubTypeMessageShopMainAck : Name : %s\n", cwm.Name)
 	log.Printf("parseSubTypeMessageShopMainAck : Number : %s\n", cwm.Number)