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

fix gdeposit

Browse Source
This commit is contained in:
shoopea 2019-08-29 19:37:52 +08:00
parent fe43b0f9ea
commit 4c0bfb9d48
4 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
def.go
View File

@ -396,38 +396,36 @@ const (
objSubTypeMessageWithdrawReq = 340 // /g_withdraw (done) objSubTypeMessageWithdrawReq = 340 // /g_withdraw (done)
objSubTypeMessageWithdrawCode = 341 // code to receive (done) objSubTypeMessageWithdrawCode = 341 // code to receive (done)
objSubTypeMessageWithdrawRcv = 342 // Withdraw "received" msg (done) objSubTypeMessageWithdrawRcv = 342 // Withdraw "received" msg (done)
objSubTypeMessageDepositReq = 343 // /g_deposit (done) objSubTypeMessageStockReq = 343 // /stock (done)
objSubTypeMessageDepositAck = 344 // Deposited successfully (done) objSubTypeMessageStockAck = 344 // result from /stock (not done)
objSubTypeMessageStockReq = 345 // /stock (done) objSubTypeMessageMiscReq = 345 // /misc (done)
objSubTypeMessageStockAck = 346 // result from /stock (not done) objSubTypeMessageMiscAck = 346 // result from /misc (not done)
objSubTypeMessageMiscReq = 347 // /misc (done) objSubTypeMessageUnionWar = 347 // from Chat Wars Reports (not done)
objSubTypeMessageMiscAck = 348 // result from /misc (not done) objSubTypeMessageTUReportReq = 348 // /tu_report (not done)
objSubTypeMessageUnionWar = 349 // from Chat Wars Reports (not done) objSubTypeMessageTUReportAck = 349 // result from /tu_report (not done)
objSubTypeMessageTUReportReq = 350 // /tu_report (not done) objSubTypeMessageTimeout = 350 // generic timeout for action
objSubTypeMessageTUReportAck = 351 // result from /tu_report (not done) objSubTypeMessageGoQuestAck = 351 // confirm quest destination/busyness (done)
objSubTypeMessageTimeout = 352 // generic timeout for action objSubTypeMessageGRolesReq = 352 // /g_roles (done)
objSubTypeMessageGoQuestAck = 353 // confirm quest destination/busyness (done) objSubTypeMessageGRolesAck = 353 // result from /g_roles (done)
objSubTypeMessageGRolesReq = 354 // /g_roles (done) objSubTypeMessageGStockResReq = 354 // /g_stock_res (done)
objSubTypeMessageGRolesAck = 355 // result from /g_roles (done) objSubTypeMessageGStockAlchReq = 355 // /g_stock_alch (done)
objSubTypeMessageGStockResReq = 356 // /g_stock_res (done) objSubTypeMessageGStockMiscReq = 356 // /g_stock_misc (done)
objSubTypeMessageGStockAlchReq = 357 // /g_stock_alch (done) objSubTypeMessageGStockRecReq = 357 // /g_stock_rec (done)
objSubTypeMessageGStockMiscReq = 358 // /g_stock_misc (done) objSubTypeMessageGStockPartReq = 358 // /g_stock_parts (done)
objSubTypeMessageGStockRecReq = 359 // /g_stock_rec (done) objSubTypeMessageGStockOthReq = 359 // /g_stock_other (done)
objSubTypeMessageGStockPartReq = 360 // /g_stock_parts (done) objSubTypeMessageGStockAnyAck = 360 // result from any /g_stock_xxx (done)
objSubTypeMessageGStockOthReq = 361 // /g_stock_other (done) objSubTypeMessageGStockReq = 361 // /g_stock (done)
objSubTypeMessageGStockAnyAck = 362 // result from any /g_stock_xxx (done) objSubTypeMessageGStockAck = 362 // result from /g_stock (done)
objSubTypeMessageGStockReq = 363 // /g_stock (done) objSubTypeMessageBusy = 363 // too busy now
objSubTypeMessageGStockAck = 364 // result from /g_stock (done) objSubTypeMessageResStockReq = 364 // 📦Resources or /stock (done)
objSubTypeMessageBusy = 365 // too busy now objSubTypeMessageAlchStockReq = 365 // ⚗️Alchemy (done)
objSubTypeMessageResStockReq = 366 // 📦Resources or /stock (done) objSubTypeMessageMiscStockReq = 366 // 🗃Misc or /misc (done)
objSubTypeMessageAlchStockReq = 367 // ⚗️Alchemy (done) objSubTypeMessageEquipStockReq = 367 // 🏷Equipment (done)
objSubTypeMessageMiscStockReq = 368 // 🗃Misc or /misc (done) objSubTypeMessageCraftStockReq = 368 // ⚒Crafting (done)
objSubTypeMessageEquipStockReq = 369 // 🏷Equipment (done) objSubTypeMessageStockEmpty = 369 // [empty] (done)
objSubTypeMessageCraftStockReq = 370 // ⚒Crafting (done) objSubTypeMessageStockAnyAck = 370 // list of stock (done)
objSubTypeMessageStockEmpty = 371 // [empty] (done) objSubTypeMessageGDepositReq = 371 // /g_deposit xx y (done)
objSubTypeMessageStockAnyAck = 372 // list of stock (done) objSubTypeMessageGDepositAck = 372 // Deposited successfully: xx (y) (done)
objSubTypeMessageGDepositReq = 373 // /g_deposit xx y (done)
objSubTypeMessageGDepositAck = 374 // Deposited successfully: xx (y) (done)
objSubTypeJobPillage = 601 objSubTypeJobPillage = 601
objSubTypeJobTribute = 602 objSubTypeJobTribute = 602
objSubTypeJobStatus = 603 objSubTypeJobStatus = 603

8
rules.go
View File

@ -117,9 +117,6 @@ func resetMsgParsingRules() {
`(\\n(?P<Item6>.*) x (?P<Quantity6>.*)){0,1}` + `(\\n(?P<Item6>.*) x (?P<Quantity6>.*)){0,1}` +
`(\\n(?P<Item7>.*) x (?P<Quantity7>.*)){0,1}` + `(\\n(?P<Item7>.*) x (?P<Quantity7>.*)){0,1}` +
`(\\n(?P<Item8>.*) x (?P<Quantity8>.*)){0,1}$") `(\\n(?P<Item8>.*) x (?P<Quantity8>.*)){0,1}$")
,(5000, ` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "Deposit Req", "^/g_deposit (?P<Item>[a-z0-9]+) (?P<Quantity>[0-9]+)$")
,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #2", "^Deposited successfully: (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\)$")
,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #1", "^Deposited (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\) successfully$")
,(5000, ` + strconv.Itoa(objSubTypeMessageStockReq) + `, "Stock Req", "^/stock$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockReq) + `, "Stock Req", "^/stock$")
,(5000, ` + strconv.Itoa(objSubTypeMessageStockAck) + `, "Stock Ack", "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):` + ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAck) + `, "Stock Ack", "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):` +
`(?P<Items>(\\n[a-zA-Z ]+ \\([0-9]+\\))*)$") `(?P<Items>(\\n[a-zA-Z ]+ \\([0-9]+\\))*)$")
@ -204,8 +201,9 @@ func resetMsgParsingRules() {
,(5000, ` + strconv.Itoa(objSubTypeMessageCraftStockReq) + `, "Crafting Stock Req", "^⚒Crafting$") ,(5000, ` + strconv.Itoa(objSubTypeMessageCraftStockReq) + `, "Crafting Stock Req", "^⚒Crafting$")
,(5000, ` + strconv.Itoa(objSubTypeMessageStockEmpty) + `, "Stock Empty", "^\\[empty\\]$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockEmpty) + `, "Stock Empty", "^\\[empty\\]$")
,(5000, ` + strconv.Itoa(objSubTypeMessageStockAnyAck) + `, "Any Stock Ack", "^$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAnyAck) + `, "Any Stock Ack", "^$")
,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositReq) + `, "GDeposit Req", "^/g_deposit (?P<Item>[0-9]+) (?P<Quantity>[0-9]+)$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositReq) + `, "GDeposit Req", "^/g_deposit (?P<Item>[a-z0-9]+) (?P<Quantity>[0-9]+)$")
,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack", "^Deposited successfully: (?P<Item>.+) \\((?P<Quantity>[0-9]+)\\)$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #2", "^Deposited successfully: (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\)$")
,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #1", "^Deposited (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\) successfully$")
;`) ;`)
failOnError(err, "resetMsgParsingRules : populate table msg_rules") failOnError(err, "resetMsgParsingRules : populate table msg_rules")
} }

