From c39af4f8bfc0ff56cd7e8e0a4bc494a697d3b521 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 21 Feb 2017 17:35:52 +0100
Subject: [PATCH] .

---
 keys.xml     | 32 ++++++++++++++++++++++++--------
 triggers.xml | 37 +++++++++++++++++++++++++++++++++++--
 werbat.txt   |  4 ++--
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/keys.xml b/keys.xml
index 61a0a6a..7f6a3dc 100644
--- a/keys.xml
+++ b/keys.xml
@@ -9,6 +9,30 @@
             <command></command>
             <keyCode>-1</keyCode>
             <keyModifier>-1</keyModifier>
+            <Key isActive="yes" isFolder="no">
+                <name>key-hide-on</name>
+                <packageName></packageName>
+                <script>send(&quot;ukryj sie&quot;, false)</script>
+                <command></command>
+                <keyCode>16777272</keyCode>
+                <keyModifier>0</keyModifier>
+            </Key>
+            <Key isActive="yes" isFolder="no">
+                <name>key-hide-off</name>
+                <packageName></packageName>
+                <script>send(&quot;ujawnij sie&quot;, false)</script>
+                <command></command>
+                <keyCode>16777273</keyCode>
+                <keyModifier>0</keyModifier>
+            </Key>
+            <Key isActive="yes" isFolder="no">
+                <name>przestan-walczyc</name>
+                <packageName></packageName>
+                <script>send(&quot;przestan walczyc&quot;, false)</script>
+                <command></command>
+                <keyCode>16777274</keyCode>
+                <keyModifier>0</keyModifier>
+            </Key>
             <Key isActive="yes" isFolder="no">
                 <name>idz</name>
                 <packageName></packageName>
@@ -17,14 +41,6 @@
                 <keyCode>16777275</keyCode>
                 <keyModifier>0</keyModifier>
             </Key>
-            <Key isActive="yes" isFolder="no">
-                <name>walka-restart</name>
-                <packageName></packageName>
-                <script>ateam:restart_ateam(true)</script>
-                <command></command>
-                <keyCode>16777264</keyCode>
-                <keyModifier>268435456</keyModifier>
-            </Key>
         </KeyGroup>
     </KeyPackage>
 </MudletPackage>
diff --git a/triggers.xml b/triggers.xml
index c5533a6..1ab3305 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -212,6 +212,7 @@ resetFormat()</script>
                         <string>^[ &gt;]*(Masakrujesz)</string>
                         <string>.*(przeciwni.* rzucasz sie do ataku|Stajesz pewnie .* Bezlitosny,).*</string>
                         <string>.*(uderzasz|doskakujesz).*(raniac|masakrujac).*</string>
+                        <string>(Ubiegajac reakcje|Uprzedzajac reakcje|Blyskawicznym susem|Dziko hallakujac|Z furia drapieznika|Wyprzedzajac nieudolny atak|Z dzikim krzykiem) .*</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
@@ -222,6 +223,32 @@ resetFormat()</script>
                         <integer>1</integer>
                         <integer>1</integer>
                         <integer>1</integer>
+                        <integer>1</integer>
+                    </regexCodePropertyList>
+                </Trigger>
+                <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                    <name>fight-ciosy-inni</name>
+                    <script>selectString(matches[1],1)
+fg(&quot;firebrick&quot;)
+resetFormat()
+echo(&quot;dupa&quot;)</script>
+                    <triggerType>0</triggerType>
+                    <conditonLineDelta>0</conditonLineDelta>
+                    <mStayOpen>0</mStayOpen>
+                    <mCommand></mCommand>
+                    <packageName></packageName>
+                    <mFgColor>#ff0000</mFgColor>
+                    <mBgColor>#ffff00</mBgColor>
+                    <mSoundFile></mSoundFile>
+                    <colorTriggerFgColor>#000000</colorTriggerFgColor>
+                    <colorTriggerBgColor>#000000</colorTriggerBgColor>
+                    <regexCodeList>
+                        <string>(ledwo muska|lekko rani|rani|powaznie rani|bardzo ciezko rani&quot;masakruje) (?!cie)</string>
+                        <string>(ledwo muskajac|lekko raniac|raniac|powaznie raniac|bardzo ciezko raniac|masakrujac) (go|ja)</string>
+                    </regexCodeList>
+                    <regexCodePropertyList>
+                        <integer>1</integer>
+                        <integer>1</integer>
                     </regexCodePropertyList>
                 </Trigger>
                 <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
