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

test

Browse Source
This commit is contained in:
shoopea 2019-06-06 16:10:02 +08:00
parent a808aaf4eb
commit 88d6e67c63
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
items.go
View File

@ -189,7 +189,7 @@ func resetObjItem() {
reloadObjItem(`a87`, `Celestial armor`, objSubTypeItemOther, 510) reloadObjItem(`a87`, `Celestial armor`, objSubTypeItemOther, 510)
reloadObjItem(`a88`, `Celestial helmet`, objSubTypeItemOther, 210) reloadObjItem(`a88`, `Celestial helmet`, objSubTypeItemOther, 210)
reloadObjItem(`a89`, `Celestial boots`, objSubTypeItemOther, 155) reloadObjItem(`a89`, `Celestial boots`, objSubTypeItemOther, 155)
reloadObjItem(`a90`, `Celestial gloves`, objSubTypeItemOther, 155) reloadObjItem(`a90`, `Celestial bracers`, objSubTypeItemOther, 155)
reloadObjItem(`a100`, `Assault cape`, objSubTypeItemOther, -1) reloadObjItem(`a100`, `Assault cape`, objSubTypeItemOther, -1)
reloadObjItem(`a101`, `Craftsman Apron`, objSubTypeItemOther, -1) reloadObjItem(`a101`, `Craftsman Apron`, objSubTypeItemOther, -1)
reloadObjItem(`a102`, `Stoneskin cloak`, objSubTypeItemOther, -1) reloadObjItem(`a102`, `Stoneskin cloak`, objSubTypeItemOther, -1)
@ -295,7 +295,7 @@ func resetObjItem() {
reloadObjItem(`k87`, `Celestial Armor part`, objSubTypeItemPart, 10) // PROPAGATE TO WIKI reloadObjItem(`k87`, `Celestial Armor part`, objSubTypeItemPart, 10) // PROPAGATE TO WIKI
reloadObjItem(`k88`, `Celestial Helmet part`, objSubTypeItemPart, 10) // PROPAGATE TO WIKI reloadObjItem(`k88`, `Celestial Helmet part`, objSubTypeItemPart, 10) // PROPAGATE TO WIKI
reloadObjItem(`k89`, `Celestial Boots part`, objSubTypeItemPart, -1) reloadObjItem(`k89`, `Celestial Boots part`, objSubTypeItemPart, -1)
reloadObjItem(`k90`, `Celestial Gloves part`, objSubTypeItemPart, -1) reloadObjItem(`k90`, `Celestial Bracers part`, objSubTypeItemPart, -1)
reloadObjItem(`k91`, `Griffin Knife part`, objSubTypeItemPart, -1) reloadObjItem(`k91`, `Griffin Knife part`, objSubTypeItemPart, -1)
reloadObjItem(`k92`, `Minotaur Sword part`, objSubTypeItemPart, -1) reloadObjItem(`k92`, `Minotaur Sword part`, objSubTypeItemPart, -1)
reloadObjItem(`k93`, `Phoenix Sword part`, objSubTypeItemPart, -1) reloadObjItem(`k93`, `Phoenix Sword part`, objSubTypeItemPart, -1)
@ -406,7 +406,7 @@ func resetObjItem() {
reloadObjItem(`r87`, `Celestial Armor recipe`, objSubTypeItemRecipe, 10) // PROPAGATE TO WIKI reloadObjItem(`r87`, `Celestial Armor recipe`, objSubTypeItemRecipe, 10) // PROPAGATE TO WIKI
reloadObjItem(`r88`, `Celestial Helmet recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r88`, `Celestial Helmet recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r89`, `Celestial Boots recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r89`, `Celestial Boots recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r90`, `Celestial Gloves recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r90`, `Celestial Bracers recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r91`, `Griffin Knife recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r91`, `Griffin Knife recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r92`, `Minotaur Sword recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r92`, `Minotaur Sword recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r93`, `Phoenix Sword recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r93`, `Phoenix Sword recipe`, objSubTypeItemRecipe, -1)

2
obj.go
View File

@ -525,7 +525,7 @@ func silentGetObjItemID(code string, name string) int64 {
i := v.(ChatWarsItem) i := v.(ChatWarsItem)
return i.ObjID64 return i.ObjID64
} }
if ok, _ := regexp.MatchString(`u[0-9]+`, c); ok { if ok, _ := regexp.MatchString(`(u|a|e)[0-9]+`, c); ok {
r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ]+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`) r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ]+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
fmt.Printf("silentGetObjItemID(unique) : Modifier : `%s`\n", r.ReplaceAllString(n, "${Modifier}")) fmt.Printf("silentGetObjItemID(unique) : Modifier : `%s`\n", r.ReplaceAllString(n, "${Modifier}"))
fmt.Printf("silentGetObjItemID(unique) : BaseName : `%s`\n", r.ReplaceAllString(n, "${BaseName}")) fmt.Printf("silentGetObjItemID(unique) : BaseName : `%s`\n", r.ReplaceAllString(n, "${BaseName}"))