From 98e49d9f9cc5bd25988c874a97cc554b8cd719da Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Mon, 25 Dec 2017 18:55:04 +0100
Subject: [PATCH] .

---
 scripts.xml  | 89 ++++++++++------------------------------------------
 triggers.xml | 13 +++++---
 2 files changed, 25 insertions(+), 77 deletions(-)

diff --git a/scripts.xml b/scripts.xml
index 97b7dd2..2fb53eb 100644
--- a/scripts.xml
+++ b/scripts.xml
@@ -28,88 +28,31 @@ 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 () disableTrigger(&quot;zaslaniasz_ty&quot;) end)
-tempTimer(1, function () disableScript(&quot;ui_new_location_event&quot;) end)
-</script>
+tempTimer(1, function () disableScript(&quot;ui_new_location_event&quot;) end)</script>
                 <eventHandlerList/>
             </Script>
             <Script isActive="yes" isFolder="no">
                 <name>ftpd-collect</name>
                 <packageName></packageName>
-                <script>scripts.inv[&quot;collect&quot;] = scripts.inv[&quot;collect&quot;] or {}
-scripts.inv.collect[&quot;modes&quot;] = {&quot;monety&quot;,
-                                &quot;kamienie&quot;,
-                                &quot;monety i kamienie&quot;,
-                                &quot;druzynowe monety&quot;,
-                                &quot;druzynowe kamienie&quot;,
-                                &quot;druzynowe monety i kamienie&quot;,
-                                &quot;nic&quot;}
-scripts.inv.collect[&quot;current_mode&quot;] = 3
-scripts.inv.collect[&quot;footer_info_collect_to_text&quot;] = {&quot;M&quot;, &quot;K&quot;, &quot;MK&quot;, &quot;M+&quot;, &quot;K+&quot;, &quot;M+K+&quot;, &quot;&quot;}
-scripts.ui.bind_color = &quot;&lt;LawnGreen&gt;&quot;
-
-function scripts.inv.collect:set_mode(mode)
-  if not scripts.inv.collect:check_option(mode) then
-    return
-  end
-  scripts.inv.collect[&quot;current_mode&quot;] = mode
-end
-
-function scripts.inv.collect:check_option(mode)
-  if not scripts.inv.collect[&quot;modes&quot;][mode] then
-    scripts:print_log(&quot;Nie ma takiej opcji, sprawdz /zbieranie&quot;)
-    return false
-  else
-    return true
-  end
-end
-
-function scripts.inv.collect:key_pressed(force)
+                <script>function scripts.inv.collect:key_pressed(force)
   if scripts.inv.collect.check_body or force == true then
-    if scripts.inv.collect[&quot;current_mode&quot;] == 1 or scripts.inv.collect[&quot;current_mode&quot;] == 4 then
-      sendAll(&quot;wez monety z ciala&quot;,
-              &quot;odloz miedziane monety&quot;, 
-              false)
-    elseif scripts.inv.collect[&quot;current_mode&quot;] == 2 or scripts.inv.collect[&quot;current_mode&quot;] == 5 then
-      sendAll(&quot;wez kamienie z ciala&quot;,
-              &quot;ocen kamienie&quot;,
-              false)      
-    elseif scripts.inv.collect[&quot;current_mode&quot;] == 3 or scripts.inv.collect[&quot;current_mode&quot;] == 6 then
-      sendAll(&quot;wez monety z ciala&quot;,
-              &quot;odloz miedziane monety&quot;,
-              &quot;wez kamienie z ciala&quot;, 
-              &quot;ocen kamienie&quot;,
-              false)
+    if scripts.inv.collect[&quot;current_mode&quot;] == 1 or scripts.inv.collect[&quot;current_mode&quot;] == 3
+       or scripts.inv.collect[&quot;current_mode&quot;] == 4 or scripts.inv.collect[&quot;current_mode&quot;] == 6 then
+      if scripts.inv.collect.money_type == 1 then
+        sendAll(&quot;wez monety z ciala&quot;, true)
+			elseif scripts.inv.collect.money_type == 2 then
+        sendAll(&quot;wez srebrne monety z ciala&quot;, &quot;wez zlote monety z ciala&quot;, true)
+		  elseif scripts.inv.collect.money_type == 3 then
+			  sendAll(&quot;wez zlote monety z ciala&quot;, true)
+		  end
+    end
+    if scripts.inv.collect[&quot;current_mode&quot;] == 2 or scripts.inv.collect[&quot;current_mode&quot;] == 3
+       or scripts.inv.collect[&quot;current_mode&quot;] == 5 or scripts.inv.collect[&quot;current_mode&quot;] == 6 then
+      sendAll(&quot;wez kamienie z ciala&quot;, 
+              &quot;ocen kamienie&quot;, false)
     end
     scripts.inv.collect.check_body = false
   end
