From 5c20f649660c5d7d96b745408b8257ac926e5496 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Mon, 16 Dec 2019 11:17:00 +0800
Subject: [PATCH] update msg rules

---
 def.go   | 1 +
 rules.go | 5 +++--
 sql.go   | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/def.go b/def.go
index 75a2a59..c2ec224 100644
--- a/def.go
+++ b/def.go
@@ -528,6 +528,7 @@ const (
 	objSubTypeMessageArenaFightAck     = 399 // thirsty for blood ... (done)
 	objSubTypeMessageGoArenaAck        = 400 // Welcome to Arena! (done)
 	objSubTypeMessageWithdrawNAck      = 401 // not enought items (done)
+	objSubTypeMessagePillageDefeat     = 402 // You tried stopping (done)
 	objSubTypeJobPillage               = 601
 	objSubTypeJobTribute               = 602
 	objSubTypeJobStatus                = 603
diff --git a/rules.go b/rules.go
index 15af65c..cc511f9 100644
--- a/rules.go
+++ b/rules.go
@@ -30,8 +30,9 @@ func resetMsgParsingRules() {
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageGo) + `, "Go", "^/go$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageGo) + `,"Pillage Go", "^You lift up your sword and charge at the violator.$") 
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageWin) + `,"Pillage Win", "^You successfully defeated (\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<Attacker>.*). As he was crawling away, you picked up some of the gold he left behind. Received (?P<Gold>[0-9]+) gold and (?P<Exp>[0-9]+) exp.$")
-						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageTimeout) + `,"Pillage Timeout", "^You\\'ve failed to protect the villagers. No more rewards for you.$")
-						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageLoss) + `,"Pillage Loss", "^You let (\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<Attacker>.*) go and he pillaged the village. We hope you feel terrible.$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageTimeout) + `,"Pillage Timeout", "^You\\'ve failed to protect the villagers\\. No more rewards for you\\.$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageLoss) + `,"Pillage Loss", "^You let (\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<Attacker>.*) go and he pillaged the village\\. We hope you feel terrible\\.$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageDefeat) + `,"Pillage Defeat", "^You tried stopping (\\[(?P<Guild>[A-Z0-9]{1,3})\\]){0,1}(?P<Attacker>.*)\\. Sadly, he was too strong\\. Your body hurts, but for some reason you feel enlightened\\. Received: (?P<Exp>[0-9]+) exp\\.$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageDuelFight) + `, "Duel Fight result #2", "(?P<Life1>(\\-){0,1}[0-9]+).*(?P<Castle1>[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P<Guild1>[A-Z0-9]{1,3})\\]){0,1}(?P<Duelist1>.*)\\n` +
 		`VS\\n` +
 		`(?P<Life2>(\\-){0,1}[0-9]+).*(?P<Castle2>[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P<Guild2>[A-Z0-9]{1,3})\\]){0,1}(?P<Duelist2>.*)\\n` +
diff --git a/sql.go b/sql.go
index 98eb107..7755629 100644
--- a/sql.go
+++ b/sql.go
@@ -555,6 +555,7 @@ func initDB() {
 						        ,(` + strconv.Itoa(objSubTypeMessageArenaFightAck) + `, "arena_fight_ack", "Arena Fight Ack", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageGoArenaAck) + `, "go_arena_ack", "Go Arena Ack", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageWithdrawNAck) + `, "withdraw_nack", "Withdraw NAck", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessagePillageDefeat) + `, "pillage_defeat", "Pillage Defeat", ` + 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(objSubTypeJobGWithdraw) + `, "job_gwithdraw", "GWithdrawal job", ` + strconv.Itoa(objTypeJob) + `)