2
sql.go
View File

@ -496,8 +496,6 @@ func initDB() {
,(` + strconv.Itoa(objSubTypeMessageWithdrawReq) + `, "withdraw_req", "Withdraw Req", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageWithdrawReq) + `, "withdraw_req", "Withdraw Req", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageWithdrawCode) + `, "withdraw_code", "Withdraw Code", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageWithdrawCode) + `, "withdraw_code", "Withdraw Code", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageWithdrawRcv) + `, "withdraw_rcv", "Withdraw Received", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageWithdrawRcv) + `, "withdraw_rcv", "Withdraw Received", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "deposit_req", "Deposit Req", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "deposit_ack", "Deposit Ack", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageStockReq) + `, "stock_req", "Stock Req", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageStockReq) + `, "stock_req", "Stock Req", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageStockAck) + `, "stock_ack", "Stock Ack", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageStockAck) + `, "stock_ack", "Stock Ack", ` + strconv.Itoa(objTypeMessage) + `)
,(` + strconv.Itoa(objSubTypeMessageMiscReq) + `, "misc_req", "Misc Req", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageMiscReq) + `, "misc_req", "Misc Req", ` + strconv.Itoa(objTypeMessage) + `)

2
workers.go
View File

@ -362,8 +362,6 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
case objSubTypeMessageWithdrawReq: case objSubTypeMessageWithdrawReq:
case objSubTypeMessageWithdrawCode: case objSubTypeMessageWithdrawCode:
case objSubTypeMessageWithdrawRcv: case objSubTypeMessageWithdrawRcv:
case objSubTypeMessageDepositReq:
case objSubTypeMessageDepositAck:
case objSubTypeMessageStockReq: case objSubTypeMessageStockReq:
case objSubTypeMessageMiscReq: case objSubTypeMessageMiscReq:
case objSubTypeMessageGStockResReq: case objSubTypeMessageGStockResReq: