From 7885176e403264eadcd7f8de7b1bdec49240b49d Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Fri, 17 Mar 2017 17:39:48 +0100
Subject: [PATCH] .

---
 aliases.xml  | 50 ++++++++++++++++++++++++++++++++++++++
 keys.xml     |  4 ++--
 scripts.xml  | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 triggers.xml |  2 ++
 werbat.txt   |  4 ++--
 5 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/aliases.xml b/aliases.xml
index 668dc5a..06665c4 100644
--- a/aliases.xml
+++ b/aliases.xml
@@ -524,6 +524,56 @@ echo(&quot;\n&quot;)</script>
                     <regex>^/equal (.*)$</regex>
                 </Alias>
             </AliasGroup>
+            <AliasGroup isActive="yes" isFolder="yes">
+                <name>places</name>
+                <script></script>
+                <command></command>
+                <packageName></packageName>
+                <regex></regex>
+                <Alias isActive="yes" isFolder="no">
+                    <name>cmentarz</name>
+                    <script>expandAlias(&quot;/f5 zamknij sarkofag#otworz sarkofag#zamknij sarkofag&quot;, false)
+expandAlias(&quot;/f8 ob sarkofag&quot;)</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^/cmentarz$</regex>
+                </Alias>
+            </AliasGroup>
+            <AliasGroup isActive="yes" isFolder="yes">
+                <name>combat</name>
+                <script></script>
+                <command></command>
+                <packageName></packageName>
+                <regex></regex>
+                <Alias isActive="yes" isFolder="no">
+                    <name>x</name>
+                    <script>ateam:zab2_func(matches[2])</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^x (.*)$</regex>
+                </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>xx</name>
+                    <script>send(&quot;zaskocz &quot; .. matches[2], false)</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^xx (.*)$</regex>
+                </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>x-noarg</name>
+                    <script>send(&quot;zabij cel ataku&quot;, true)</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^x$</regex>
+                </Alias>
+                <Alias isActive="yes" isFolder="no">
+                    <name>x-func</name>
+                    <script>ateam:zab_func(matches[2])</script>
+                    <command></command>
+                    <packageName></packageName>
+                    <regex>^x([0-9]+)$</regex>
+                </Alias>
+            </AliasGroup>
         </AliasGroup>
     </AliasPackage>
 </MudletPackage>
diff --git a/keys.xml b/keys.xml
index cc09fe2..433405a 100644
--- a/keys.xml
+++ b/keys.xml
@@ -48,7 +48,7 @@
                 <command></command>
                 <keyCode>-1</keyCode>
                 <keyModifier>-1</keyModifier>
-                <Key isActive="no" isFolder="no">
+                <Key isActive="yes" isFolder="no">
                     <name>temp_bindf5</name>
                     <packageName></packageName>
                     <script>scripts.temp_binds.execute_temp_bind(&quot;f5&quot;)</script>
@@ -72,7 +72,7 @@
                     <keyCode>16777270</keyCode>
                     <keyModifier>0</keyModifier>
                 </Key>
-                <Key isActive="no" isFolder="no">
+                <Key isActive="yes" isFolder="no">
                     <name>temp_bindf8</name>
                     <packageName></packageName>
                     <script>scripts.temp_binds.execute_temp_bind(&quot;f8&quot;)</script>
diff --git a/scripts.xml b/scripts.xml
index e891f37..c6bc726 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -204,6 +204,74 @@ end
 scripts.utils:enable_keybinds(true)</script>
                 <eventHandlerList/>
             </Script>
+            <Script isActive="yes" isFolder="no">
+                <name>ftpd-trigger-people</name>
+                <packageName></packageName>
+                <script>function scripts.people:process_person_trigger(text)
+  local to_select_string = text
+  local r, g, b
+
+  if scripts.people.trigger_suffix[string.lower(text)] then
+    to_select_string = to_select_string .. &quot; (&quot; .. scripts.people.trigger_suffix[string.lower(text)] .. &quot;)&quot;
+    selectString(text, 1)
+    r, g, b = getFgColor()
+    fg(&quot;slate_gray&quot;)
+    replace(to_select_string)
+  end
+
+  selectString(text, 1)
+  setFgColor(r, g, b)
+  resetFormat()
+end
+
+function scripts.people:process_trigger_name(short)
+  selectString(short, 1)
+  local add_text = &quot;&quot;
+
+  local obj = scripts.people.people_triggers_objects[scripts.people.people_triggers[string.lower(short)]]
+  local guild_name = scripts.people:get_guild_name(obj[&quot;guild&quot;])
+
+  if obj[&quot;name&quot;] ~= &quot;&quot; and guild_name then
+    add_text = obj[&quot;name&quot;] .. &quot;, &quot; .. guild_name
+  elseif obj[&quot;name&quot;] ~= &quot;&quot; then
+    add_text = obj[&quot;name&quot;]
+  elseif guild_name then
+    add_text = guild_name
+  end
+
+  local r, g, b = getFgColor()
+
+  replace(short .. &quot; (&quot; .. add_text .. &quot;)&quot;)
+
+  selectString(short, 1)
+  setFgColor(r, g, b)
+
+  if obj[&quot;name&quot;] ~= &quot;&quot; then
+    selectString(obj[&quot;name&quot;], 1)
+    fg(&quot;slate_grey&quot;)
+  end
+
+  if guild_name then
+    selectString(guild_name, 1)
+    fg(&quot;slate_grey&quot;)
+  end
+  resetFormat()
+end</script>
+                <eventHandlerList/>
+            </Script>
+            <Script isActive="no" isFolder="no">
+                <name>ftpd-amap-notes</name>
+                <packageName></packageName>
+                <script>function amap_db_check_note()
+  if amap.curr.id then
+    if getRoomUserData(amap.curr.id, &quot;note&quot;) ~= &quot;&quot; and amap.db.show_notes then
+      --amap:print_log(&quot;&lt;light_slate_blue&gt;&quot; .. getRoomUserData(amap.curr.id, &quot;note&quot;)) 
+      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>
         </ScriptGroup>
     </ScriptPackage>
 </MudletPackage>
diff --git a/triggers.xml b/triggers.xml
index 3492c2e..f406f7a 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -1630,10 +1630,12 @@ scripts.ui.footer_info_mail_click_bind = &quot;wyslij zwierze&quot;</script>
                     <regexCodeList>
                         <string>( polegl(a|o|)| umarl(a|o|))\.$</string>
                         <string>z gluchym jekiem pada bezwladnie na ziemie.</string>
+                        <string>zamiera na moment w bezruchu, po czym rozpada sie w proch.</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
                         <integer>0</integer>
+                        <integer>0</integer>
                     </regexCodePropertyList>
                 </Trigger>
             </TriggerGroup>
diff --git a/werbat.txt b/werbat.txt
index f78544b..2770431 100644
--- a/werbat.txt
+++ b/werbat.txt
@@ -358,8 +358,8 @@ scripts.gag_settings = {
   ["innych_uniki"] = 2,
   ["moje_parowanie"] = 2,
   ["innych_parowanie"] = 2,
-  ["zaslony_udane"] = 2,
-  ["zaslony_nieudane"] = 2,
+  ["zaslony_udane"] = 0,
+  ["zaslony_nieudane"] = 0,
   ["cele"] = 2,
   ["rozkazy"] = 2,
   ["ogluchy"] = 2,