diff --git a/def.go b/def.go index 3391782..fb65992 100644 --- a/def.go +++ b/def.go @@ -237,20 +237,6 @@ type ChatWarsMessagePillageInc struct { Castle string `json:"castle"` } -type ChatWarsMessageMiniWar struct { - ObjID64 int64 `json:"obj_id"` - Report map[string]*ChatWarsMessageMiniWarCastle `json:"castle"` - Time time.Time `json:"time"` -} - -type ChatWarsMessageMiniWarCastle struct { - Gardian string `json:"gardian"` - Result string `json:"result"` - Gold int64 `json:"gold"` - Stock int64 `json:"stock"` - Points int64 `json:"points"` -} - type ChatWarsMessageUnionWar struct { } @@ -395,7 +381,7 @@ const ( objSubTypeGuild = 201 objSubTypeMessageUnknown = 301 objSubTypeMessageWar = 302 // from Chat Wars Reports (not done) - objSubTypeMessageMiniWar = 303 // from Chat Wars Mini Reports (done) + objSubTypeMessageMiniWar = 303 // FIXME DELETE objSubTypeMessageGuildWar = 304 // from Chat Wars Reports (not done) objSubTypeMessageReportReq = 305 // /report (done) objSubTypeMessageReportAck = 306 // result from /report (done) @@ -484,6 +470,8 @@ const ( objSubTypeMessageOrderbookSearch = 389 // /t objSubTypeMessageQuestReq = 390 // quest objSubTypeMessageQuestAck = 391 // forest/swamp/valley/arena + objSubTypeMessageBattle = 392 // wind is howling + objSubTypeMessageTopReq = 394 objSubTypeJobPillage = 601 objSubTypeJobTribute = 602 objSubTypeJobStatus = 603 diff --git a/msg.go b/msg.go index a1ca3ab..419bd02 100644 --- a/msg.go +++ b/msg.go @@ -405,36 +405,6 @@ func parseSubTypeMessageDuelFight(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa return &cwm, nil } -func parseSubTypeMessageMiniWar(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageMiniWar, error) { - t, err := time.Parse("02/01/06 15:04", r.ReplaceAllString(m.Text, "${Time}")) - logOnError(err, "parseSubTypeMessageMiniWar : parsing time : "+r.ReplaceAllString(m.Text, "${Time}")) - cwm := ChatWarsMessageMiniWar{ - Time: t, - Report: make(map[string]*ChatWarsMessageMiniWarCastle), - } - for i := 1; i <= 7; i++ { - loot := fmt.Sprintf("${Loot%d}", i) - gardian := fmt.Sprintf("${Gardian%d}", i) - result := fmt.Sprintf("${Result%d}", i) - gold := fmt.Sprintf("${Gold%d}", i) - stock := fmt.Sprintf("${Stock%d}", i) - rep := ChatWarsMessageMiniWarCastle{ - Gardian: r.ReplaceAllString(m.Text, gardian), - Result: r.ReplaceAllString(m.Text, result), - } - rep.Gold, err = strconv.ParseInt(r.ReplaceAllString(m.Text, gold), 10, 64) - rep.Stock, err = strconv.ParseInt(r.ReplaceAllString(m.Text, stock), 10, 64) - cwm.Report[r.ReplaceAllString(m.Text, loot)] = &rep - } - for i := 1; i <= 7; i++ { - score := fmt.Sprintf("${Score%d}", i) - points := fmt.Sprintf("${Points%d}", i) - cwm.Report[r.ReplaceAllString(m.Text, score)].Points, err = strconv.ParseInt(r.ReplaceAllString(m.Text, points), 10, 64) - } - - return &cwm, err -} - func parseSubTypeMessagePillageInc(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessagePillageInc, error) { cwm := ChatWarsMessagePillageInc{} cwm.Attacker = r.ReplaceAllString(m.Text, "${Attacker}") diff --git a/rules.go b/rules.go index ec06e69..252a558 100644 --- a/rules.go +++ b/rules.go @@ -25,25 +25,7 @@ func resetMsgParsingRules() { `End At: (?P.*)\\n` + `Status: (?P.*)(\\n)` + `*(?s:.*)") - ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P