This commit is contained in:
shoopea 2019-07-08 15:28:31 +08:00
parent 70efa15397
commit d2a315057e
2 changed files with 12 additions and 1 deletions

View File

@ -147,6 +147,7 @@ func resetObjItem() {
reloadObjItem(`a23`, `Bronze Shield`, objSubTypeItemOther, -1) reloadObjItem(`a23`, `Bronze Shield`, objSubTypeItemOther, -1)
reloadObjItem(`a24`, `Silver Shield`, objSubTypeItemOther, -1) reloadObjItem(`a24`, `Silver Shield`, objSubTypeItemOther, -1)
reloadObjItem(`a25`, `Mithril Shield`, objSubTypeItemOther, -1) reloadObjItem(`a25`, `Mithril Shield`, objSubTypeItemOther, -1)
reloadObjItem(`a25`, `Mithril shield`, objSubTypeItemOther, -1)
reloadObjItem(`a26`, `Royal Guard Cape`, objSubTypeItemOther, -1) reloadObjItem(`a26`, `Royal Guard Cape`, objSubTypeItemOther, -1)
reloadObjItem(`a27`, `Order Armor`, objSubTypeItemOther, -1) reloadObjItem(`a27`, `Order Armor`, objSubTypeItemOther, -1)
reloadObjItem(`a28`, `Order Helmet`, objSubTypeItemOther, 190) reloadObjItem(`a28`, `Order Helmet`, objSubTypeItemOther, 190)
@ -395,6 +396,7 @@ func resetObjItem() {
reloadObjItem(`r08`, `Order Boots recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r08`, `Order Boots recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r09`, `Order Gauntlets 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(`r10`, `Order shield recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r100`, `Assault Cape recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r100`, `Assault Cape recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r101`, `Craftsman Apron recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r101`, `Craftsman Apron recipe`, objSubTypeItemRecipe, -1)
reloadObjItem(`r102`, `Stoneskin Cloak recipe`, objSubTypeItemRecipe, -1) reloadObjItem(`r102`, `Stoneskin Cloak recipe`, objSubTypeItemRecipe, -1)
@ -430,6 +432,7 @@ func resetObjItem() {
reloadObjItem(`r40`, `Royal Boots recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r40`, `Royal Boots recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r41`, `Royal Gauntlets 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(`r42`, `Royal shield recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r43`, `Ghost Armor recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r43`, `Ghost Armor recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r44`, `Ghost Helmet recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r44`, `Ghost Helmet recipe`, objSubTypeItemRecipe, 10)
reloadObjItem(`r45`, `Ghost Boots recipe`, objSubTypeItemRecipe, 10) reloadObjItem(`r45`, `Ghost Boots recipe`, objSubTypeItemRecipe, 10)

View File

@ -16,7 +16,15 @@ func resetMsgParsingRules() {
`(📦Stock: (?P<Stock>\\-{0,1}[0-9]+)){0,1}(\\n)*` + `(📦Stock: (?P<Stock>\\-{0,1}[0-9]+)){0,1}(\\n)*` +
`(❤Hp: (?P<HP>\\-[0-9]+)){0,1}(\\n)*` + `(❤Hp: (?P<HP>\\-[0-9]+)){0,1}(\\n)*` +
`((?P<Stamina>(🔋Stamina restored))){0,1}(\\n(?P<Crit>(Critical strike))){0,1}$") `((?P<Stamina>(🔋Stamina restored))){0,1}(\\n(?P<Crit>(Critical strike))){0,1}$")
,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P<Lot>[0-9]+) : (?P<Item>.*)\\n(Quality: (?P<Quality>.*)\\n){0,1}(Condition: (?P<Cond>.*)\\n){0,1}Seller: (?P<SellerCastle>[🐉🦅🐺🦈🦌🥔🌑])( ){0,1}(\\[(?P<SellerGuild>[A-Z0-9]{1,3})\\]){0,1}(?P<SellerUser>.*){0,1}\\nCurrent price: (?P<Price>[0-9]+) pouch\\(es\\)\\nBuyer: (None|(?P<BuyerCastle>[🐉🦅🐺🦈🦌🥔🌑])( ){0,1}(\\[(?P<BuyerGuild>[A-Z0-9]{1,3})\\]){0,1}(?P<BuyerUser>.*){0,1})\\nEnd At: (?P<End>.*)\\nStatus: (?P<Status>.*)(\\n)*(?s:.*)") ,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P<Lot>[0-9]+) : (?P<Item>.*)\\n` +
`(Quality: (?P<Quality>.*)\\n){0,1}` +
`(Condition: (?P<Cond>.*)\\n){0,1}` +
`Seller: (?P<SellerCastle>[🐉🦅🐺🦈🦌🥔🌑])( ){0,1}(\\[(?P<SellerGuild>[A-Z0-9]{1,3})\\]){0,1}(?P<SellerUser>.*){0,1}\\n` +
`Current price: (?P<Price>[0-9]+) pouch\\(es\\)\\n` +
`Buyer: (None|(?P<BuyerCastle>[🐉🦅🐺🦈🦌🥔🌑])( ){0,1}(\\[(?P<BuyerGuild>[A-Z0-9]{1,3})\\]){0,1}(?P<BuyerUser>.*){0,1})\\n` +
`End At: (?P<End>.*)\\n` +
`Status: (?P<Status>.*)(\\n)` +
`*(?s:.*)")
,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P<Time>.*)\\n(?P<Hour>[0-9]{2}):(?P<Minute>[0-9]{2})\\n(?P<Day>[0-9]{2}) (?P<Month>.+) (?P<Year>[0-9]{4})\\n(?s:.*)$")` + ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P<Time>.*)\\n(?P<Hour>[0-9]{2}):(?P<Minute>[0-9]{2})\\n(?P<Day>[0-9]{2}) (?P<Month>.+) (?P<Year>[0-9]{4})\\n(?s:.*)$")` +
`,(5000, ` + strconv.Itoa(objSubTypeMessageMiniWar) + `, "Mini War", "^⛳Battle results:\\n` + `,(5000, ` + strconv.Itoa(objSubTypeMessageMiniWar) + `, "Mini War", "^⛳Battle results:\\n` +
`(?P<Gardian1>🔱){0,1}.*(?P<Loot1>(Moonlight|Wolfpack|Deerhorn|Dragonscale|Sharkteeth|Potato|Highnest)):(?P<Result1>[^\\x{1F4B0}\\x{1F4E6}]*)((?P<Gold1>(\\-|\\+)[0-9]+)\\x{1F4B0}){0,1}[ ]*((?P<Stock1>(\\-|\\+)[0-9]+)\\x{1F4E6}){0,1}\\n` + `(?P<Gardian1>🔱){0,1}.*(?P<Loot1>(Moonlight|Wolfpack|Deerhorn|Dragonscale|Sharkteeth|Potato|Highnest)):(?P<Result1>[^\\x{1F4B0}\\x{1F4E6}]*)((?P<Gold1>(\\-|\\+)[0-9]+)\\x{1F4B0}){0,1}[ ]*((?P<Stock1>(\\-|\\+)[0-9]+)\\x{1F4E6}){0,1}\\n` +