diff options
-rw-r--r-- | maps/re/005-1.mcache | bin | 917 -> 938 bytes | |||
-rw-r--r-- | npc/000-1/exit.txt | 4 | ||||
-rw-r--r-- | npc/005-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/005-1/ayasha.txt | 4 | ||||
-rw-r--r-- | npc/005-1/soul-menhir.txt | 6 | ||||
-rw-r--r-- | npc/005-1/zegas.txt | 2 | ||||
-rw-r--r-- | npc/005-7/_warps.txt | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/maps/re/005-1.mcache b/maps/re/005-1.mcache Binary files differindex 0bb2524bc..dc4f56ddd 100644 --- a/maps/re/005-1.mcache +++ b/maps/re/005-1.mcache diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt index 5b290567b..e53379e18 100644 --- a/npc/000-1/exit.txt +++ b/npc/000-1/exit.txt @@ -43,8 +43,8 @@ OnVisitLX: OnInit: setarray $@LOCMASTER_LOC$, "Candor", "Tulim", "Halin", "Hurns", "LoF", "Lilit", "Nival", "Frostia"; setarray $@LOCMASTER_MAP$, "005-1", "003-1", "009-1", "012-1", "017-1", "018-5", "020-1", "024-1"; - setarray $@LOCMASTER_X, 34, 40, 26, 86, 119, 111, 56, 94; - setarray $@LOCMASTER_Y, 101, 49, 30, 69, 87, 53, 62, 42; + setarray $@LOCMASTER_X, 43, 40, 26, 86, 119, 111, 56, 94; + setarray $@LOCMASTER_Y, 99, 49, 30, 69, 87, 53, 62, 42; //debugmes "Locmaster: Index 0: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[0], $@LOCMASTER_MAP$[0], $@LOCMASTER_X[0], $@LOCMASTER_Y[0]; //debugmes "Locmaster: Index 2: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[2], $@LOCMASTER_MAP$[2], $@LOCMASTER_X[2], $@LOCMASTER_Y[2]; diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt index 70bb147a1..4c1964802 100644 --- a/npc/005-1/_warps.txt +++ b/npc/005-1/_warps.txt @@ -4,5 +4,5 @@ 005-1,41,84,0 warp #005-1_41_84 0,0,005-3,25,42 005-1,55,80,0 warp #005-1_55_80 0,0,005-4,25,42 005-1,46,78,0 warp #005-1_46_78 0,0,005-5,25,41 -005-1,29,100,0 warp #005-1_29_100 0,0,005-7,45,37 +005-1,34,99,0 warp #005-1_34_99 0,0,005-7,45,37 005-1,50,85,0 warp #005-1_50_85 0,0,005-6,33,42 diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index 2a12456dc..bbc0df0d5 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -316,7 +316,7 @@ OnInit: .distance = 1; end; } -005-1,30,94,0 script Faris NPC_CHILD7,{ +005-1,28,100,0 script Faris NPC_CHILD7,{ @kids = 1; if (getq(CandorQuest_HAS) == 2) { @@ -376,7 +376,7 @@ OnInit: .distance = 1; end; } -005-1,45,75,0 script Lilly NPC_CHILD6,{ +005-1,44,74,0 script Lilly NPC_CHILD6,{ @kids = 5; if (getq(CandorQuest_HAS) == 2) { diff --git a/npc/005-1/soul-menhir.txt b/npc/005-1/soul-menhir.txt index b3684e8e5..6ea59bf90 100644 --- a/npc/005-1/soul-menhir.txt +++ b/npc/005-1/soul-menhir.txt @@ -4,10 +4,10 @@ // Description: // Soul Menhir -005-1,36,102,0 script Soul Menhir#candor NPC_SOUL_MOSS,{ +005-1,43,97,0 script Soul Menhir#candor NPC_SOUL_MOSS,{ @map$ = "005-1"; - setarray @Xs, 34, 35, 34, 35, 34, 35, 35; - setarray @Ys, 101, 102, 103, 101, 102, 103, 102; + setarray @Xs, 42, 43, 44, 42, 44, 42, 43, 44; + setarray @Ys, 96, 96, 96, 97, 97, 98, 98, 98; @x = 0; @y = 0; callfunc "SoulMenhir"; diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt index fdd5a1580..d0b3d750c 100644 --- a/npc/005-1/zegas.txt +++ b/npc/005-1/zegas.txt @@ -4,7 +4,7 @@ // Description: // Saxso's widow. Asks new players to trigger a bug bomb in the storehouse. -005-1,42,87,0 script Zegas NPC_MONA,{ +005-1,43,85,0 script Zegas NPC_MONA,{ .ItemCreate = CandorShorts; .@q = getq(CandorQuest_Barrel); if (BaseLevel < 5) diff --git a/npc/005-7/_warps.txt b/npc/005-7/_warps.txt index 182902dd6..0a105e507 100644 --- a/npc/005-7/_warps.txt +++ b/npc/005-7/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-7: Training House warps -005-7,45,38,0 warp #005-7_45_38 0,0,005-1,29,101 +005-7,45,38,0 warp #005-7_45_38 0,0,005-1,34,100 |