From 4de8721c8978f8ae4576c1b5ca111b003584f56e Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 3 Feb 2015 02:56:19 +0100
Subject: [PATCH] Uproszczenie i ustandardyzowanie chodzenia.

---
 common/map.tf      | 52 ++++++++++++++++++++++++++++++++--
 common/movement.tf | 70 ++--------------------------------------------
 2 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/common/map.tf b/common/map.tf
index f159ef7..ae05c5e 100644
--- a/common/map.tf
+++ b/common/map.tf
@@ -143,13 +143,59 @@
 /def -aL -mregexp -t'warn:' _map_prompt_warn = /test map_prompt_display("@{Crgb520}", "%{PR}")
 /def -aL -mregexp -t'alert:' _map_prompt_alert = /test map_prompt_display("@{Crgb500}", "%{PR}")
 
-/eval /def -F -q -mregexp -h'SEND ^(?:|przemknij (?:sie |)(?:z druzyna |))(%{_map_standard_exits})$$' _map_hooks_ide = \
+/eval /def -F -q -mregexp -h'SEND ^(%{_map_standard_exits})$$' _map_hooks_ide_normal = \
+  /set lwgo=1%%;\
+  /set lwlast=%%{P1}%%;\
+    /if ({dowalkcmd} =~ "1")\
+      /send %walkcmd%%;\
+    /endif%%;\
+  /def key_f12%%;\
+  /def key_nkp5%%;\
+  /hide off%%;\
   /_map_go exit:%%{P1}
 
-/eval /def -q -mregexp -h'SEND ^(%{_map_custom_exits})$$' _map_hooks_customy = \
+/eval /def -F -q -mregexp -h'SEND ^(przemknij (?:sie |)(?:z druzyna |))(%{_map_standard_exits})$$' _map_hooks_ide_sneak = \
+  /set lwgo=1%%;\
+  /set lwlast=%%{P2}%%;\
+    /if ({dowalkcmd} =~ "1")\
+      /send %walkcmd%%;\
+    /endif%%;\
+  /def key_f12%%;\
+  /def key_nkp5%%;\
+  /hide on%%;\
+  /_map_go exit:%%{P2}
+
+/eval /def -q -mregexp -h'SEND ^(%{_map_custom_exits})$$' _map_hooks_customy_normal = \
+  /set lwgo=1%%;\
+  /set lwlast=%%{P1}%%;\
+    /if ({dowalkcmd} =~ "1")\
+      /send %walkcmd%%;\
+    /endif%%;\
+  /def key_f12%%;\
+  /def key_nkp5%%;\
+  /hide off%%;\
   /_map_go custom:%%{P1}
 
-/eval /def -q -mregexp -h'SEND ^((%{_map_custom_exits_with_arg})( .*|))$$' _map_hooks_customy_2 = \
+/eval /def -q -mregexp -h'SEND ^(przemknij (?:sie |)(?:z druzyna |))(%{_map_custom_exits})$$' _map_hooks_customy_sneak = \
+  /set lwgo=1%%;\
+  /set lwlast=%%{P2}%%;\
+    /if ({dowalkcmd} =~ "1")\
+      /send %walkcmd%%;\
+    /endif%%;\
+  /def key_f12%%;\
+  /def key_nkp5%%;\
+  /hide on%%;\
+  /_map_go custom:%%{P2}
+
+/eval /def -q -mregexp -h'SEND ^((%{_map_custom_exits_with_arg})( .*|))$$' _map_hooks_customy2_normal = \
+  /set lwgo=1%%;\
+  /set lwlast=%%{P1}%%;\
+    /if ({dowalkcmd} =~ "1")\
+      /send %walkcmd%%;\
+    /endif%%;\
+  /def key_f12%%;\
+  /def key_nkp5%%;\
+  /hide off%%;\
   /_map_go custom:%%{P1}
 
 /eval /def -mregexp -Fp500 -t'(Wraz z (.*) podazasz|Podazasz)(?:| skradajac sie) za (.*?) (%{_map_follows_list})[.]$$' _map_podazam_za_kims_rozne = /_map_go follow:%%{P4}
