Juno's NPCs are now updated (unless i missed one) according to iRO! yay!

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7194 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 60 insertions, 40 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3543c44ba..eb8b5de77 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,7 @@ Musashiden
 Date		Added

 ======

 06/15

+	* Juno's NPCs are now updated (unless i missed one) according to iRO! yay! [Musashiden]

 	* Juno Update Process. 75% complete. [Musashiden]

 	* Fixed the gambling npc giving Orc Helm [1] instead of the non-slotted version. [MasterOfMuppets]

 	* Dr.Evil fixed some parts of his Umbala script [Playtester]

diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt
index 2ea96bfc0..3972e5026 100644
--- a/npc/guides/guides_yun.txt
+++ b/npc/guides/guides_yun.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= KitsuneStarwind, usul, kobra_k88

 //===== Current Version: ===================================== 

-//= 1.3

+//= 1.4

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -14,6 +14,7 @@
 //= 1.1 Changed sprites and cutins to Schwartzald Republic ones

 //= 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]

 //============================================================ 

 

 

@@ -30,33 +31,43 @@ yuno.gat,153,47,4	script	Juno Guide	700,{
 }

 

 //=====================================================================

-yuno.gat,333,182,2	script	Yuno Soldier	852,{

-	cutin "ein_soldier",2;

-	set @name$, "[Yuno Soldier]";

-	set @menu1$, "^5533FF'Dagger of Counter'^000000.....";

-	callfunc "F_YunoLoc",0;

-	mes "[Yuno Soldier]";

-	mes "Among the Sage class weapons, there is a dagger called ^5533FF'The Dagger of Counter'^000000.";

-	mes "It increases the chances for landing a critical attack and can only be used by Sages.";

+yuno.gat,334,182,4	script	Juno Soldier	852,{

+	mes "[Juno Soldier]";

+	mes "Welcome to Juno, the city of";

+	mes "noble-mindedness.";

 	next;

-	mes "[Yuno Soldier]";

-	mes "Not only is this dagger very useful but it is very stylish as well.";

-	callfunc "F_YunoLoc",1;

+	mes "[Juno Soldier]";

+	mes "Among the Sage's weapons, there is";

+	mes "a 'Dagger of Counter'.";

+	next;

+	mes "[Juno Soldier]";

+	mes "Its use is limited to the Sage";

+	mes "class, and it increases the chance";

+	mes "of inflicting critical attacks. So,";

+	mes "for Sages, that dagger can be very";

+	mes "useful, as well as make them look";

+	mes "stylish in battle.";

+	close;

 }

 

 //=====================================================================

-yuno.gat,264,320,2	script	Yuno Soldier	852,{

-	cutin "ein_soldier",2;

-	set @name$, "[Yuno Soldier]";

-	set @menu1$, "Holy shield, ^5533FF'Sacred Mission'^000000.....";

-	callfunc "F_YunoLoc",0;

-	mes "[Yuno Soldier]";

-	mes "There is a holy shield named ^5533FF'Sacred Mission'^000000, that can only be used by Cusaders.";

-	mes "The shield itself is long and narrow and has the wings of an angel engraved on its front.";

+yuno.gat,263,320,4	script	Juno Soldier	105,{

+	mes "[Juno Soldier]";

+	mes "Welcome to Juno, the city of";

+	mes "noble-mindedness.";

+	next;

+	mes "[Juno Soldier]";

+	mes "There is a holy shield named";

+	mes "'Sacred Mission' which can only be";

+	mes "used by Crusaders.";

 	next;

-	mes "[Yuno Soldier]";

-	mes "This shield is especially effective against the undead and other demonic monsters.";

-	callfunc "F_YunoLoc",1;

+	mes "[Juno Soldier]";

+	mes "It's a long and narrow shield with";

+	mes "an angel wing engraved in the";

+	mes "center of the front side. Against";

+	mes "Devil and Undead monsters, it is";

+	mes "especially powerful.";

+	close;

 }

 

 //=====================================================================

@@ -82,18 +93,28 @@ yuno.gat,227,292,4	script	Juno Soldier	105,{
 

 //=====================================================================

 yuno.gat,165,283,4	script	Yuno Soldier	105,{

-	cutin "ein_soldier",2;

-	set @name$, "[Yuno Soldier]";

-	set @menu1$, "^FF3355'Geographer'^000000.....";

-	callfunc "F_YunoLoc",0;

-	mes "[Yuno Soldier]";

-	mes "There is a monster called the ^FF3355'Geographer'^000000 that looks like a flower in bloom.";

-	mes "Although it is planted firmly into the ground, this creature has the ability to extend itself a great distance.";

+	mes "[Juno Soldier]";

+	mes "Welcome to Juno, the city of";

+	mes "noble-mindedness.";

 	next;

-	mes "[Yuno Soldier]";

-	mes "Its name comes from a story about a poor geographer who was eaten by one of these monsters while studying.";

-	mes "Unless you want to end up like that poor geographer, I suggest you stay away from these creatures.";

-	callfunc "F_YunoLoc",1;

+	mes "[Juno Soldier]";

+	mes "Geographer...";

+	mes "That monster looks like a flower";

+	mes "blooming from the ground.";

+	next;

+	mes "[Juno Soldier]";

+	mes "Strangely, it can extend its body a";

+	mes "long distance. Even if you're far";

+	mes "away from it, it can still pose a";

+	mes "threat.";

+	next;

+	mes "[Juno Soldier]";

+	mes "The name of this monster originated";

+	mes "from a story about a poor";

+	mes "geographer who, unfortunately, was";

+	mes "eaten by this monster while he was";

+	mes "immersed in his studies.";

+	close;

 }

 

 //=====================================================================

diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index c9ac46b51..6d1270e05 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -15,7 +15,6 @@
 //= 1.3 Dr.Evil's yuno_05 warps update [Lupus]

 //= 1.4 optimized [Lupus]

 //= 1.5 Added Missing Juno warps [musashiden]

-//= 1.6 Added Juno's Airport warps [Musashiden]

 //============================================================

 

 //= Yuno City ================================================

@@ -86,8 +85,6 @@ 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.gat,53,214,0	warp	yun67	1,1,y_airport.gat,143,23

-y_airport.gat,143,16,0	warp	yun68	1,1,yuno.gat,52,207

 

 // Yuno In05 (Entering Random Warps) -------------------------------------------

 yuno_in05.gat,153,141,0	script	#yun63	45,1,1,{

diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
index debd08afc..9efc9b79a 100644
--- a/npc/warps/other/airplane.txt
+++ b/npc/warps/other/airplane.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Sara-chan (1.0), SSUNNY@YOUNG(1.6)

 //===== Current Version: =====================================

-//= 1.61

+//= 1.7

 //===== Compatible With: =====================================

 //= Any Athena Version; RO Episode 8+

 //===== Description: =========================================

@@ -19,6 +19,7 @@
 //= 1.5 Uncomented the airplane warps and remove two unnecessary ones [MasterOfMuppets]

 //= 1.6 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]

 //= 1.61 Corrected the first einbroch warp [Zephiris]

+//= 1.7 Corrected Juno's Aiport entrance locations. [Musashiden]

 //============================================================

 

 //==========================================================================

@@ -52,8 +53,8 @@ y_airport.gat,125,14,0	warp	jairp1	1,1,y_airport.gat,19,20
 y_airport.gat,19,18,0	warp	jairp1a	1,1,y_airport.gat,123,14

 y_airport.gat,160,14,0	warp	jairp2	1,1,y_airport.gat,48,20

 y_airport.gat,48,18,0	warp	jairp2a	1,1,y_airport.gat,162,14

-yuno.gat,54,217,0	warp	jairp3	1,1,y_airport.gat,143,15

-y_airport.gat,143,13,0	warp	jairp3a	1,1,yuno.gat,54,215

+yuno.gat,53,214,0	warp	jairp3	1,1,y_airport.gat,143,23

+y_airport.gat,143,16,0	warp	jairp3a	1,1,yuno.gat,52,207

 yuno.gat,52,238,0	warp	jairp4a	1,1,y_airport.gat,143,60

 yuno.gat,55,238,0	warp	jairp5a	1,1,y_airport.gat,143,60

 yuno.gat,8,261,0	warp	jairp6	1,1,airplane_01.gat,224,64