fix
This commit is contained in:
parent
62e2698ea5
commit
6c525a0425
@ -182,13 +182,13 @@
|
||||
{
|
||||
"prio": 5000,
|
||||
"descn": "Stock Ack",
|
||||
"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):(?P<Items>(\\n[^\\(]+ \\([0-9]+\\))*)$",
|
||||
"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):(?P<Items>(\\n[a-zA-Z ❄️]+ \\([0-9]+\\))*)$",
|
||||
"msg_type": "msg_stock_ack"
|
||||
},
|
||||
{
|
||||
"prio": "4000",
|
||||
"descn": "Stock Ack",
|
||||
"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):\\nUse \\/sg_\\{code\\} to trade some amount of resource for .*💰\\/pcs\\n(?P<Items>(\\n\\/sg_[0-9]+ [^\\(]+ \\([0-9]+\\))*)$",
|
||||
"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):\\nUse \\/sg_\\{code\\} to trade some amount of resource for .*💰\\/pcs\\n(?P<Items>(\\n\\/sg_[a-z0-9]+ [a-zA-Z ❄️]+ \\([0-9]+\\))*)$",
|
||||
"msg_type": "msg_stock_ack"
|
||||
},
|
||||
{
|
||||
|
2
msg.go
2
msg.go
@ -130,7 +130,7 @@ func parseSubTypeMessageStockAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar
|
||||
cwm := ChatWarsMessageStockAck{}
|
||||
items := []ChatWarsItems{}
|
||||
|
||||
re := regexp.MustCompile(`\n([^\(]+) \(([0-9]+)\)`)
|
||||
re := regexp.MustCompile(`\n([a-zA-Z ❄️]+) \(([0-9]+)\)`)
|
||||
for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Items}"), -1) {
|
||||
i := getObjItemID(``, l[1])
|
||||
q, _ := strconv.ParseInt(l[2], 10, 64)
|
||||
|
Loading…
Reference in New Issue
Block a user