diff --git a/rules.go b/rules.go index eb8ff6a..be86198 100644 --- a/rules.go +++ b/rules.go @@ -31,7 +31,7 @@ func resetMsgParsingRules() { `(?P[0-9]{2}) (?P.+) (?P[0-9]{4})\\n\\n` + `Weather forecast\\n` + `(?P.*)→(?P.*)\\n` + - `*Data provided by CWNN$") + `(?s:.*)$") ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageInc) + `, "Pillage Inc", "^You were strolling around on your horse when you noticed (\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*) of .{1}(?P(Moonlight|Wolfpack|Deerhorn|Dragonscale|Sharkteeth|Potato|Highnest)) Castle trying to pillage a local village. To stop him click /go$") ,(5000, ` + strconv.Itoa(objSubTypeMessageGo) + `, "Go", "^/go$") ,(5000, ` + strconv.Itoa(objSubTypeMessagePillageGo) + `,"Pillage Go", "^You lift up your sword and charge at the violator.$") @@ -324,7 +324,8 @@ func resetMsgParsingRules() { ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #94", "^It was a cool and refreshing night, so you made a campfire out in the woods\\.$") ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #95", "^In the forest you met a redhead woman. Now you know nothing. You returned home empty handed\\.$") ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #96", "^You've stepped into a pile of dung\\. Now you stink\\. Nothing else happened\\.$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #97", "^As you were about to head out for an adventure, you got a feeling you were forgetting something, so you wasted some time trying to remember what it was\\. Finally you gave up and stayed home\.$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #97", "^As you were about to head out for an adventure, you got a feeling you were forgetting something, so you wasted some time trying to remember what it was\\. Finally you gave up and stayed home\\.$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestResult) + `, "Quest result #98", "^Walking through the swamp, you found yourself surrounded by the mist\\. Suddenly you heard a dog howling in the distance\\. You decided to save yourself and ran back home, as your butler promised to cook some porridge\\.$") ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestReq) + `, "Quest Req", "^🗺Quests$") ,(5000, ` + strconv.Itoa(objSubTypeMessageQuestAck) + `, "Quest Ack #0", "^🌲Forest [0-9]min\\n` + diff --git a/sql.go b/sql.go index 7755629..0ce2fa4 100644 --- a/sql.go +++ b/sql.go @@ -573,6 +573,8 @@ func initDB() { ,(` + strconv.Itoa(objSubTypeJobVaultItemStatus) + `, "job_vault_item_status", "Vault Item Status job", ` + strconv.Itoa(objTypeJob) + `) ,(` + strconv.Itoa(objSubTypeJobFwdMsg) + `, "job_fwd_msg", "Forward Message job", ` + strconv.Itoa(objTypeJob) + `) ,(` + strconv.Itoa(objSubTypeJobSetDef) + `, "job_set_def", "Set Defense job", ` + strconv.Itoa(objTypeJob) + `) + ,(` + strconv.Itoa(objSubTypeJobMsgDel) + `, "job_msg_del", "Msg Del job", ` + strconv.Itoa(objTypeJob) + `) + ,(` + strconv.Itoa(objSubTypeJobGetHammerTime) + `, "job_get_hammer_time", "Get Hammer Time job", ` + strconv.Itoa(objTypeJob) + `) ,(` + strconv.Itoa(objSubTypeItemResource) + `, "item_res", "Time", ` + strconv.Itoa(objTypeItem) + `) ,(` + strconv.Itoa(objSubTypeItemAlch) + `, "item_alch", "Time", ` + strconv.Itoa(objTypeItem) + `) ,(` + strconv.Itoa(objSubTypeItemMisc) + `, "item_misc", "Time", ` + strconv.Itoa(objTypeItem) + `)