From 67ab18d1777c9568b0ff22fefceb687e798fc42b Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Fri, 13 Dec 2019 20:13:57 +0800
Subject: [PATCH] update quality obj code matching

---
 obj.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/obj.go b/obj.go
index e78c2c4..1235b25 100644
--- a/obj.go
+++ b/obj.go
@@ -724,6 +724,13 @@ func getSilentObjItemID(code string, name string) int64 {
 			//log.Printf("Matching item code %s with %s.\n", code, obj.Code)
 			return obj.ObjID64
 		}
+		if ok, _ := regexp.MatchString(`^a[0-9]+[a-e]$`, code); ok {
+			code2 := code[:len(code)-1]
+			log.Printf("Matching quality item code %s with %s.\n", code, code2)
+			if obj, ok := cacheObjItem[code2]; ok {
+				return obj.ObjID64
+			}
+		}
 		if ok, _ := regexp.MatchString(`^u[0-9]+`, code); !ok {
 			return 0
 		}
@@ -735,13 +742,6 @@ func getSilentObjItemID(code string, name string) int64 {
 		//log.Printf("Matching item name %s with %s.\n", name, obj.Name)
 		return obj.ObjID64
 	}
-	if ok, _ := regexp.MatchString(`^a[0-9]+[a-e]$`, code); ok {
-		code2 := code[:len(code)-1]
-		log.Printf("Matching quality item code %s with %s.\n", code, code2)
-		if obj, ok := cacheObjItem[code2]; ok {
-			return obj.ObjID64
-		}
-	}
 	if ok, _ := regexp.MatchString(`^((u|e)[0-9]+|(a|w)[0-9]+[a-e]{0,1})$`, code); ok || len(code) == 0 {
 		r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>.+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
 		basename := r.ReplaceAllString(name, "${BaseName}")