-end
-
-function scripts.inv.collect:killed_action()
-  if scripts.inv.collect[&quot;current_mode&quot;] ~= 7 then
-    cecho(&quot;\n&quot; .. scripts.ui.bind_color .. &quot;[bind &lt;yellow&gt;ctrl+3]&quot; .. scripts.ui.bind_color .. &quot; wez z ciala\n&quot;)
-    scripts.inv.collect.check_body = true
-  end
-end
-
-function scripts.inv.collect:team_killed_action(name)
-  if scripts.inv.collect[&quot;current_mode&quot;] ~= 4 and scripts.inv.collect[&quot;current_mode&quot;] ~= 5
-     and scripts.inv.collect[&quot;current_mode&quot;] ~= 6 then
-    return
-  end
-
-  if ateam.team_names[name] then
-    cecho(&quot;\n&quot; .. scripts.ui.bind_color .. &quot;[bind &lt;yellow&gt;ctrl+3]&quot; .. scripts.ui.bind_color ..&quot; wez z ciala\n&quot;)
-    scripts.inv.collect.check_body = true
-  end
-end
-
-function scripts.inv.collect:print_help()
-  scripts:print_log(&quot;Wspierane opcje:&quot;)
-  for k, v in pairs(scripts.inv.collect[&quot;modes&quot;]) do
-    echo (k .. &quot; - &quot; .. v .. &quot;\n&quot;)
-  end
-  scripts:print_log(&quot;Aktualne ustawienie: &quot; .. scripts.inv.collect.modes[scripts.inv.collect[&quot;current_mode&quot;]])
-  scripts:print_log(&quot;Ustaw poprzez zawolanie '/zbieranie [numer opcji]&quot;)
 end</script>
                 <eventHandlerList/>
             </Script>
diff --git a/triggers.xml b/triggers.xml
index 94d6709..6c5c3e6 100644
--- a/triggers.xml
+++ b/triggers.xml
@@ -64,7 +64,7 @@ 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">
+            <Trigger isActive="yes" 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>
@@ -516,8 +516,6 @@ end
 
 selectCurrentLine()
 fg(&quot;coral&quot;)
-selectString(&quot;atakuje cie&quot;, 1)
-replace(&quot;ATAKUJE CIE&quot;)
 resetFormat()</script>
                     <triggerType>0</triggerType>
                     <conditonLineDelta>0</conditonLineDelta>
@@ -1878,7 +1876,14 @@ resetFormat()</script>
                 </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-przekazanie</name>
-                    <script></script>
+                    <script>raiseEvent(&quot;playBeep&quot;)
+selectCurrentLine()
+deleteLine()
+cecho(&quot;\n&lt;green&gt;XXXXXXXXXXXXXXXXXXXX &lt;white&gt;---    PROWADZISZ    --- &lt;green&gt;XXXXXXXXXXXXXXXXXXXX\n&quot;)
+cecho(&quot;&lt;green&gt;XXXXXXXXXXXXXXXXXXXX &lt;white&gt;---    PROWADZISZ    --- &lt;green&gt;XXXXXXXXXXXXXXXXXXXX\n&quot;)
+cecho(&quot;&lt;green&gt;XXXXXXXXXXXXXXXXXXXX &lt;white&gt;---    PROWADZISZ    --- &lt;green&gt;XXXXXXXXXXXXXXXXXXXX\n\n&quot;)
+cecho(&quot;&lt;green&gt;&quot; .. matches[1] .. &quot;\n&quot;)
+resetFormat()</script>
                     <triggerType>0</triggerType>
                     <conditonLineDelta>0</conditonLineDelta>
                     <mStayOpen>0</mStayOpen>