diff --git a/obj.go b/obj.go index 744fec9..7d6be1f 100644 --- a/obj.go +++ b/obj.go @@ -523,7 +523,7 @@ func silentGetObjItemID(c string, n string) int64 { return i.ObjID64 } if ok, _ := regexp.MatchString(`u[0-9]+`, c); ok { - r := regexp.MustCompile(`(?P⚡\+[0-9]+) (?P[a-zA-Z ]+)`) + r := regexp.MustCompile(`(?P⚡\+[0-9]+) (?P[a-zA-Z ]+?)( +(?P[0-9]+)⚔ +(?P[0-9]+)🛡){0,1}`) n2 := r.ReplaceAllString(n, "${BaseName}") if v, ok := cacheObjItem.Load(n2); ok { i := v.(ChatWarsItem) @@ -531,7 +531,7 @@ func silentGetObjItemID(c string, n string) int64 { } } if len(c) == 0 { - r := regexp.MustCompile(`(?P⚡\+[0-9]+) (?P[a-zA-Z ]+)`) + r := regexp.MustCompile(`(?P⚡\+[0-9]+) (?P[a-zA-Z ]+?)( +(?P[0-9]+)⚔ +(?P[0-9]+)🛡){0,1}`) n2 := r.ReplaceAllString(n, "${BaseName}") if v, ok := cacheObjItem.Load(n2); ok { i := v.(ChatWarsItem)