From f1142d9628259ea2e0b16bf5002c5398b022fcf3 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sat, 18 Feb 2017 16:31:57 +0100
Subject: [PATCH] Zmiany po 2.18a

---
 aliases.xml  | 34 +++++++++++++++++++++++++---------
 keys.xml     |  8 ++++++++
 scripts.xml  | 10 ++++++++++
 triggers.xml | 24 +++++++++++++++++++++++-
 werbat.txt   | 15 ++++++++++-----
 5 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/aliases.xml b/aliases.xml
index e1d94f1..0357a78 100644
--- a/aliases.xml
+++ b/aliases.xml
@@ -157,14 +157,14 @@ send(&quot;zamknij przytroczona &quot; .. scripts.inv:get_bag_string_biernik(&qu
                     </Alias>
                     <Alias isActive="yes" isFolder="no">
                         <name>get</name>
-                        <script>sendAll(&quot;wez &quot; .. matches[2] .. &quot;z ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z drugiego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z trzeciego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z czwartego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z piatego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z szostego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z siodmego ciala&quot;,
-        &quot;wez &quot; .. matches[2] .. &quot;z osmego ciala&quot;, false)</script>
+                        <script>sendAll(&quot;wez &quot; .. matches[2] .. &quot; z ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z drugiego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z trzeciego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z czwartego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z piatego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z szostego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z siodmego ciala&quot;,
+        &quot;wez &quot; .. matches[2] .. &quot; z osmego ciala&quot;, false)</script>
                         <command></command>
                         <packageName></packageName>
                         <regex>^/get (.*)$</regex>
@@ -227,8 +227,10 @@ end</script>
                 <regex></regex>
                 <Alias isActive="yes" isFolder="no">
                     <name>normal</name>
-                    <script>scripts.inv.weapon1_action_on = false
+                    <script>scripts.inv.weapon1_action_on = &quot;powyjmij bron z &lt;pojemnika&gt;; gzdobadz jej&quot;
+scripts.inv.weapon2_action_on = &quot;powyjmij bron z &lt;pojemnika&gt;; gzdobadz jej&quot;
 scripts.inv.weapon1_action_off = false
+scripts.inv.weapon2_action_off = false
 scripts.inv.main_weapons_action = {1, 2}</script>
                     <command></command>
                     <packageName></packageName>
@@ -365,6 +367,20 @@ echo(&quot;\n&quot;)</script>
                     <packageName></packageName>
                     <regex>^wespnij sie na gore$</regex>
                 </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>idle-on</name>
+                    <script>enableTrigger(&quot;idle-beep&quot;)</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^/idle$</regex>
+                </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>idle-off</name>
+                    <script>disableTrigger(&quot;idle-beep&quot;)</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^/noidle$</regex>
+                </Alias>
             </AliasGroup>
             <AliasGroup isActive="yes" isFolder="yes">
                 <name>misc</name>
diff --git a/keys.xml b/keys.xml
index 89011bb..61a0a6a 100644
--- a/keys.xml
+++ b/keys.xml
@@ -17,6 +17,14 @@
                 <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/scripts.xml b/scripts.xml
index 1c868fb..319878c 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -143,6 +143,16 @@ function scripts.utils.bind_functional_team_follow(line, command, delay, silent)
       end
     end
   end
+end</script>
+                <eventHandlerList/>
+            </Script>
+            <Script isActive="yes" isFolder="no">
+                <name>ftpd-sneaky-click</name>
+                <packageName></packageName>
+                <script>function scripts.ui:info_sneaky_click()
+  amap.walk_mode = amap.walk_mode%3 + 1
+  scripts:print_log(&quot;Zmieniam tryb chodzenia.&quot;)
+  scripts.ui.footer_info_sneaky:echo(&quot;&lt;font color='&quot;..scripts.ui[&quot;footer_info_normal&quot;]..&quot;'&gt;Przemykam:&lt;/font&gt; &quot; .. scripts.ui[&quot;footer_info_walk_mode_to_text&quot;][amap.walk_mode] .. &quot;&lt;/font&gt;&quot;)
 end</script>
                 <eventHandlerList/>
             </Script>
diff --git a/triggers.xml b/triggers.xml
index 6c5a9c1..2f1cedb 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -62,6 +62,26 @@ end</script>
                     <integer>1</integer>
                 </regexCodePropertyList>
             </Trigger>
+            <Trigger isActive="no" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                <name>idle-beep</name>
+                <script>raiseEvent(&quot;playBeep&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>(?&lt;!dylizans) przybywa(.$| z | ze )</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>
@@ -191,6 +211,7 @@ resetFormat()</script>
                         <string>^[ &gt;]*(Bardzo ciezko ranisz)</string>
                         <string>^[ &gt;]*(Masakrujesz)</string>
                         <string>.*(przeciwni.* rzucasz sie do ataku|Stajesz pewnie .* Bezlitosny,).*</string>
+                        <string>.*(uderzasz|doskakujesz).*(raniac|masakrujac).*</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
@@ -200,6 +221,7 @@ 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">
@@ -592,7 +614,7 @@ resetFormat()</script>
                     <colorTriggerFgColor>#000000</colorTriggerFgColor>
                     <colorTriggerBgColor>#000000</colorTriggerBgColor>
                     <regexCodeList>
-                        <string>.* (w swietnej kondycji|dobrym stanie)</string>
+                        <string>.* (w swietnej kondycji|w dobrym stanie)</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
diff --git a/werbat.txt b/werbat.txt
index c45cd0b..0073e26 100644
--- a/werbat.txt
+++ b/werbat.txt
@@ -172,8 +172,8 @@ scripts.inv.main_weapons_action = {1, 2}
 -- wtedy zamiast standardowego 'podobadz broni z ...' wykona zdefiniowane akcje.
 -- Trzeba pamietac o <pojemnika>, ktore automatycznie bedzie zastapione odpowiednia
 -- nazwa pojemnika.
-scripts.inv.weapon1_action_on = false
-scripts.inv.weapon2_action_on = false
+scripts.inv.weapon1_action_on = "powyjmij bron z <pojemnika>; gzdobadz jej"
+scripts.inv.weapon2_action_on = "powyjmij bron z <pojemnika>; gzdobadz jej"
 scripts.inv.weapon3_action_on = false
 
 -- To samo co powyzej ale dla opuszczania broni.
@@ -287,7 +287,7 @@ scripts.ui.footer_main_items_per_row = 3
 -- Wielkosc czcionki na rozy wiatrow (tych symboli i special exitow)
 scripts.ui.footer_map_font_size = 12
 -- Wielkosc czcionki na belce srodkowej i prawej
-scripts.ui.footer_font_size = 10
+scripts.ui.footer_font_size = 12
 -- Wielkosc czcionki w oknie stanow
 scripts.ui.states_font_size = 12
 
@@ -328,6 +328,11 @@ scripts.ui.bind_color = "<LawnGreen>"
 --
 scripts.magic_weapons_color = "orchid"
 
+--
+-- Kolor uzywany przy /tcolor (pomoc w '/bindy')
+  --
+scripts["tcolor_color"] = "orange"
+
 ------------------------------------------
 
 -- Konfiguracja gagow
@@ -363,7 +368,7 @@ scripts.gag_settings = {
 -- Tabela kolorow jest tutaj: http://wiki.mudlet.org/images/c/c3/ShowColors.png
 --
 scripts.gag_colors["moje_ciosy"] = "white"
-scripts.gag_colors["moje_spece"] = "white"
+scripts.gag_colors["moje_spece"] = "orchid"
 
 scripts.gag_colors["innych_ciosy"] = "slate_grey"
 scripts.gag_colors["innych_ciosy_we_mnie"] = "tomato"
@@ -436,7 +441,7 @@ amap.ui.active = false
 
 -- Czy uzywac skroconego listowania kierunkow
 -- false to wylaczone, true to wlaczone
-amap.shorten_exits = true
+amap.shorten_exits = false
 
 ------------------------------------------