From d498758d8bd5c46897ab34914757c98b16a066da Mon Sep 17 00:00:00 2001 From: musashiden Date: Fri, 16 Jun 2006 16:23:39 +0000 Subject: - Corrected a duplicate juno warp + a juno guide sprite. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7209 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/guides/guides_yun.txt | 13 +++++++------ npc/warps/cities/yuno.txt | 7 +++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index fe97f0cb3..94a08ba2e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -37,6 +37,7 @@ Musashiden Date Added ====== 06/16 + * Corrected a duplicate juno warp + a juno guide sprite. [Musashiden] * Updated sample script mob_controller.cpp to the latest standards. [Lance] * Commited Silent's Fix to the duplicate NPCs [Playtester] - needs testing diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt index f5282d9d3..57e270cd2 100644 --- a/npc/guides/guides_yun.txt +++ b/npc/guides/guides_yun.txt @@ -15,7 +15,8 @@ //= 1.2 Optimized, updated common guide names [Lupus] //= 1.3 Updated the mini map localization function. [Musashiden] //= 1.4 Juno Guides are now up to date according to iRO. [Musashiden] -//= 1.5 Removed Duplicates [Silent] +//= 1.5 Removed Duplicates [Silent]. +//= 1.6 Changed one of the Juno soldier's sprite. [Musashiden] //============================================================ @@ -32,7 +33,7 @@ yuno.gat,153,47,4 script Juno Guide#yun1 700,{ } //===================================================================== -yuno.gat,334,182,4 script Juno Soldier#yun1 852,{ +yuno.gat,334,182,4 script Juno Soldier#yun1 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -93,7 +94,7 @@ yuno.gat,227,292,4 script Juno Soldier#yun3 105,{ } //===================================================================== -yuno.gat,165,283,4 script Yuno Soldier#yun3 105,{ +yuno.gat,165,283,4 script Yuno Soldier#yun4 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -119,7 +120,7 @@ yuno.gat,165,283,4 script Yuno Soldier#yun3 105,{ } //===================================================================== -yuno.gat,150,283,4 script Yuno Soldier#yun4 105,{ +yuno.gat,150,283,4 script Yuno Soldier#yun5 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -147,7 +148,7 @@ yuno.gat,150,283,4 script Yuno Soldier#yun4 105,{ } //===================================================================== -yuno.gat,165,228,4 script Yuno Soldier#yun5 105,{ +yuno.gat,165,228,4 script Yuno Soldier#yun6 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -172,7 +173,7 @@ yuno.gat,165,228,4 script Yuno Soldier#yun5 105,{ } //===================================================================== -yuno.gat,150,228,4 script Yuno Soldier#yun6 105,{ +yuno.gat,150,228,4 script Yuno Soldier#yun7 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 6d1270e05..0ddecf212 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -15,6 +15,7 @@ //= 1.3 Dr.Evil's yuno_05 warps update [Lupus] //= 1.4 optimized [Lupus] //= 1.5 Added Missing Juno warps [musashiden] +//= 1.6 Corrected duplicate warps [Musashiden] //============================================================ //= Yuno City ================================================ @@ -33,8 +34,8 @@ yuno.gat,196,138,0 warp yun11 1,1,yuno_in01.gat,32,33 yuno_in01.gat,32,36,0 warp yun12 1,1,yuno.gat,193,142 yuno.gat,264,87,0 warp yun13 1,1,yuno_in01.gat,168,101 yuno_in01.gat,168,104,0 warp yun14 1,1,yuno.gat,264,90 -yuno.gat,342,203,0 warp yun15 1,1,yuno_in04.gat,32,58 -yuno_in04.gat,28,58,0 warp yun16 1,1,yuno.gat,338,203 +yuno.gat,341,203,0 warp yun15 1,1,yuno_in04.gat,32,58 +yuno_in04.gat,29,58,0 warp yun16 1,1,yuno.gat,338,203 yuno_in04.gat,52,58,0 warp yun17 1,1,yuno_in04.gat,97,58 yuno_in04.gat,95,58,0 warp yun18 1,1,yuno_in04.gat,50,58 yuno_in04.gat,103,64,0 warp yun19 1,1,yuno_in04.gat,103,95 @@ -83,8 +84,6 @@ yuno_in02.gat,82,14,0 warp yun61 1,1,yuno_in05.gat,192,194 yuno_in05.gat,196,194,0 warp yun62 1,1,yuno_in02.gat,85,14 yuno.gat,157,320,0 warp yun63 1,1,yuno_pre.gat,69,13 yuno_pre.gat,69,10,0 warp yun64 1,1,yuno.gat,157,317 -yuno.gat,340,205,0 warp yun65 1,1,yuno_in04.gat,32,58 -yuno_in04.gat,29,58,0 warp yun66 1,1,yuno.gat,338,203 // Yuno In05 (Entering Random Warps) ------------------------------------------- yuno_in05.gat,153,141,0 script #yun63 45,1,1,{ -- cgit v1.2.3-70-g09d2