diff --git a/def.go b/def.go index c5a8200..ef92289 100644 --- a/def.go +++ b/def.go @@ -40,7 +40,7 @@ type ChatWarsMessage struct { Text string `json:"text"` } -type ChatWarsMessageReport struct { +type ChatWarsMessageReportAck struct { ObjID64 int64 `json:"obj_id"` } @@ -163,7 +163,7 @@ const ( objSubTypeMessageMiniWar = 303 // from Chat Wars Mini Reports (done) objSubTypeMessageGuildWar = 304 // from Chat Wars Reports (not done) objSubTypeMessageReportReq = 305 // /report (done) - objSubTypeMessageReportAck = 306 // result from /report (not done) + objSubTypeMessageReportAck = 306 // result from /report (done) objSubTypeMessageGReportReq = 307 // /g_report (done) objSubTypeMessageGReportAck = 308 // result from /g_report (not done) objSubTypeMessageQuestResult = 309 // result from going to quest (not done) diff --git a/msg.go b/msg.go index bdd90da..d7388cb 100644 --- a/msg.go +++ b/msg.go @@ -8,8 +8,8 @@ import ( "time" ) -func parseSubTypeMessageReport(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageReport, error) { - cwm := ChatWarsMessageReport{} +func parseSubTypeMessageReportAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageReportAck, error) { + cwm := ChatWarsMessageReportAck{} log.Printf("parseSubTypeMessageReport : War report identified\n") log.Printf("parseSubTypeMessageReport : Castle : %s\n", r.ReplaceAllString(m.Text, "${Castle}")) log.Printf("parseSubTypeMessageReport : Guild : %s\n", r.ReplaceAllString(m.Text, "${Guild}")) diff --git a/rules.go b/rules.go index 2dd25c8..beb8fa0 100644 --- a/rules.go +++ b/rules.go @@ -9,7 +9,7 @@ func resetMsgParsingRules() { failOnError(err, "resetMsgParsingRules : truncate table msg_rules") _, err = db.Exec(`INSERT INTO msg_rules (prio, msg_type_id, descn, rule) - VALUES (5000, ` + strconv.Itoa(objSubTypeMessageReport) + `, "Player war report", "^(?P[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+)(?P\\((-|\\+)[0-9]+\\)){0,1} 🛡:(?P[0-9]+) Lvl: (?P[0-9]+)\\nYour result on the battlefield:\\n(🔥Exp: (?P[0-9]+)\\n){0,1}(💰Gold: (?P\\-{0,1}[0-9]+)\\n){0,1}(📦Stock: (?P\\-{0,1}[0-9]+)){0,1}(\\n(?P(🔋Stamina restored))){0,1}(\\n(?P(⚡Critical strike))){0,1}$") + VALUES (5000, ` + strconv.Itoa(objSubTypeMessageReportAck) + `, "Player war report", "^(?P[🐉🦅🐺🦈🦌🥔🌑])(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+)(?P\\((-|\\+)[0-9]+\\)){0,1} 🛡:(?P[0-9]+) Lvl: (?P[0-9]+)\\nYour result on the battlefield:\\n(🔥Exp: (?P[0-9]+)\\n){0,1}(💰Gold: (?P\\-{0,1}[0-9]+)\\n){0,1}(📦Stock: (?P\\-{0,1}[0-9]+)){0,1}(\\n(?P(🔋Stamina restored))){0,1}(\\n(?P(⚡Critical strike))){0,1}$") ,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P[0-9]+) : (?P.*)\\n(Quality: (?P.*)\\n){0,1}(Condition: (?P.*)\\n){0,1}Seller: (?P.*)\\nCurrent price: (?P[0-9]+) pouch\\(es\\)\\nBuyer: (?P.*)\\nEnd At: (?P.*)\\nStatus: (?P.*)(\\n)*(?s:.*)") ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P