From 5ab0c1b619c1511392921e38cd0a70466c285be1 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Fri, 5 May 2017 17:24:59 +0200
Subject: [PATCH] .

---
 aliases.xml  | 19 +++++++++++++++----
 keys.xml     |  2 +-
 scripts.xml  | 26 +++++++++++++++++++++-----
 triggers.xml | 40 +++++++++++++++++++++++++++++++++++++---
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/aliases.xml b/aliases.xml
index 60753f3..fa3ab09 100644
--- a/aliases.xml
+++ b/aliases.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE MudletPackage>
-<MudletPackage version="1.0">
+<MudletPackage version="1.000">
     <AliasPackage>
         <AliasGroup isActive="yes" isFolder="yes">
             <name>ftpd-aliases</name>
@@ -240,12 +240,23 @@ expandAlias(&quot;/equal /bd&quot;, false)</script>
                 </Alias>
                 <Alias isActive="yes" isFolder="no">
                     <name>magik-drag</name>
-                    <script>expandAlias(&quot;/minus /zp drag#dobadz draga#/db1*1&quot;, false)
-expandAlias(&quot;/equal /ob1#/dp migotliwy mlot&quot;, false)</script>
+                    <script>expandAlias(&quot;/normal&quot;)
+scripts.inv.weapon1_action_on = &quot;wez migotliwa bron z zalozonego &quot;.. scripts.inv:get_bag_string_dopelniacz(&quot;other&quot;) .. &quot;; dobadz jej&quot;
+scripts.inv.weapon1_action_off = &quot;wloz migotliwa bron do &quot; .. scripts.inv:get_bag_string_dopelniacz(&quot;other&quot;)
+scripts.inv.main_weapons_action = {1, 2}</script>
                     <command></command>
                     <packageName></packageName>
                     <regex>^/drag$</regex>
                 </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>magik-ldrag</name>
+                    <script>scripts.inv.weapon2_action_on = &quot;wez migotliwa bron z zalozonego &quot;.. scripts.inv:get_bag_string_dopelniacz(&quot;other&quot;) .. &quot;; dobadz migotliwej broni&quot;
+scripts.inv.weapon2_action_off = &quot;wloz migotliwa bron do zalozonego &quot; .. scripts.inv:get_bag_string_dopelniacz(&quot;other&quot;)
+</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^/ldrag$</regex>
+                </Alias>
                 <Alias isActive="yes" isFolder="no">
                     <name>magik-mister</name>
                     <script>expandAlias(&quot;/normal&quot;)
@@ -391,7 +402,7 @@ echo(&quot;\n&quot;)</script>
                     <packageName></packageName>
                     <regex>^/glow (.*)$</regex>
                 </Alias>
-                <Alias isActive="yes" isFolder="no">
+                <Alias isActive="no" isFolder="no">
                     <name>wespnij-sie-na-gore</name>
                     <script>send(&quot;wejdz na gore&quot;, false)</script>
                     <command></command>
diff --git a/keys.xml b/keys.xml
index cc09fe2..b84b6ac 100644
--- a/keys.xml
+++ b/keys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE MudletPackage>
-<MudletPackage version="1.0">
+<MudletPackage version="1.000">
     <KeyPackage>
         <KeyGroup isActive="yes" isFolder="yes">
             <name>ftpd-keys</name>
diff --git a/scripts.xml b/scripts.xml
index c6bc726..efb5a7d 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE MudletPackage>
-<MudletPackage version="1.0">
+<MudletPackage version="1.000">
     <ScriptPackage>
         <ScriptGroup isActive="yes" isFolder="yes">
             <name>ftpd-scripts</name>
@@ -32,7 +32,9 @@ tempTimer(1, function () disableTrigger(&quot;mozesz_dobywac&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;ogluch&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;powrot-z-oglucha&quot;) end)
 tempTimer(1, function () disableTrigger(&quot;masz_poczte&quot;) end)
-tempTimer(1, function () disableScript(&quot;ui_new_location_event&quot;) end)</script>
+tempTimer(1, function () disableTrigger(&quot;zaslaniasz_ty&quot;) end)
+tempTimer(1, function () disableScript(&quot;ui_new_location_event&quot;) end)
+</script>
                 <eventHandlerList/>
             </Script>
             <Script isActive="yes" isFolder="no">
@@ -140,11 +142,13 @@ end</script>
                 <packageName></packageName>
                 <script>function scripts_ui_info_sneaky_click(id)
   if id then
-    if id &lt; 0 or id &gt; 2 then
+    if id &lt; 1 or id &gt; 3 then
       error(&quot;Wrong input&quot;)
     end
-    scripts:print_log(&quot;Zmieniam tryb chodzenia.&quot;)
+
     amap.walk_mode = id
+    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;)
   else
     amap.walk_mode = amap.walk_mode%3 + 1
     scripts:print_log(&quot;Zmieniam tryb chodzenia.&quot;)
@@ -259,7 +263,7 @@ function scripts.people:process_trigger_name(short)
 end</script>
                 <eventHandlerList/>
             </Script>
-            <Script isActive="no" isFolder="no">
+            <Script isActive="yes" isFolder="no">
                 <name>ftpd-amap-notes</name>
                 <packageName></packageName>
                 <script>function amap_db_check_note()
@@ -269,6 +273,18 @@ end</script>
       cecho(scripts.ui.bind_color .. &quot;\ninfo: &quot; .. scripts.ui.bind_color .. getRoomUserData(amap.curr.id, &quot;note&quot;) .. &quot;\n&quot;)
     end
   end
+end
+
+</script>
+                <eventHandlerList/>
+            </Script>
+            <Script isActive="yes" isFolder="no">
+                <name>ftpd-attack-mode</name>
+                <packageName></packageName>
+                <script>function scripts_ui_info_attack_mode_click()
+  ateam.attack_mode = ateam.attack_mode%3 + 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;)
+  scripts:print_log(&quot;Zmieniam tryb ataku.&quot;)
 end</script>
                 <eventHandlerList/>
             </Script>
