diff --git a/item.go b/item.go index 18defca..443e1e0 100644 --- a/item.go +++ b/item.go @@ -136,6 +136,10 @@ func getSilentObjItemID(code string, name string) int64 { return objItems[id].ObjID64 } if ok, _ := regexp.MatchString(`^((u|e)[0-9]+|(a|w)[0-9]+[a-e]{0,1})$`, code); ok || len(code) == 0 { + if ok, _ := regexp.MatchString(`^(Mystery|Unidentified) (amulet|ring) lvl.[0-9]+$`); ok { + return objItems[cacheObjItem[`u000`]].ObjID64 + } + r := regexp.MustCompile(`^((?P⚡\+[0-9]+) ){0,1}(?P.+?)( \+(?P[0-9]+)⚔){0,1}( \+(?P[0-9]+)🛡){0,1}( \+(?P[0-9]+)💧){0,1}$`) basename := r.ReplaceAllString(name, "${BaseName}") if id, ok := cacheObjItem[basename]; ok && len(basename) > 0 { diff --git a/workers.go b/workers.go index 0c8afd9..b8a36d0 100644 --- a/workers.go +++ b/workers.go @@ -621,11 +621,11 @@ func SQLJobWorker() { for true { jobs, err := loadCurrentJobs() logOnError(err, "SQLJobWorker : loadCurrentJobs") - - if len(jobs) > 0 { - log.Printf("SQLJobWorker : %d jobs.\n", len(jobs)) - } - + /* + if len(jobs) > 0 { + log.Printf("SQLJobWorker : %d jobs.\n", len(jobs)) + } + */ if err == nil { for _, j := range jobs { JobQueue <- j @@ -644,7 +644,7 @@ func JobWorker(id int, jobs <-chan Job) { //log.Printf("jobWorker[" + strconv.Itoa(id) + "] : Starting.") // FIXME : discard timed out jobs for j := range jobs { - log.Printf("JobWorker[%d] : Starting job %d (timeout : %s).\n", id, j.ID64, j.Timeout.Format(time.RFC3339)) + //log.Printf("JobWorker[%d] : Starting job %d (timeout : %s).\n", id, j.ID64, j.Timeout.Format(time.RFC3339)) if time.Now().UTC().Before(j.Timeout) { switch j.JobTypeID64 { case cacheObjSubType[`job_rescan_msg`]: