diff --git a/af/lockandkey.af b/af/lockandkey.af index 4603432..4e4e222 100644 --- a/af/lockandkey.af +++ b/af/lockandkey.af @@ -59,10 +59,10 @@ STATE: {idle} DoExpr {clearvar[queuePrimary]} DoExpr {clearvar[queueSecondary]} ~~ Listen for tells containing "primary" - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$} {} DO: SetState {summon_primary} ~~ Listen for tells containing "secondary" - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$} {} DO: SetState {summon_secondary} ~~ Periodic service check IF: All @@ -93,11 +93,11 @@ STATE: {summon_primary} DoExpr {actiontrycastbyid[157]} SetState {summon_primary} ~~ Queue incoming tells while casting - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$} {} DO: DoAll Chat {/a Queued 125 Eaters portal, will summon shortly.} DoExpr {setvar[queuePrimary, 1]} - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$} {} DO: DoAll Chat {/a Queued Bellas portal, will summon shortly.} DoExpr {setvar[queueSecondary, 1]} @@ -125,11 +125,11 @@ STATE: {summon_secondary} DoExpr {actiontrycastbyid[2648]} SetState {summon_secondary} ~~ Queue incoming tells while casting - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$} {} DO: DoAll Chat {/a Queued 125 Eaters portal, will summon shortly.} DoExpr {setvar[queuePrimary, 1]} - IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$} {} + IF: ChatCapture {(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$} {} DO: DoAll Chat {/a Queued Bellas portal, will summon shortly.} DoExpr {setvar[queueSecondary, 1]} diff --git a/met/lockandkey.met b/met/lockandkey.met index b22b5e9..f8415de 100644 --- a/met/lockandkey.met +++ b/met/lockandkey.met @@ -488,7 +488,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$ s c s @@ -511,7 +511,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$ s c s @@ -716,7 +716,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$ s c s @@ -761,7 +761,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$ s c s @@ -947,7 +947,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*primary.*"$ s c s @@ -992,7 +992,7 @@ n s p s -(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) .*, ".*secondary.*"$ +(^(\[[A-z]+?\] |)You|.*\[^\<]*)\>.+\<\\Tell\>) tells you, ".*secondary.*"$ s c s