diff --git a/msg.go b/msg.go index f957b31..5134f2c 100644 --- a/msg.go +++ b/msg.go @@ -59,17 +59,20 @@ func parseSubTypeMessageStockAnyAck(m *ChatWarsMessage, r *regexp.Regexp) (*Chat cwm := ChatWarsMessageStockAnyAck{} items := []ChatWarsItems{} - re := regexp.MustCompile(`([a-zA-Z ]+) \(([0-9]+)\)\n{0,1}`) + re := regexp.MustCompile(`(📃){0,1}([a-zA-Z ]+) \(([0-9]+)\)( /view_[a-z0-9]+){0,1}\n{0,1}`) for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Items}"), -1) { - i := getObjItemID(``, l[1]) - q, _ := strconv.ParseInt(l[2], 10, 64) - if i != 0 { - item := ChatWarsItems{ - ItemID64: i, - Quantity: q, + fmt.Printf("parseSubTypeMessageStockAnyAck : %+q\n", l) + /* + i := getObjItemID(``, l[1]) + q, _ := strconv.ParseInt(l[2], 10, 64) + if i != 0 { + item := ChatWarsItems{ + ItemID64: i, + Quantity: q, + } + items = append(items, item) } - items = append(items, item) - } + */ } cwm.Stock = items diff --git a/rules.go b/rules.go index bbd7fe0..d1a4034 100644 --- a/rules.go +++ b/rules.go @@ -200,7 +200,7 @@ func resetMsgParsingRules() { ,(5000, ` + strconv.Itoa(objSubTypeMessageEquipStockReq) + `, "Equipment Stock Req", "^🏷Equipment$") ,(5000, ` + strconv.Itoa(objSubTypeMessageCraftStockReq) + `, "Crafting Stock Req", "^⚒Crafting$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockEmpty) + `, "Stock Empty", "^\\[empty\\]$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAnyAck) + `, "Any Stock Ack", "^(?P(([a-zA-Z ]+ \\([0-9]+\\)\\n{0,1})+))$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAnyAck) + `, "Any Stock Ack", "^(?P(([a-zA-Z 📃]+ \\([0-9]+\\)( /view_[a-z0-9]+){0,1}\\n{0,1})+))$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositReq) + `, "GDeposit Req", "^/g_deposit (?P[a-z0-9]+) (?P[0-9]+)$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #2", "^Deposited successfully: (?P.*) \\((?P[0-9]+)\\)$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #1", "^Deposited (?P.*) \\((?P[0-9]+)\\) successfully$")