From 7b0d13d7b947e22fbc220e5bccf7d42ee267471c Mon Sep 17 00:00:00 2001
From: musashiden <musashiden@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 16 Jun 2006 04:10:26 +0000
Subject: -Juno Update Process. 75% complete.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7193 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt         |  1 +
 npc/guides/guides_yun.txt | 95 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 35 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4a3d11be0..3543c44ba 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,7 @@ Musashiden
 Date		Added
 ======
 06/15
+	* 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]
 	* Updated the color codes on the Juno Guides mini map illustrations. [Musashiden]
diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt
index f5c39f594..2ea96bfc0 100644
--- a/npc/guides/guides_yun.txt
+++ b/npc/guides/guides_yun.txt
@@ -81,7 +81,7 @@ yuno.gat,227,292,4	script	Juno Soldier	105,{
 }
 
 //=====================================================================
-yuno.gat,164,283,4	script	Yuno Soldier	852,{
+yuno.gat,165,283,4	script	Yuno Soldier	105,{
 	cutin "ein_soldier",2;
 	set @name$, "[Yuno Soldier]";
 	set @menu1$, "^FF3355'Geographer'^000000.....";
@@ -97,49 +97,74 @@ yuno.gat,164,283,4	script	Yuno Soldier	852,{
 }
 
 //=====================================================================
-yuno.gat,151,283,4	script	Yuno Soldier	852,{
-	cutin "ein_soldier",2;
-	set @name$, "[Yuno Soldier]";
-	set @menu1$, "^FF3355'Lava Golem'^000000.....";
-	callfunc "F_YunoLoc",0;
-	mes "[Yuno Soldier]";
-	mes "There is a monster called the ^FF3355'Lava Golem'^000000.";
-	mes "It is made out of stone heart that gained magical powers while being swept away by molten lava.";
+yuno.gat,150,283,4	script	Yuno Soldier	105,{
+	mes "[Juno Soldier]";
+	mes "Welcome to Juno, the city of";
+	mes "noble-mindedness.";
 	next;
-	mes "[Yuno Soldier]";
-	mes "The lava that dripps down its body is so hot that it can melt weapons and armor made out of even the highest quality steel.";
+	mes "[Juno Soldier]";
+	mes "there is a monster near here known";
+	mes "as Lava Golem. This golem is made";
+	mes "from a stone heart whose power";
+	mes "happened to be amplified with magic";
+	mes "power when it was swept away by";
+	mes "molten rock.";
 	next;
-	mes "[Yuno Soldier]";
-	mes "Be very careful if you ever encounter this monster.  Before you know it your equipment will become nothing more than metled pieces of junk.";
-	mes "More importantly, the damage it will inflict on you will turn you into a...... well I think you get the point......";
-	callfunc "F_YunoLoc",1;
+	mes "[Juno Soldier]";
+	mes "The lava dripping from its body is";
+	mes "so hot that it can melt down armor";
+	mes "and weapons made out of high";
+	mes "quality steel.";
+	next;
+	mes "[Juno Soldier]";
+	mes "You'd better be careful when you";
+	mes "encounter this monster. It will";
+	mes "damage armor and weapons in the";
+	mes "twinkling of an eye.";
+	close;
 }
 
 //=====================================================================
-yuno.gat,164,228,4	script	Yuno Soldier	852,{
-	cutin "ein_soldier",2;
-	set @name$, "[Yuno Soldier]";
-	set @menu1$, "Killer ^FF3355'Goats'^000000.....";
-	callfunc "F_YunoLoc",0;
-	mes "[Yuno Soldier]";
-	mes "^FF3355'Goats'^000000 are monsters that used to be antelopes that lived high up the montains of Yuno.";
-	mes "No one has ever survived a direct hit from a Goat's mighty horns.";
+yuno.gat,165,228,4	script	Yuno Soldier	105,{
+	mes "[Juno Soldier]";
+	mes "Welcome to Juno, the city of";
+	mes "noble-mindedness.";
 	next;
-	mes "[Yuno Soldier]";
-	mes "As fierce as those horns are, the legs of a Goat are also to be feared.  They are tough and strong because of all of the climbing Goats do.";
-	callfunc "F_YunoLoc",1;
+	mes "[Juno Soldier]";
+	mes "'Goat' is a monster that was an";
+	mes "antelope living in the high";
+	mes "mountains that was somehow turned";
+	mes "into a monster.";
+	next;
+	mes "[Juno Soldier]";
+	mes "Even if you manage to dodge to its";
+	mes "horns, you still need to be wary of";
+	mes "its powerful legs.";
+	next;
+	mes "[Juno Soldier]";
+	mes "Goat's legs are so strong because";
+	mes "it's always climbing cliffs when";
+	mes "it's not busy slaughtering the";
+	mes "innocent.";
+	close;
 }
 
 //=====================================================================
-yuno.gat,151,228,4	script	Yuno Soldier	852,{
-	cutin "ein_soldier",2;
-	set @name$, "[Yuno Soldier]";
-	set @menu1$, "Large Jellopy.....";
-	callfunc "F_YunoLoc",0;
-	mes "[Yuno Soldier]";
-	mes "Have you ever seen that extraordinarily large jellopy?? It's huuuuge!!! It's a very, very, large and shiny jellopy!!";
-	emotion 1;
-	callfunc "F_YunoLoc",1;
+yuno.gat,150,228,4	script	Yuno Soldier	105,{
+	mes "[Juno Soldier]";
+	mes "Welcome to Juno, the city of";
+	mes "noble-mindedness.";
+	next;
+	mes "[Juno Soldier]";
+	mes "Have you ever";
+	mes "seen a Large Jellopy?";
+	mes "Those things are huuuge!";
+	next;
+	mes "[Juno Soldier]";
+	mes "It's hard to believe";
+	mes "that such a large and";
+	mes "shining jellopy even exists!";
+	close;
 }
 
 
-- 
cgit v1.2.3-70-g09d2