diff --git a/triggers.xml b/triggers.xml
index 2cfae3a..3792b6d 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE MudletPackage>
-<MudletPackage version="1.0">
+<MudletPackage version="1.000">
     <TriggerPackage>
         <TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
             <name>ftpd-triggers</name>
@@ -518,10 +518,12 @@ resetFormat()</script>
                     <colorTriggerFgColor>#000000</colorTriggerFgColor>
                     <colorTriggerBgColor>#000000</colorTriggerBgColor>
                     <regexCodeList>
-                        <string>zrecznie zaslania .* przed twoimi ciosami.*</string>
+                        <string>zrecznie zaslania .* przed twoimi ciosami\.$</string>
+                        <string>z wprawa staje pomiedzy toba a .*, przyjmujac na siebie twoje nadchodzace ciosy.</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">
@@ -604,13 +606,13 @@ raiseEvent(&quot;playBeep&quot;)</script>
                     <colorTriggerFgColor>#000000</colorTriggerFgColor>
                     <colorTriggerBgColor>#000000</colorTriggerBgColor>
                     <regexCodeList>
-                        <string>.*(Zrecznie zaslaniasz|Na rozkaz .* zaslaniasz) .*</string>
                         <string>.* zagradzasz .* droge.*</string>
                         <string>.* szybko przesuwa sie za ciebie, kryjac sie przed .*</string>
                         <string>.* rzuca sie do ataku na ciebie!</string>
                         <string>.* wykorzystujac zaskoczenie przebija sie przez twoja ochrone.</string>
                         <string>.* atakuje cie!</string>
                         <string>.* rzuca sie na ciebie przebijajac sie przez twoja ochrone.</string>
+                        <string>Na rozkaz .* zaslaniasz .* przed ciosami .*</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
@@ -1235,6 +1237,38 @@ disableTimer(&quot;hidden_timer&quot;)</script>
                         <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">
+                    <name>fight_zaslaniasz</name>
+                    <script>selectCurrentLine()
+-- deleteLine()
+-- cecho(&quot;&lt;&quot;..scripts.gag_colors[&quot;zaslony_udane&quot;]..&quot;&gt;\n\n[ ZASLANIASZ ] &lt;white,red&gt;&quot; .. matches[2] .. &quot;\n\n&quot;)
+-- resetFormat()
+selectCurrentLine()
+bg(&quot;red&quot;)
+fg(&quot;white&quot;)
+resetFormat()
+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>(^[ &gt;]*Zrecznie zaslaniasz ([a-zA-Z (),!]+) przed ciosami ([a-zA-Z (),!]+)\.$)</string>
+                        <string>(^[ &gt;]*Z wprawa stajesz pomiedzy ([a-zA-Z (),!]+) a ([a-zA-Z (),!]+), przyjmujac na siebie nadchodzace ciosy\.$)</string>
+                        <string>(^[ &gt;]*Stajesz u boku ([a-zA-Z (),!]+), gotow w kazdej chwili zaslonic .* przed nadchodzacym niebezpieczenstwem\.$)</string>
+                    </regexCodeList>
+                    <regexCodePropertyList>
+                        <integer>1</integer>
+                        <integer>1</integer>
+                        <integer>1</integer>
+                    </regexCodePropertyList>
+                </Trigger>
             </TriggerGroup>
             <TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
                 <name>warns</name>