diff --git a/common/movement.tf b/common/movement.tf
index eb197e8..1d10eea 100644
--- a/common/movement.tf
+++ b/common/movement.tf
@@ -63,6 +63,9 @@
   /else \
     /set dowalkcmd=1%;\
     /set walkcmd=%*%;\
+    /set lastmapon=%{_map_on}%;\
+    /load %{main_dir}/common/map.tf%;\
+    /set _map_on=%{lastmapon}%;\
   /endif
 
 /def idz = \
@@ -81,42 +84,6 @@
   /def key_f12%;\
   /def key_nkp5
 
-/def idzk = \
-  /set lwgo=1 %;\
-  /set lwlast=%{1} %;\
-  /send %{1} %;\
-    /if ({dowalkcmd} =~ "1")\
-      %walkcmd%;\
-    /endif%;\
-  /hide off %;\
-  /_map_go navigate:%{1}%;\
-  /def key_f12%;\
-  /def key_nkp5
-
-/def idzkp = \
-  /set lwgo=1 %;\
-  /set lwlast=%{1} %;\
-  /send przemknij %{1} %;\
-    /if ({dowalkcmd} =~ "1")\
-      %walkcmd%;\
-    /endif%;\
-  /hide on %;\
-  /_map_go navigate:%{1}%;\
-  /def key_f12%;\
-  /def key_nkp5
-
-/def idzkpt = \
-  /set lwgo=1 %;\
-  /set lwlast=%{1} %;\
-  /send przemknij sie z druzyna %{1} %;\
-    /if ({dowalkcmd} =~ "1")\
-      %walkcmd%;\
-    /endif%;\
-  /hide on %;\
-  /_map_go navigate:%{1}%;\
-  /def key_f12%;\
-  /def key_nkp5
-
 /def lw4=\
   /for a 0 12 /eval /unset _lw%%a %;\
   /set lwcount=0%;\
@@ -195,37 +162,6 @@
 /def key_nkp+ = /idz u
 /def key_nkp. = /idz d
 
-/def -mregexp -Fp2 -h'SEND ^n$'  = /idzk n
-/def -mregexp -Fp2 -h'SEND ^s$'  = /idzk s
-/def -mregexp -Fp2 -h'SEND ^w$'  = /idzk w
-/def -mregexp -Fp2 -h'SEND ^e$'  = /idzk e
-/def -mregexp -Fp2 -h'SEND ^nw$' = /idzk nw
-/def -mregexp -Fp2 -h'SEND ^ne$' = /idzk ne
-/def -mregexp -Fp2 -h'SEND ^sw$' = /idzk sw
-/def -mregexp -Fp2 -h'SEND ^se$' = /idzk se
-/def -mregexp -Fp2 -h'SEND ^d$'  = /idzk d
-/def -mregexp -Fp2 -h'SEND ^u$'  = /idzk u
-/def -mregexp -Fp2 -h'SEND ^przemknij n$' = /idzkp n
-/def -mregexp -Fp2 -h'SEND ^przemknij s$' = /idzkp s
-/def -mregexp -Fp2 -h'SEND ^przemknij w$' = /idzkp w
-/def -mregexp -Fp2 -h'SEND ^przemknij e$' = /idzkp e
-/def -mregexp -Fp2 -h'SEND ^przemknij nw$' = /idzkp nw
-/def -mregexp -Fp2 -h'SEND ^przemknij ne$' = /idzkp ne
-/def -mregexp -Fp2 -h'SEND ^przemknij sw$' = /idzkp sw
-/def -mregexp -Fp2 -h'SEND ^przemknij se$' = /idzkp se
-/def -mregexp -Fp2 -h'SEND ^przemknij d$' = /idzkp d
-/def -mregexp -Fp2 -h'SEND ^przemknij u$' = /idzkp u
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna n$' = /idzkpt n
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna s$' = /idzkpt s
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna w$' = /idzkpt w
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna e$' = /idzkpt e
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna nw$' = /idzkpt nw
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna ne$' = /idzkpt ne
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna sw$' = /idzkpt sw
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna se$' = /idzkpt se
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna d$' = /idzkpt d
-/def -mregexp -Fp2 -h'SEND ^przemknij sie z druzyna u$' = /idzkpt u
-
 /def sneak = \
   /if ( {1} =~ "off" ) \
     /set sneak %{1} %;\