diff --git a/def.go b/def.go index ef7c788..bcc900d 100644 --- a/def.go +++ b/def.go @@ -159,34 +159,40 @@ const ( castleWolf = 7 objSubTypeMessageUnknown = 301 - objSubTypeMessageWar = 302 - objSubTypeMessageMiniWar = 303 - objSubTypeMessageGuildWar = 304 - objSubTypeMessageReport = 305 - objSubTypeMessageGReport = 306 - objSubTypeMessageQuest = 307 - objSubTypeMessageDuelFight = 308 - objSubTypeMessageHero = 309 - objSubTypeMessageMe = 310 - objSubTypeMessageInventory = 311 - objSubTypeMessagePillageInc = 312 - objSubTypeMessagePillageGo = 313 - objSubTypeMessagePillageTimeout = 314 - objSubTypeMessagePillageWin = 315 - objSubTypeMessagePillageLoss = 316 - objSubTypeMessageTributeInc = 317 - objSubTypeMessageTributeAck = 318 - objSubTypeMessageAuctionAnnounce = 319 - objSubTypeMessageAuctionUpdReq = 320 - objSubTypeMessageAuctionUpdAck = 321 - objSubTypeMessageTimeAck = 322 - objSubTypeMessageTimeReq = 323 - objSubTypeMessageGo = 324 - objSubTypeMessageGoQuest = 325 - objSubTypeMessageGoArena = 326 - objSubTypeMessageArena = 327 - objSubTypeMessageTop = 328 - objSubTypeMessageMenu = 329 + objSubTypeMessageWar = 302 // from Chat Wars Reports (not done) + objSubTypeMessageMiniWar = 303 // from Chat Wars Mini Reports (done) + objSubTypeMessageGuildWar = 304 // from Chat Wars Reports (not done) + objSubTypeMessageReportReq = 305 // /report (done) + objSubTypeMessageReportAck = 306 // result from /report (not done) + objSubTypeMessageGReportReq = 307 // /g_report (done) + objSubTypeMessageGReportAck = 308 // result from /g_report (not done) + objSubTypeMessageQuestResult = 309 // result from going to quest (not done) + objSubTypeMessageDuelFight = 310 // result from going to duel fight (done) + objSubTypeMessageHeroReq = 311 // /hero (done) + objSubTypeMessageHeroAck = 312 // result from /hero (not done) + objSubTypeMessageMeReq = 313 // πŸ…Me (done) + objSubTypeMessageMeAck = 314 // result from πŸ…Me (not done) + objSubTypeMessageInventoryReq = 315 // /inv (done) + objSubTypeMessageInventoryAck = 316 // result from /inv (not done) + objSubTypeMessagePillageInc = 317 // random incoming pillage (done) + objSubTypeMessagePillageGo = 318 // ack from /go (done) + objSubTypeMessagePillageTimeout = 319 // ack from lack of /go (done) + objSubTypeMessagePillageWin = 320 // pillage successfully intercepted (done) + objSubTypeMessagePillageLoss = 321 // pillage not intercepted (done) + objSubTypeMessageTributeInc = 322 // request for a /pledge (not done) + objSubTypeMessageTributeAck = 323 // pledge accepted (not done) + objSubTypeMessageAuctionAnnounce = 324 // from Boris and Co, Ltd (done) + objSubTypeMessageAuctionUpdReq = 325 // /l_123456 msg (not done) + objSubTypeMessageAuctionUpdAck = 326 // result from /l_123456 (not done) + objSubTypeMessageTimeAck = 327 // result from /time (done) + objSubTypeMessageTimeReq = 328 // /time (done) + objSubTypeMessageGo = 329 // /go (done) + objSubTypeMessagePledge = 330 // /pledge (done) + objSubTypeMessageGoQuest = 331 // 🌲Forest or πŸ„Swamp or ⛰️Valley (not done) + objSubTypeMessageGoFastFight = 332 // ▢️Fast fight (not done) + objSubTypeMessageGoArena = 333 // πŸ“―Arena (not done) + objSubTypeMessageTop = 334 + objSubTypeMessageMenu = 335 objSubTypeJobPillage = 601 objSubTypeJobTribute = 602 objSubTypeJobStatus = 603 diff --git a/sql.go b/sql.go index 682a10e..53ec530 100644 --- a/sql.go +++ b/sql.go @@ -1304,55 +1304,6 @@ INSERT INTO obj_item (obj_id, intl_id, name, weight) VALUES log.Println("initDB : Database set up") } -func resetMsgParsingRules() { - _, err := db.Exec(`TRUNCATE TABLE msg_rules;`) - failOnError(err, "resetMsgParsingRules : truncate table msg_rules") - - _, err = db.Exec(`INSERT INTO msg_rules (prio, msg_type_id, descn, rule) - VALUES (5000, ` + strconv.Itoa(objSubTypeMessageReport) + `, "Player war report", "^(?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P([A-Za-z0-9 ]*)) βš”:(?P[0-9]+)(?P\\((-|\\+)[0-9]+\\)){0,1} πŸ›‘:(?P[0-9]+) Lvl: (?P[0-9]+)\\nYour result on the battlefield:\\n(πŸ”₯Exp: (?P[0-9]+)\\n){0,1}(πŸ’°Gold: (?P\\-{0,1}[0-9]+)\\n){0,1}(πŸ“¦Stock: (?P\\-{0,1}[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.*)\\nCurrent price: (?P[0-9]+) pouch\\(es\\)\\nBuyer: (?P.*)\\nEnd At: (?P.*)\\nStatus: (?P.*)(\\n)*(?s:.*)") - ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n(?P