From e4f073f580e9806062fd6195c33213947364c68c Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 22 Sep 2020 23:30:22 +0200
Subject: [PATCH] Restore.

---
 ftpd-pack.xml | 162 +++++++++++---------------------------------------
 1 file changed, 36 insertions(+), 126 deletions(-)

diff --git a/ftpd-pack.xml b/ftpd-pack.xml
index 6a57d32..66db98b 100644
--- a/ftpd-pack.xml
+++ b/ftpd-pack.xml
@@ -62,7 +62,7 @@ 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">
+			<Trigger isActive="no" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
 				<name>ftpd-idle-beep</name>
 				<script>raiseEvent("playBeep")</script>
 				<triggerType>0</triggerType>
@@ -1375,32 +1375,6 @@ resetFormat()</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>ftpd-szarza</name>
-					<script>raiseEvent("playBeep")
-deleteLine()
-cecho("\n\n&lt;white,red&gt;XXXXXXXXXXXXXXXXXXXX ---    ! SZARZA !    --- XXXXXXXXXXXXXXXXXXXX\n")
-cecho("&lt;white,red&gt;XXXXXXXXXXXXXXXXXXXX ---    ! SZARZA !    --- XXXXXXXXXXXXXXXXXXXX\n")
-cecho("&lt;white,red&gt;XXXXXXXXXXXXXXXXXXXX ---    ! SZARZA !    --- XXXXXXXXXXXXXXXXXXXX\n\n")
-cecho("&lt;white,red&gt;" .. matches[1] .. "\n")
-resetFormat()</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>.* rusza w twoim kierunku, szybko zmniejszajac dzielaca was odleglosc.*</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>ftpd-walczysz_bez_broni</name>
 					<script>selectCurrentLine()
@@ -2132,25 +2106,21 @@ end	</script>
 					<regex></regex>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-zs</name>
-						<script>send("otworz przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)
-send("wez " .. matches[2] .. " z przytroczonej " .. scripts.inv:get_bag_string_dopelniacz("money"), false)
-send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)</script>
+						<script>scripts.inv:get_from_bag({ matches[2] }, "money", 1)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/zs (.*)$</regex>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-ds</name>
-						<script>send("otworz przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)
-send("wloz " .. matches[2] .. " do przytroczonej " .. scripts.inv:get_bag_string_dopelniacz("money"), false)
-send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)</script>
+						<script>scripts.inv:put_into_bag({ matches[2] }, "money", 1)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/ds (.*)$</regex>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-os</name>
-						<script>send("zajrzyj do przytroczonej " .. scripts.inv:get_bag_string_dopelniacz("money"), false)</script>
+						<script>send("zajrzyj do przytroczonej sakiewki", false)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/os$</regex>
@@ -2160,7 +2130,7 @@ send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), fal
 						<script>if matches[2] == "monety" then
   expandAlias("wem", false)
 else
-  send("wez " .. matches[2] .. " z zalozonego " .. scripts.inv:get_bag_string_dopelniacz("other"), false)
+  scripts.inv:get_from_bag({ matches[2] }, "other", 1)
 end</script>
 						<command></command>
 						<packageName></packageName>
@@ -2169,9 +2139,9 @@ end</script>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-dp</name>
 						<script>if matches[2] == "monety" then
-  expandAlias("wlm", false)
+  expandAlias("wem", false)
 else
-	send("wloz " .. matches[2] .. " do zalozonego " .. scripts.inv:get_bag_string_dopelniacz("other"), false)
+  scripts.inv:put_into_bag({ matches[2] }, "other", 1)
 end</script>
 						<command></command>
 						<packageName></packageName>
