summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-09-07 06:06:52 +0300
committerAndrei Karas <akaras@inbox.ru>2018-09-07 06:06:52 +0300
commitc614e4ec8017eb7e40dec7881db5dec921a41146 (patch)
tree779372bb5fb235c19ed3989660d1a416e826f33b
parent98a007e97fd6d0bf61dac19c9a430a6e4d7e853a (diff)
downloadserverdata-c614e4ec8017eb7e40dec7881db5dec921a41146.tar.gz
serverdata-c614e4ec8017eb7e40dec7881db5dec921a41146.tar.bz2
serverdata-c614e4ec8017eb7e40dec7881db5dec921a41146.tar.xz
serverdata-c614e4ec8017eb7e40dec7881db5dec921a41146.zip
Fix warp bugs again in tmx_map converter.
Affected by tmwa broken warps logic...
-rw-r--r--npc/001-2-14/_warps.txt2
-rw-r--r--npc/001-2-19/_warps.txt2
-rw-r--r--npc/001-2-27/_warps.txt2
-rw-r--r--npc/001-2-33/_warps.txt2
-rw-r--r--npc/001-2-36/_warps.txt2
-rw-r--r--npc/001-2-4/_warps.txt2
-rw-r--r--npc/001-2-40/_warps.txt2
-rw-r--r--npc/001-2-42/_warps.txt2
-rw-r--r--npc/008-2-17/_warps.txt2
-rw-r--r--npc/008-2-21/_warps.txt2
10 files changed, 10 insertions, 10 deletions
diff --git a/npc/001-2-14/_warps.txt b/npc/001-2-14/_warps.txt
index 92dff892..4ae630aa 100644
--- a/npc/001-2-14/_warps.txt
+++ b/npc/001-2-14/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-14: Basement warps
-001-2-14,26,29,0 warp #001-2-14_26_27 1,0,001-2-12,30,28
+001-2-14,26,27,0 warp #001-2-14_26_27 1,0,001-2-12,30,28
diff --git a/npc/001-2-19/_warps.txt b/npc/001-2-19/_warps.txt
index fa091719..cb48d355 100644
--- a/npc/001-2-19/_warps.txt
+++ b/npc/001-2-19/_warps.txt
@@ -25,7 +25,7 @@ OnInit:
}
001-2-19,33,38,0 warp #001-2-19_33_38 0,0,001-1,101,37
-001-2-19,41,57,0 warp #001-2-19_41_55 0,0,001-2-20,29,27
+001-2-19,41,55,0 warp #001-2-19_41_55 0,0,001-2-20,29,27
001-2-19,41,47,0 script #001-2-19_41_47_h NPC_HIDDEN,0,0,{
OnTouch:
warp "001-1", 104, 42;
diff --git a/npc/001-2-27/_warps.txt b/npc/001-2-27/_warps.txt
index 60537f04..e69b24d1 100644
--- a/npc/001-2-27/_warps.txt
+++ b/npc/001-2-27/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-27: Blacksmith Shop warps
-001-2-27,35,39,0 warp #001-2-27_35_35 0,0,001-1,101,108
+001-2-27,35,35,0 warp #001-2-27_35_35 0,0,001-1,101,108
diff --git a/npc/001-2-33/_warps.txt b/npc/001-2-33/_warps.txt
index 0f913422..2b27d09e 100644
--- a/npc/001-2-33/_warps.txt
+++ b/npc/001-2-33/_warps.txt
@@ -48,6 +48,6 @@ OnInit:
001-2-33,45,28,0 warp #001-2-33_45_28 0,0,001-2-38,24,28
001-2-33,23,28,0 warp #001-2-33_23_28 0,0,001-2-37,36,28
-001-2-33,25,44,0 warp #001-2-33_25_40 2,0,001-2-40,27,46
+001-2-33,25,40,0 warp #001-2-33_25_40 2,0,001-2-40,27,46
001-2-33,43,40,0 warp #001-2-33_43_40 2,0,001-2-40,45,46
001-2-33,34,46,0 warp #001-2-33_34_46 0,0,001-1,57,42
diff --git a/npc/001-2-36/_warps.txt b/npc/001-2-36/_warps.txt
index 9e9c6c70..389a06e4 100644
--- a/npc/001-2-36/_warps.txt
+++ b/npc/001-2-36/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-36: unnamed warps
-001-2-36,37,30,0 warp #001-2-36_37_29 0,0,001-2-34,24,29
+001-2-36,37,29,0 warp #001-2-36_37_29 0,0,001-2-34,24,29
diff --git a/npc/001-2-4/_warps.txt b/npc/001-2-4/_warps.txt
index dc331e97..af130c27 100644
--- a/npc/001-2-4/_warps.txt
+++ b/npc/001-2-4/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-4: Library warps
001-2-4,48,41,0 warp #001-2-4_48_41 0,0,001-1,51,81
-001-2-4,57,29,0 warp #001-2-4_57_26 3,0,001-2-6,57,36
+001-2-4,57,26,0 warp #001-2-4_57_26 3,0,001-2-6,57,36
001-2-4,52,27,0 script #001-2-4_52_27_h NPC_HIDDEN,0,0,{
OnTouch:
warp "001-2-5", 28, 37;
diff --git a/npc/001-2-40/_warps.txt b/npc/001-2-40/_warps.txt
index 83550f10..89c5c721 100644
--- a/npc/001-2-40/_warps.txt
+++ b/npc/001-2-40/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-40: unnamed warps
001-2-40,45,44,0 warp #001-2-40_45_44 2,0,001-2-33,43,39
-001-2-40,27,47,0 warp #001-2-40_27_44 2,0,001-2-33,25,39
+001-2-40,27,44,0 warp #001-2-40_27_44 2,0,001-2-33,25,39
diff --git a/npc/001-2-42/_warps.txt b/npc/001-2-42/_warps.txt
index 508aae1b..d8b06045 100644
--- a/npc/001-2-42/_warps.txt
+++ b/npc/001-2-42/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-2-42: Docks Warehouse Second Level warps
-001-2-42,39,38,0 warp #001-2-42_39_37 2,0,001-2-18,39,28
+001-2-42,39,37,0 warp #001-2-42_39_37 2,0,001-2-18,39,28
diff --git a/npc/008-2-17/_warps.txt b/npc/008-2-17/_warps.txt
index 9857c005..1010521a 100644
--- a/npc/008-2-17/_warps.txt
+++ b/npc/008-2-17/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 008-2-17: Mining Camp warps
008-2-17,52,40,0 warp #008-2-17_52_40 0,0,008-1,236,40
-008-2-17,25,42,0 warp #008-2-17_25_39 1,0,008-2-18,22,24
+008-2-17,25,39,0 warp #008-2-17_25_39 1,0,008-2-18,22,24
008-2-17,24,34,0 warp #008-2-17_24_34 0,0,008-2-19,20,29
diff --git a/npc/008-2-21/_warps.txt b/npc/008-2-21/_warps.txt
index 90e3be7f..5dd0f6f5 100644
--- a/npc/008-2-21/_warps.txt
+++ b/npc/008-2-21/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 008-2-21: Forsaken Inn Basement warps
-008-2-21,34,27,0 warp #008-2-21_34_26 1,0,008-2-20,35,36
+008-2-21,34,26,0 warp #008-2-21_34_26 1,0,008-2-20,35,36
008-2-21,22,43,0 warp #008-2-21_22_43 0,0,008-1,252,212