diff --git a/job.go b/job.go index fcfa399..e85729d 100644 --- a/job.go +++ b/job.go @@ -2035,6 +2035,7 @@ func jobAlchAll(j Job) { maxManaItems map[int64]int64 maxResItems map[int64]int64 itemInStock bool + eta, out string ) err := setJobStart(j.ID64) @@ -2117,7 +2118,6 @@ func jobAlchAll(j Job) { } } muxObjItem.RUnlock() - var eta string if p.ManaNow < p.ManaMax { t := (p.ManaMax - p.ManaNow) / ((p.ManaMax / 250) + 1) d := time.Duration(t) * time.Minute @@ -2128,11 +2128,19 @@ func jobAlchAll(j Job) { if d.Minutes() > 0 { eta = fmt.Sprintf("%s%.0fm", eta, d.Minutes()) } + } else { + eta = "0m" + } + for k, q := range maxManaItems { + if q == maxResItems[k] { + o, _ := getObjItem(k) + out = fmt.Sprintf("%s\n%s - %s - %d", out, o.Code, o.Name, q) + } } c := TGCommand{ Type: commandReplyMsg, - Text: "Success.", + Text: fmt.Sprintf("ETA : %s\n%s", eta, out), FromMsgID64: p.MsgID64, FromChatID64: p.ChatID64, ParseMode: cmdParseModeHTML,