summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <gauvain.dauchy@free.fr>2016-07-11 23:13:57 +0000
committerAlige <gauvain.dauchy@free.fr>2016-07-11 23:13:57 +0000
commitff3fd7758cdcdcf5415221cad1392a49d7e4a0eb (patch)
treeb6de7a266b7afede3e4a4786e2490e62c9c88417
parent1ddb6e598b48f1d6f5ecb253edb4b60099363a79 (diff)
parentf51e6e2f6929c7f05aa9ec52ca61ee7530282c0e (diff)
downloadserverdata-ff3fd7758cdcdcf5415221cad1392a49d7e4a0eb.tar.gz
serverdata-ff3fd7758cdcdcf5415221cad1392a49d7e4a0eb.tar.bz2
serverdata-ff3fd7758cdcdcf5415221cad1392a49d7e4a0eb.tar.xz
serverdata-ff3fd7758cdcdcf5415221cad1392a49d7e4a0eb.zip
Merge branch 'adjust_warp_to_fx' into 'master'
change warp coord. inn artis change warp coord. inn artis See merge request !16
-rw-r--r--npc/001-2-28/_warps.txt2
-rw-r--r--npc/001-2-29/_warps.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/001-2-28/_warps.txt b/npc/001-2-28/_warps.txt
index 38831824..ce36d7d9 100644
--- a/npc/001-2-28/_warps.txt
+++ b/npc/001-2-28/_warps.txt
@@ -1,4 +1,4 @@
// Map 001-2-28: Artis, Red Plush Inn
001-2-28,29,43,0 warp ToArtisMain#001-2-28 0,0,001-1,118,89
001-2-28,61,31,0 warp ToArtisRight#001-2-28 0,0,001-1,135,83
-001-2-28,33,25,0 warp ToSecondLevel#001-2-28 2,0,001-2-29,38,34
+001-2-28,33,26,0 warp ToSecondLevel#001-2-28 2,0,001-2-29,38,34
diff --git a/npc/001-2-29/_warps.txt b/npc/001-2-29/_warps.txt
index a99dd3fb..8dbe4ff2 100644
--- a/npc/001-2-29/_warps.txt
+++ b/npc/001-2-29/_warps.txt
@@ -1,3 +1,3 @@
// Map 001-2-29: Artis, Red Plush Inn, First Floor
-001-2-29,38,35,0 warp ToFirstLevel#001-2-29 2,0,001-2-28,33,26
+001-2-29,38,35,0 warp ToFirstLevel#001-2-29 2,0,001-2-28,33,27
001-2-29,38,27,0 warp ToThirdLevel#001-2-29 0,1,001-2-30,36,31