chtwrs/chirpnest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
shoopea 2020-02-29 18:25:48 +08:00
parent 55f9f8c81e
commit 81d04dd752
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot.go
View File

@ -940,7 +940,7 @@ func botAlchAll(m *ChatWarsMessage) {
MsgID64: m.ID64, MsgID64: m.ID64,
ChatID64: m.ChatID64, ChatID64: m.ChatID64,
Status: 0, Status: 0,
Mana: 0, ManaNow: 0,
ManaMax: 0, ManaMax: 0,
} }

6
job.go
View File

@ -2064,7 +2064,7 @@ func jobAlchAll(j Job) {
cwm, err := parseSubTypeMessageMeAck(m, rule.re) cwm, err := parseSubTypeMessageMeAck(m, rule.re)
p.Status = 2 p.Status = 2
p.Mana = cwm.ManaNow p.ManaNow = cwm.ManaNow
p.ManaMax = cwm.ManaMax p.ManaMax = cwm.ManaMax
err = setJobPayloadJSON(j.ID64, p) err = setJobPayloadJSON(j.ID64, p)
@ -2084,7 +2084,7 @@ func jobAlchAll(j Job) {
rule, err := getMsgParsingRule(m) rule, err := getMsgParsingRule(m)
logOnError(err, "jobAlchAll : getMsgParsingRule") logOnError(err, "jobAlchAll : getMsgParsingRule")
if rule.MsgTypeID64 == cacheObjSubType[`msg_alch_stock_ack`] { if rule.MsgTypeID64 == cacheObjSubType[`msg_alch_stock_ack`] {
cwm, err := parseSubTypeMessageAlchStockAck(m, rule) cwm, err := parseSubTypeMessageAlchStockAck(m, rule.re)
logOnError(err, "jobAlchAll : parseSubTypeMessageAlchStockAck") logOnError(err, "jobAlchAll : parseSubTypeMessageAlchStockAck")
if err == nil { if err == nil {
maxManaItems = make(map[int64]int64) maxManaItems = make(map[int64]int64)
@ -2094,7 +2094,7 @@ func jobAlchAll(j Job) {
muxObjItem.RLock() muxObjItem.RLock()
for _, o := range objItems { for _, o := range objItems {
if (o.ItemTypeID == cacheObjSubType[`item_misc`] || o.ItemTypeID == cacheObjSubType[`item_misc`]) && o.Craftable && o.Craft != nil { if (o.ItemTypeID == cacheObjSubType[`item_misc`] || o.ItemTypeID == cacheObjSubType[`item_misc`]) && o.Craftable && o.Craft != nil {
rx := regexp.MustCompile("\/brew.*") rx := regexp.MustCompile(`\/brew.*`)
if rx.MatchString(o.Craft.Command) { if rx.MatchString(o.Craft.Command) {
maxManaItems[o.ObjID64] = p.ManaMax / o.Craft.Mana maxManaItems[o.ObjID64] = p.ManaMax / o.Craft.Mana
maxResItems[o.ObjID64] = maxManaItems[o.ObjID64] maxResItems[o.ObjID64] = maxManaItems[o.ObjID64]