diff --git a/msg.go b/msg.go index 6c775e5..46b1e7f 100644 --- a/msg.go +++ b/msg.go @@ -176,9 +176,17 @@ 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}")) - re := regexp.MustCompile(`(.+)`) + re := regexp.MustCompile(`((?PYour battle cries were successful)|(You were outplayed by (?P.*))|(?PđŸ”‹Stamina restored)|.+)`) for i, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Extra}"), -1) { - log.Printf("parseSubTypeMessageReport : Extra[%d] : %s\n", i, l[0]) + if re.ReplaceAllString(l[0], "${Cry}") != nil { + log.Printf("parseSubTypeMessageReport : Extra[%d] : Cry\n", i) + } else if re.ReplaceAllString(l[0], "${Outplayer}") != nil { + log.Printf("parseSubTypeMessageReport : Extra[%d] : Outplayer\n", i) + } else if re.ReplaceAllString(l[0], "${Stamina}") != nil { + log.Printf("parseSubTypeMessageReport : Extra[%d] : Stamina\n", i) + } else { + log.Printf("parseSubTypeMessageReport : Extra[%d] : %s\n", i, l[0]) + } } /*