@@ -343,7 +370,8 @@ resetFormat()</script>
 bg(&quot;tomato&quot;)
 fg(&quot;white&quot;)
 replace(&quot;!!! &quot; .. string.upper(matches[2]) .. &quot;!!!&quot; )
-resetFormat()</script>
+resetFormat()
+raiseEvent(&quot;playBeep&quot;)</script>
                     <triggerType>0</triggerType>
                     <conditonLineDelta>0</conditonLineDelta>
                     <mStayOpen>0</mStayOpen>
@@ -512,7 +540,8 @@ resetFormat()</script>
                     <script>selectCurrentLine()
 bg(&quot;red&quot;)
 fg(&quot;white&quot;)
-resetFormat()</script>
+resetFormat()
+raiseEvent(&quot;playBeep&quot;)</script>
                     <triggerType>0</triggerType>
                     <conditonLineDelta>0</conditonLineDelta>
                     <mStayOpen>0</mStayOpen>
@@ -1103,10 +1132,12 @@ scripts.ui.footer_main:setColor(128,128,128)</script>
                     <regexCodeList>
                         <string>^[ &gt;]*Chowasz sie najlepiej jak potrafisz\.$</string>
                         <string>.*odazasz skradajac sie za .*</string>
+                        <string>Nie potrafisz schowac sie jeszcze lepiej.</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
                         <integer>1</integer>
+                        <integer>0</integer>
                     </regexCodePropertyList>
                 </Trigger>
                 <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
@@ -1131,6 +1162,7 @@ scripts.ui.footer_main:setColor(scripts.ui.footer_r, scripts.ui.footer_g, script
                         <string>.*odazasz za .*</string>
                         <string>Przeciez nie jestes ukryt</string>
                         <string>Nie jestes w stanie sie tu dobrze schowac.</string>
+                        <string>(Ubiegajac reakcje|Uprzedzajac reakcje|Blyskawicznym susem|Dziko hallakujac|Z furia drapieznika|Wyprzedzajac nieudolny atak|Z dzikim krzykiem)</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
@@ -1140,6 +1172,7 @@ scripts.ui.footer_main:setColor(scripts.ui.footer_r, scripts.ui.footer_g, script
                         <integer>1</integer>
                         <integer>0</integer>
                         <integer>0</integer>
+                        <integer>1</integer>
                     </regexCodePropertyList>
                 </Trigger>
             </TriggerGroup>
diff --git a/werbat.txt b/werbat.txt
index 0073e26..5f48629 100644
--- a/werbat.txt
+++ b/werbat.txt
@@ -370,12 +370,12 @@ scripts.gag_settings = {
 scripts.gag_colors["moje_ciosy"] = "white"
 scripts.gag_colors["moje_spece"] = "orchid"
 
-scripts.gag_colors["innych_ciosy"] = "slate_grey"
+scripts.gag_colors["innych_ciosy"] = "firebrick"
 scripts.gag_colors["innych_ciosy_we_mnie"] = "tomato"
 scripts.gag_colors["innych_spece"] = "orchid"
 
 scripts.gag_colors["moje_uniki"] = "white"
-scripts.gag_colors["innych_uniki"] = "slate_grey"
+scripts.gag_colors["innych_uniki"] = "firebrick"
 
 scripts.gag_colors["moje_parowanie"] = "white"
 scripts.gag_colors["innych_parowanie"] = "slate_gray"