diff --git a/items.go b/items.go index c8d4b9f..7a36174 100644 --- a/items.go +++ b/items.go @@ -147,6 +147,7 @@ func resetObjItem() { reloadObjItem(`a23`, `Bronze Shield`, objSubTypeItemOther, -1) reloadObjItem(`a24`, `Silver Shield`, objSubTypeItemOther, -1) reloadObjItem(`a25`, `Mithril Shield`, objSubTypeItemOther, -1) + reloadObjItem(`a25`, `Mithril shield`, objSubTypeItemOther, -1) reloadObjItem(`a26`, `Royal Guard Cape`, objSubTypeItemOther, -1) reloadObjItem(`a27`, `Order Armor`, objSubTypeItemOther, -1) reloadObjItem(`a28`, `Order Helmet`, objSubTypeItemOther, 190) @@ -395,6 +396,7 @@ func resetObjItem() { reloadObjItem(`r08`, `Order Boots recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r09`, `Order Gauntlets recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r10`, `Order Shield recipe`, objSubTypeItemRecipe, 10) + reloadObjItem(`r10`, `Order shield recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r100`, `Assault Cape recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r101`, `Craftsman Apron recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r102`, `Stoneskin Cloak recipe`, objSubTypeItemRecipe, -1) @@ -430,6 +432,7 @@ func resetObjItem() { reloadObjItem(`r40`, `Royal Boots recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r41`, `Royal Gauntlets recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r42`, `Royal Shield recipe`, objSubTypeItemRecipe, 10) + reloadObjItem(`r42`, `Royal shield recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r43`, `Ghost Armor recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r44`, `Ghost Helmet recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r45`, `Ghost Boots recipe`, objSubTypeItemRecipe, 10) diff --git a/rules.go b/rules.go index 5f54d9b..588875c 100644 --- a/rules.go +++ b/rules.go @@ -16,7 +16,15 @@ func resetMsgParsingRules() { `(πŸ“¦Stock: (?P\\-{0,1}[0-9]+)){0,1}(\\n)*` + `(❀️Hp: (?P\\-[0-9]+)){0,1}(\\n)*` + `((?P(πŸ”‹Stamina restored))){0,1}(\\n(?P(⚑Critical strike))){0,1}$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P[0-9]+) : (?P.*)\\n(Quality: (?P.*)\\n){0,1}(Condition: (?P.*)\\n){0,1}Seller: (?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1}\\nCurrent price: (?P[0-9]+) pouch\\(es\\)\\nBuyer: (None|(?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1})\\nEnd At: (?P.*)\\nStatus: (?P.*)(\\n)*(?s:.*)") + ,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P[0-9]+) : (?P.*)\\n` + + `(Quality: (?P.*)\\n){0,1}` + + `(Condition: (?P.*)\\n){0,1}` + + `Seller: (?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1}\\n` + + `Current price: (?P[0-9]+) pouch\\(es\\)\\n` + + `Buyer: (None|(?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1})\\n` + + `End At: (?P.*)\\n` + + `Status: (?P.*)(\\n)` + + `*(?s:.*)") ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P