From 062933c8315e1788d7ad05f3a0fed6284d1a7731 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 31 Jan 2017 03:07:13 +0100
Subject: [PATCH] Unification of stun/block messages.

---
 scripts.xml  |  1 +
 triggers.xml | 45 +++++++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/scripts.xml b/scripts.xml
index eaf2a06..67410db 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -24,6 +24,7 @@ tempTimer(1, function () disableAlias(&quot;wez_monety_z&quot;) end)
 tempTimer(1, function () disableAlias(&quot;wloz_monety_do&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;przelamanie&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;blokowanie_proba_kogos&quot;) end)
+tempTimer(1, function () disableTrigger(&quot;blokowanie_proba_ciebie&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;blokuje_cie&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;walczysz_bez_broni&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;wytracenie_tobie&quot;) end)
diff --git a/triggers.xml b/triggers.xml
index 9a66523..7e9a8ab 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -1082,14 +1082,38 @@ resetFormat()</script>
                 <colorTriggerBgColor>#000000</colorTriggerBgColor>
                 <regexCodeList/>
                 <regexCodePropertyList/>
+                <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                    <name>ftpd-blokowanie_proba_ciebie</name>
+                    <script>raiseEvent(&quot;playBeep&quot;)
+tempTimer(0.3, [[ raiseEvent(&quot;playBeep&quot;) ]])
+tempTimer(0.6, [[ raiseEvent(&quot;playBeep&quot;) ]])
+selectCurrentLine()
+deleteLine()
+cecho(&quot;&lt;red&gt;\n[    BLOK    ]\n[    BLOK    ] &quot; .. matches[3] .. &quot; przymierza sie do odciecia ci drogi ucieczki.\n[    BLOK    ]\n&quot;)
+resetFormat()</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>(^[ &gt;]*([a-zA-Z (),!]+) przymierza sie do odciecia ci drogi ucieczki\.$)</string>
+                    </regexCodeList>
+                    <regexCodePropertyList>
+                        <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>ftpd-blokowanie_proba_kogos</name>
                     <script>if matches[4] == &quot;ci&quot; then
   return
 end
 
-raiseEvent(&quot;playBeep&quot;)
-tempTimer(0.3, [[ raiseEvent(&quot;playBeep&quot;) ]])
 selectCurrentLine()
 deleteLine()
 cecho(&quot;&lt;coral&gt;\n\n[    BLOK    ] &quot; .. matches[2])
@@ -1119,17 +1143,14 @@ resetFormat()</script>
   tempTimer(0.6, [[ raiseEvent(&quot;playBeep&quot;) ]])
   tempTimer(0.9, [[ raiseEvent(&quot;playBeep&quot;) ]])
   tempTimer(1.2, [[ raiseEvent(&quot;playBeep&quot;) ]])
-  selectCurrentLine()
-  local str_replace = &quot;[    BLOK    ] &quot;
-  fg(&quot;red&quot;)
-  prefix(str_replace)
-  selectString(matches[2], 1)
+  deleteLine()
+  cecho(&quot;&lt;red&gt;\n[    BLOK    ]\n[    BLOK    ] &quot;)
   bg(&quot;red&quot;)
   fg(&quot;white&quot;)
+  echo(matches[2])
+  cecho(&quot;&lt;red&gt;\n[    BLOK    ]\n&quot;)
   resetFormat()
 else
-  raiseEvent(&quot;playBeep&quot;)
-  tempTimer(0.3, [[ raiseEvent(&quot;playBeep&quot;) ]])
   selectCurrentLine()
   local str_replace = &quot;[    BLOK    ] &quot;
   fg(&quot;coral&quot;)
@@ -1192,7 +1213,7 @@ resetFormat()</script>
                     <script>raiseEvent(&quot;playBeep&quot;)
 selectCurrentLine()
 deleteLine()
-cecho(&quot;\n\n&lt;red&gt;[    BRON    ] &quot; .. matches[2] .. &quot;\n\n&quot;)
+cecho(&quot;&lt;red&gt;\n[    BRON    ]\n[    BRON    ] &quot; .. matches[2] .. &quot;\n[    BRON    ]\n&quot;)
 resetFormat()
 scripts.ui:info_action_update(&quot;WYTRACENIE&quot;)</script>
                     <triggerType>0</triggerType>
@@ -1221,7 +1242,7 @@ tempTimer(0.3, [[ raiseEvent(&quot;playBeep&quot;) ]])
 tempTimer(0.6, [[ raiseEvent(&quot;playBeep&quot;) ]])
 selectCurrentLine()
 deleteLine()
-cecho(&quot;&lt;red&gt;\n\n[    STUN    ] &quot; .. matches[1] .. &quot;\n\n&quot;)
+cecho(&quot;&lt;red&gt;\n[    STUN    ]\n[    STUN    ] &quot; .. matches[1] .. &quot;\n[    STUN    ]\n&quot;)
 scripts.ui:info_action_update(&quot;OGLUSZENIE&quot;)
 resetFormat()
 </script>
@@ -1257,7 +1278,7 @@ resetFormat()
                     <script>raiseEvent(&quot;playBeep&quot;)
 selectCurrentLine()
 deleteLine()
-cecho(&quot;&lt;LawnGreen&gt;\n\n[    STUN    ] &quot; .. matches[1] .. &quot;\n\n&quot;)
+cecho(&quot;&lt;green&gt;\n[    STUN    ]\n[    STUN    ] &lt;cornsilk&gt;&quot; .. matches[1] ..  &quot;&lt;green&gt;\n[    STUN    ]\n&quot;)
 resetFormat()
 scripts.ui:info_action_update(&quot;&quot;)</script>
                     <triggerType>0</triggerType>