From fd772a73e44a9d9a193b63e990287dea36c2d8d6 Mon Sep 17 00:00:00 2001 From: webbykat Date: Fri, 11 Jan 2019 18:57:20 -0500 Subject: [PATCH] Committing my local changes --- .gitignore | 1 + src/actions.tin | 22 +++++++++++++++++++++- src/channels.tin | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..98d8a5a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +logs diff --git a/src/actions.tin b/src/actions.tin index 8e96b89..49691d8 100644 --- a/src/actions.tin +++ b/src/actions.tin @@ -19,7 +19,15 @@ #HIGHLIGHT {hoplite} {red}; #HIGHLIGHT {shadowy gentleman} {red}; #HIGHLIGHT {Coffee Nostra hitman} {red}; - +#HIGHLIGHT {Triad heavy} {red}; +#HIGHLIGHT {Triad heavies} {red}; +#HIGHLIGHT {nobleman} {green}; +#HIGHLIGHT {courtier} {green}; +#HIGHLIGHT {noblewoman} {green}; +#HIGHLIGHT {rich man} {green}; +#HIGHLIGHT {rich woman} {green}; +#HIGHLIGHT {Jolene} {purple}; + #NOP ==[Incident Highlighting]== #HIGHLIGHT {^%1 grabs %2 from you. You struggle briefly but %3 wrests it from your grip and makes for a hasty retreat.$} {bold red underscore}; #HIGHLIGHT {^As %1 dies %2 drops %3 in shock.$} {bold green underscore}; @@ -34,4 +42,16 @@ #end; } +#NOP ==[Sound Triggers]== +#ACTION {^{(?!Ryattenoki).+} tugs on your sleeve in a desperate attempt to get some attention.$} { + #showme {\a}; +}; +#ACTION {^It is your turn to fight... enter the combat ring.$} { + #showme {\a}; +}; + +#ACTION {^Ruhsbaar is up$} { + #showme {\a}; +}; + #CLASS {actions} {close}; diff --git a/src/channels.tin b/src/channels.tin index cee9f1d..40741af 100644 --- a/src/channels.tin +++ b/src/channels.tin @@ -7,7 +7,7 @@ #ACTION {^(newbiehelpers)} {#LINE {LOG} {$chat_file}}; #ACTION {^(newbie)} {#LINE {LOG} {$chat_file}}; #ACTION {^(Playerkillers) %1 wisps:? %2} {#LINE {LOG} {$chat_file}}; -#ACTION {^(Thieves) %1 wisps:? %2} {#LINE {LOG} {$chat_file}}; #ACTION {^(They Might Be Alts) } {#LINE {LOG} {$chat_file}}; +#ACTION {(Thieves)} {#LINE {LOG} {$chat_file}}; #CLASS {channels} {close};