@@ -2179,14 +2149,14 @@ end</script>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-op</name>
-						<script>send("zajrzyj do zalozonego " .. scripts.inv:get_bag_string_dopelniacz("other"), false)</script>
+						<script>send("zajrzyj do zalozonego plecaka", false)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/op$</regex>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-np</name>
-						<script>send("napelnij zalozony " .. scripts.inv:get_bag_string_biernik("other"), false)</script>
+						<script>sendAll("otworz zalozony plecak", "napelnij go", "zamknij go", false)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/np$</regex>
@@ -2217,24 +2187,6 @@ send("zamknij przytroczony woreczek", false)
 						<packageName></packageName>
 						<regex>^/ow$</regex>
 					</Alias>
-					<Alias isActive="yes" isFolder="no">
-						<name>ftpd-wem-ftpd</name>
-						<script>send("otworz przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)
-send("wez monety z przytroczonej " .. scripts.inv:get_bag_string_dopelniacz("money"), false)
-send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)</script>
-						<command></command>
-						<packageName></packageName>
-						<regex>^wem$</regex>
-					</Alias>
-					<Alias isActive="yes" isFolder="no">
-						<name>ftpd-wlm-ftpd</name>
-						<script>send("otworz przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)
-send("wloz monety do przytroczonej " .. scripts.inv:get_bag_string_dopelniacz("money"), false)
-send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), false)</script>
-						<command></command>
-						<packageName></packageName>
-						<regex>^wlm$</regex>
-					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-get</name>
 						<script>sendAll("wez " .. matches[2],
@@ -2273,7 +2225,7 @@ send("zamknij przytroczona " .. scripts.inv:get_bag_string_biernik("money"), fal
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-sz</name>
-						<script>send("wez wszystkie zbroje z " .. scripts.inv:get_bag_string_dopelniacz("other"), false)
+						<script>expandAlias("/zp wszystkie zbroje", false)
 send("zaloz wszystkie zbroje", false)</script>
 						<command></command>
 						<packageName></packageName>
@@ -2281,8 +2233,7 @@ send("zaloz wszystkie zbroje", false)</script>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>ftpd-sd</name>
-						<script>send("wloz wszystkie zbroje do " .. scripts.inv:get_bag_string_dopelniacz("other"), false)
-</script>
+						<script>expandAlias("/dp wszystkie zbroje", false)</script>
 						<command></command>
 						<packageName></packageName>
 						<regex>^/sd$</regex>
@@ -2509,7 +2460,7 @@ echo("\n")</script>
 				</Alias>
 				<Alias isActive="yes" isFolder="no">
 					<name>ftpd-glow</name>
-					<script>scripts.temp_alias_colors:add_color(matches[2])</script>
+					<script>alias_func_skrypty_colors_tcolor()</script>
 					<command></command>
 					<packageName></packageName>
 					<regex>^/glow (.*)$</regex>
@@ -2535,14 +2486,6 @@ echo("\n")</script>
 					<packageName></packageName>
 					<regex>^/noidle$</regex>
 				</Alias>
-				<Alias isActive="yes" isFolder="no">
-					<name>ftpd-kond</name>
-					<script>scripts.ui.states_window_height=matches[2]
-scripts.ui:setup()</script>
-					<command></command>
-					<packageName></packageName>
-					<regex>^/kond (.*)$</regex>
-				</Alias>
 				<Alias isActive="yes" isFolder="no">
 					<name>ftpd-c</name>
 					<script>clearWindow()</script>
@@ -2648,21 +2591,6 @@ scripts.ui:setup()</script>
 					<regex>^/f8 (.*)$</regex>
 				</Alias>
 			</AliasGroup>
-			<AliasGroup isActive="yes" isFolder="yes">
-				<name>ftpd-places</name>
-				<script></script>
-				<command></command>
-				<packageName></packageName>
-				<regex></regex>
-				<Alias isActive="yes" isFolder="no">
-					<name>ftpd-cmentarz</name>
-					<script>expandAlias("/f5 zamknij sarkofag#otworz sarkofag#zamknij sarkofag", false)
-expandAlias("/f8 ob sarkofag")</script>
-					<command></command>
-					<packageName></packageName>
-					<regex>^/cmentarz$</regex>
-				</Alias>
-			</AliasGroup>
 			<AliasGroup isActive="yes" isFolder="yes">
 				<name>ftpd-combat</name>
 				<script></script>
@@ -2715,8 +2643,6 @@ expandAlias("/f8 ob sarkofag")</script>
 --                                             --
 -- Note that you can also use external Scripts --
 -------------------------------------------------
-tempTimer(1, function () disableAlias("wez_monety_z") end)
-tempTimer(1, function () disableAlias("wloz_monety_do") end)
 tempTimer(1, function () disableAlias("zapal lampe") end)
 tempTimer(1, function () disableAlias("zgas lampe") end)
 tempTimer(1, function () disableTrigger("przelamanie") end)
@@ -2728,7 +2654,6 @@ tempTimer(1, function () disableTrigger("wytracenie_tobie") end)
 tempTimer(1, function () disableTrigger("mozesz_dobywac") end)
 tempTimer(1, function () disableTrigger("ogluch") end)
 tempTimer(1, function () disableTrigger("powrot-z-oglucha") end)
-tempTimer(1, function () disableTrigger("masz_poczte") end)
 tempTimer(1, function () disableTrigger("zaslaniasz_ty") end)
 tempTimer(1, function () disableTrigger("tropienie-niepewny") end)
 tempTimer(1, function () disableTrigger("tropienie-pewny") end)
@@ -2745,22 +2670,27 @@ tempTimer(1, function () disableTrigger("jest_wyczerpana_working") end)
 			<Script isActive="yes" isFolder="no">
 				<name>ftpd-collect</name>
 				<packageName></packageName>
-				<script>function scripts.inv.collect:key_pressed(force)
+				<script>function scripts.inv.collect:key_pressed(force, index)
+  local from = "ciala"
+  if index ~= nil then
+    from = scripts.id_to_string_biernik[index] .. " ciala"
+  end
   if scripts.inv.collect.check_body or force == true then
     if scripts.inv.collect["current_mode"] == 1 or scripts.inv.collect["current_mode"] == 3
-       or scripts.inv.collect["current_mode"] == 4 or scripts.inv.collect["current_mode"] == 6 then
+      or scripts.inv.collect["current_mode"] == 4 or scripts.inv.collect["current_mode"] == 6 then
       if scripts.inv.collect.money_type == 1 then
-        sendAll("wez monety z ciala", true)
-			elseif scripts.inv.collect.money_type == 2 then
-        sendAll("wez srebrne monety z ciala", "wez zlote monety z ciala", true)
-		  elseif scripts.inv.collect.money_type == 3 then
-			  sendAll("wez zlote monety z ciala", true)
-		  end
+        sendAll("wez monety z " .. from, true)
+      elseif scripts.inv.collect.money_type == 2 then
+        sendAll("wez srebrne monety z " .. from, "wez zlote monety z " .. from, true)
+      elseif scripts.inv.collect.money_type == 3 then
+        sendAll("wez zlote monety z " .. from, true)
+      end
     end
     if scripts.inv.collect["current_mode"] == 2 or scripts.inv.collect["current_mode"] == 3
-       or scripts.inv.collect["current_mode"] == 5 or scripts.inv.collect["current_mode"] == 6 then
-      sendAll("wez kamienie z ciala", 
-              "ocen kamienie", false)
+      or scripts.inv.collect["current_mode"] == 5 or scripts.inv.collect["current_mode"] == 6 then
+      sendAll("wez kamienie z " .. from,
+      "ocen kamienie",
+      false)
     end
     scripts.inv.collect.check_body = false
   end
@@ -2772,11 +2702,13 @@ end</script>
 				<packageName></packageName>
 				<script>function scripts.utils.bind_functional(command, silent)
   scripts.utils.functional_key = command
-
   if not silent then
     cecho("\n\n" .. scripts.ui.bind_color .. "bind &lt;yellow&gt;" .. scripts.keybind:keybind_tostring("functional_key") .. scripts.ui.bind_color .. ": " .. command .. "\n\n")
     raiseEvent("playBeep")
   end
+  if remove_on_new_location then
+    scripts.utils.requested_removal_functional_key = true
+  end
 end</script>
 				<eventHandlerList />
 			</Script>
@@ -2791,11 +2723,11 @@ end</script>
 
     amap.walk_mode = id
     scripts:print_log("Zmieniam tryb chodzenia.")
-    scripts.ui.footer_info_sneaky:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Przemykam:&lt;/font&gt; " .. scripts.ui["footer_info_walk_mode_to_text"][amap.walk_mode] .. "&lt;/font&gt;")
+    scripts.ui.footer_info_sneaky:echo("&lt;font color='" .. scripts.ui["footer_info_normal"] .. "'&gt;Przemykam:&lt;/font&gt; " .. scripts.ui["footer_info_walk_mode_to_text"][amap.walk_mode] .. "&lt;/font&gt;")
   else
-    amap.walk_mode = amap.walk_mode%3 + 1
+    amap.walk_mode = amap.walk_mode % 3 + 1
     scripts:print_log("Zmieniam tryb chodzenia.")
-    scripts.ui.footer_info_sneaky:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Przemykam:&lt;/font&gt; " .. scripts.ui["footer_info_walk_mode_to_text"][amap.walk_mode] .. "&lt;/font&gt;")
+    scripts.ui.footer_info_sneaky:echo("&lt;font color='" .. scripts.ui["footer_info_normal"] .. "'&gt;Przemykam:&lt;/font&gt; " .. scripts.ui["footer_info_walk_mode_to_text"][amap.walk_mode] .. "&lt;/font&gt;")
   end
 end</script>
 				<eventHandlerList />
@@ -2804,8 +2736,8 @@ end</script>
 				<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("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Atak:&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/font&gt; &lt;font color='"..scripts.ui["footer_info_neutral"].."'&gt;" .. ateam["footer_info_attack_mode_to_text"][ateam.attack_mode] .. "&lt;/font&gt;")
+  ateam.attack_mode = ateam.attack_mode % 3 + 1
+  scripts.ui.footer_info_attack_mode:echo("&lt;font color='" .. scripts.ui["footer_info_normal"] .. "'&gt;Atak:&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/font&gt; &lt;font color='" .. scripts.ui["footer_info_neutral"] .. "'&gt;" .. ateam["footer_info_attack_mode_to_text"][ateam.attack_mode] .. "&lt;/font&gt;")
   scripts:print_log("Zmieniam tryb ataku.")
 end</script>
 				<eventHandlerList />
@@ -3036,28 +2968,6 @@ end</script>
 end</script>
 				<eventHandlerList />
 			</Script>
-			<Script isActive="no" isFolder="no">
-				<name>ftpd_main_footer_updater_mode4_kazur</name>
-				<packageName></packageName>
-				<script>function scripts.ui:process_label_text_mode4(prefix, val, max, color)
-  if val == -1 then
-    return
-  end
-  local str = [[&lt;center&gt;&lt;font color='#b3b3b3'&gt;]] .. prefix .. [[ &lt;font  face="inversionz" size="5"&gt;&lt;font color="]] .. color .. [["&gt;]]
-    for tmpi = 1,val,1 do
-        str = str .. tmpi
-    end
-    str = str .. "&lt;/font&gt;" .. [[&lt;font color='#b3b3b3' background='#aaaaaa'&gt;]]
-    val = val + 1
-    for tmpi = val,max,1 do
-        str = str ..tmpi
-    end
-    str = str .. "&lt;/font&gt;&lt;/font&gt;&lt;/center&gt;"
-  return str
-end
-</script>
-				<eventHandlerList />
-			</Script>
 		</ScriptGroup>
 	</ScriptPackage>
 	<KeyPackage>