From 306f1d5e32bf681876b22f8b01e5c0c860e194dd Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sun, 1 Sep 2019 16:56:15 +0800
Subject: [PATCH] update msg

---
 def.go   | 16 +++++++++-------
 rules.go |  2 ++
 sql.go   |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/def.go b/def.go
index 28e8aa2..c36e752 100644
--- a/def.go
+++ b/def.go
@@ -437,13 +437,15 @@ const (
 	objSubTypeMessageStockAnyAck     = 370 // list of stock (done)
 	objSubTypeMessageGDepositReq     = 371 // /g_deposit xx y (done)
 	objSubTypeMessageGDepositAck     = 372 // Deposited successfully: xx (y) (done)
-	objSubTypeMessageAttackReq       = 373
-	objSubTypeMessageAttackAck       = 374
-	objSubTypeMessageAttackTargetReq = 375
-	objSubTypeMessageAttackTargetAck = 376
-	objSubTypeMessageDefendReq       = 377
-	objSubTypeMessageDefendAck       = 378
-	objSubTypeMessageBack            = 379
+	objSubTypeMessageAttackReq       = 373 // Attack (done)
+	objSubTypeMessageAttackAck       = 374 // Read for attack, select target (done)
+	objSubTypeMessageAttackTargetReq = 375 // Castle selection (done)
+	objSubTypeMessageAttackTargetAck = 376 // Castle confirmation (done)
+	objSubTypeMessageDefendReq       = 377 // Defend (done)
+	objSubTypeMessageDefendAck       = 378 // Defend confirmation (done)
+	objSubTypeMessageBack            = 379 // Back (done)
+	objSubTypeMessageCastleReq       = 380 // Castle (done)
+	objSubTypeMessageCastleAck       = 381 // Castle msg (not done)
 	objSubTypeJobPillage             = 601
 	objSubTypeJobTribute             = 602
 	objSubTypeJobStatus              = 603
diff --git a/rules.go b/rules.go
index cbc0cef..16752c1 100644
--- a/rules.go
+++ b/rules.go
@@ -214,6 +214,8 @@ func resetMsgParsingRules() {
 		`💬 Pass the waiting for the battle outcome chatting with players from other castles at @chatwarscommunity 💬$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageBack) + `, "Back", "^⬅Back$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageGoFastFight) + `, "Fast Fight", "^▶️Fast fight$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageCastleReq) + `, "Castle Req", "^🏰Castle$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageCastleAck) + `, "Castle Ack", "^$")
 		;`)
 	failOnError(err, "resetMsgParsingRules : populate table msg_rules")
 }
diff --git a/sql.go b/sql.go
index cf5f67c..2a4f0b3 100644
--- a/sql.go
+++ b/sql.go
@@ -533,6 +533,8 @@ func initDB() {
 						        ,(` + strconv.Itoa(objSubTypeMessageDefendReq) + `, "castle_def_req", "Castle Defense Req", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageDefendAck) + `, "castle_def_ack", "Castle Defense Ack", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageBack) + `, "back", "Back", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageCastleReq) + `, "castle_req", "Castle Req", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageCastleAck) + `, "castle_ack", "Castle Ack", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobPillage) + `, "job_pillage", "Pillage job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobTribute) + `, "job_tribute", "Tribute job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobWithdrawal) + `, "job_withdraw", "Withdrawal job", ` + strconv.Itoa(objTypeJob) + `)