From a73e7023d072266aea1746ca9ee97bdec9bb2a97 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Mon, 27 Feb 2017 11:17:42 +0100
Subject: [PATCH] .

---
 aliases.xml  | 14 ++++++++++++++
 keys.xml     |  4 ++--
 scripts.xml  | 20 ++------------------
 triggers.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/aliases.xml b/aliases.xml
index 56bae5d..eacb1ab 100644
--- a/aliases.xml
+++ b/aliases.xml
@@ -413,6 +413,20 @@ echo(&quot;\n&quot;)</script>
                     <packageName></packageName>
                     <regex>^kkto$</regex>
                 </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>wns</name>
+                    <script></script>
+                    <command>wem;kup bilet;wejdz na statek;wlm</command>
+                    <packageName></packageName>
+                    <regex>^wns$</regex>
+                </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>zs</name>
+                    <script></script>
+                    <command>zejdz ze statku;wyskocz za burte</command>
+                    <packageName></packageName>
+                    <regex>^zs$</regex>
+                </Alias>
             </AliasGroup>
             <AliasGroup isActive="yes" isFolder="yes">
                 <name>tbinds</name>
diff --git a/keys.xml b/keys.xml
index 618ce94..cc09fe2 100644
--- a/keys.xml
+++ b/keys.xml
@@ -48,7 +48,7 @@
                 <command></command>
                 <keyCode>-1</keyCode>
                 <keyModifier>-1</keyModifier>
-                <Key isActive="yes" isFolder="no">
+                <Key isActive="no" isFolder="no">
                     <name>temp_bindf5</name>
                     <packageName></packageName>
                     <script>scripts.temp_binds.execute_temp_bind(&quot;f5&quot;)</script>
@@ -56,7 +56,7 @@
                     <keyCode>16777268</keyCode>
                     <keyModifier>0</keyModifier>
                 </Key>
-                <Key isActive="yes" isFolder="no">
+                <Key isActive="no" isFolder="no">
                     <name>temp_bindf6</name>
                     <packageName></packageName>
                     <script>scripts.temp_binds.execute_temp_bind(&quot;f6&quot;)</script>
diff --git a/scripts.xml b/scripts.xml
index ea94653..c349759 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -117,7 +117,7 @@ end</script>
                 <eventHandlerList/>
             </Script>
             <Script isActive="yes" isFolder="no">
-                <name>ftpd-binds</name>
+                <name>ftpd-beep-bind</name>
                 <packageName></packageName>
                 <script>function scripts.utils.bind_functional(command, silent)
   scripts.utils.functional_key = command
@@ -127,23 +127,7 @@ end</script>
     raiseEvent(&quot;playBeep&quot;)
   end
 end
-
-function scripts.utils.bind_functional_team_follow(line, command, delay, silent)
-  -- check whether the line contains the team leader name
-  if not line then
-    scripts.utils.bind_functional(command, delay, silent)
-    raiseEvent(&quot;ateamTeamFollowBind&quot;)
-  end
-
-  for k, v in pairs(ateam.team) do
-    if type(k) == &quot;number&quot; then
-      if ateam and ateam.objs and ateam.objs[k][&quot;team_leader&quot;] and string.find(line, ateam.objs[k][&quot;desc&quot;]) then
-        scripts.utils.bind_functional(command, silent)
-        raiseEvent(&quot;ateamTeamFollowBind&quot;)
-      end
-    end
-  end
-end</script>
+</script>
                 <eventHandlerList/>
             </Script>
             <Script isActive="yes" isFolder="no">
diff --git a/triggers.xml b/triggers.xml
index 550d62c..6072479 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -84,6 +84,48 @@ end</script>
                     <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>team-mode-a</name>
+                <script>ateam.attack_mode = 1
+scripts.ui.footer_info_attack_mode:echo(&quot;&lt;font color='&quot;..scripts.ui[&quot;footer_info_normal&quot;]..&quot;'&gt;Atak:&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/font&gt; &lt;font color='&quot;..scripts.ui[&quot;footer_info_neutral&quot;]..&quot;'&gt;&quot; .. ateam[&quot;footer_info_attack_mode_to_text&quot;][ateam.attack_mode] .. &quot;&lt;/font&gt;&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>(Dolaczasz do druzyny|Porzucasz.* druzyne|Przekazujesz prowadzenie|i oprocz ciebie |zas ty jestes jej jedynym czlonkiem|Nie jestes w zadnej druzynie)</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>team-mode-aw</name>
+                <script>ateam.attack_mode = 2
+scripts.ui.footer_info_attack_mode:echo(&quot;&lt;font color='&quot;..scripts.ui[&quot;footer_info_normal&quot;]..&quot;'&gt;Atak:&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/font&gt; &lt;font color='&quot;..scripts.ui[&quot;footer_info_neutral&quot;]..&quot;'&gt;&quot; .. ateam[&quot;footer_info_attack_mode_to_text&quot;][ateam.attack_mode] .. &quot;&lt;/font&gt;&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>(dolacza do twojej druzyny|Przewodzisz druzynie|przekazuje ci prowadzenie druzyny)</string>
+                </regexCodeList>
+                <regexCodePropertyList>
+                    <integer>1</integer>
+                </regexCodePropertyList>
+            </Trigger>
             <TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
                 <name>colors</name>
                 <script></script>
@@ -254,7 +296,7 @@ resetFormat()</script>
                     <colorTriggerFgColor>#000000</colorTriggerFgColor>
                     <colorTriggerBgColor>#000000</colorTriggerBgColor>
                     <regexCodeList>
-                        <string>(ledwo muska|lekko rani|rani|powaznie rani|bardzo ciezko rani&quot;masakruje) (?!cie)</string>
+                        <string>( ledwo muska| lekko rani| rani| powaznie rani| bardzo ciezko rani| masakruje) (?!cie)</string>
                         <string>(ledwo muskajac|lekko raniac|raniac|powaznie raniac|bardzo ciezko raniac|masakrujac) (go|ja)</string>
                     </regexCodeList>
                     <regexCodePropertyList>