- Juno Update Process. 30% complete.

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

3 files changed, 115 insertions, 73 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 68a742952..da81d384d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,7 @@ Musashiden
 Date		Added

 ======

 06/14

+	* Juno Update Process. 30% complete. [Musashiden]

 	* Some more sign quest warps [MasterOfMuppets]

 	* Fixed Job Level requirement for Auto-Berserk [Playtester]

 	* Fixed some experience gained bugs in two scripts. [MasterOfMuppets]

diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index ffb94833c..464deb5f0 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= KitsuneStarwind, kobra_k88

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

-//= 1.3

+//= 1.3.2

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

 //= eAthena 7.15 +

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

@@ -14,6 +14,7 @@
 //= Removed duplicate npcs already found in the sage quest.

 //= Fixed & Spellchecked [massdriller]

 //= 1.3 Started updating Juno NPCs based on iRO. 10% complete.

+//= 1.3.2 Started updating Juno NPCs based on iRO. 30% complete.

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

 

 

@@ -23,6 +24,45 @@
 //					NPCs Found outside

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

 

+//======================================================================================

+yuno.gat,208,164,4	script	Active little girl	101,{

+	mes "[Hisa]";

+	mes ".....";

+	mes "This town is so boring.";

+	mes "No events, no festivals...";

+	mes "All people do all day is stay";

+	mes "at home and study. How dull!";

+	close;

+}

+

+

+//======================================================================================

+yuno.gat,164,200,4	script	Noyee	101,{

+	mes "[Noyee]";

+	mes "Did you know that there's a";

+	mes "difference between the armor you";

+	mes "can buy from NPC shops and the";

+	mes "kinds you obtain from hunting";

+	mes "monsters?";

+	next;

+	mes "[Noyee]";

+	mes "The difference, my friend, is in";

+	mes "the number of ^5533FFslots^000000 in your armor.";

+	next;

+	mes "[Noyee]";

+	mes "The same kind of Armor will have";

+	mes "the same Defense. However, if an";

+	mes "Armor has a slot, you can insert a";

+	mes "Monster Card which will add an";

+	mes "enhancement to that armor.";

+	next;

+	mes "[Noyee]";

+	mes "Both Monster Cards and Slotted";

+	mes "Armors are rarely dropped by";

+	mes "monsters, and are thus valuable";

+	mes "commodies.";

+	close;

+}

 

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

 yuno.gat,184,173,4	script	Freidrich	729,{

@@ -255,91 +295,86 @@ yuno.gat,261,99,4	script	Sage Yklah	735,{
 }

 

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

-yuno.gat,306,207,6	script	Sage Sykla	735,{

-		mes "[Sykla]";

-		mes "There is talk about a suspicious man living somewhere here in Yuno.";

-		mes "Apparently he is a dangerous person who is immersed in some kind of wicked research.";

+yuno.gat,305,207,6	script	Sage Syklah	735,{

+		mes "[Syklah]";

+		mes "The people here keep talking of";

+		mes "some suspicious man living in";

+		mes "Juno.";

 		next;

-		mes "[Sykla]";

-		mes "This so called 'Mad Scientist' spends his time working on complex ideas that cannot be understood by normal people.";

+		mes "[Syklah]";

+		mes "Supposedly, he's pretty dangerous,";

+		mes "and is always immersing himself in";

+		mes "some kind of research.";

 		next;

-		mes "[Sykla]";

-		mes "Just outside of town you will find a monster called ^FF3355'Blazer'^000000.";

-		mes "This ball of magic flame attacks any living creature it finds with horrible spells such as fire bolt and fire ball.";

+		mes "[Syklah]";

+		mes "People already consider him a 'Mad";

+		mes "Scientist', wasting his time";

+		mes "studying impractical things beyond";

+		mes "the understanding of normal";

+		mes "people.";

 		next;

-		mes "[Sykla]";

-		mes "This hideous creature is feared my most, if not all, of the people here in Yuno.";

-		mes "But what's even more frightening than the monster itself, is the rumor that the mad scientist was the one who created it....";

+		mes "[Syklah]";

+		mes "It's rumored that this scientist is";

+		mes "responsible for creating 'Blazer',";

+		mes "a monster made of magic flame.";

 		next;

-		mes "[Sykla]";

-		mes "Imagine if this mad man were to create more of these creatures..... possibly create monsters even more powerful than Blazer....";

+		mes "[Syklah]";

+		mes "It's a dangerous and fearsome";

+		mes "monster that casts spells like Fire";

+		mes "Bolt and Fire Ball that lives";

+		mes "outside of Juno.";	

 		close;

 }

 

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

-yuno.gat,162,328,4	script	Sage Eskla	735,{

-	mes "[Eskla]";

-	mes "I remember seeing it once........ Yeah... I remember now....... ";

-	mes "There was this piece of paper floating in the air.  I asked myself, 'Hmm... who lost a piece of paper out here?'.";

-	next;

-	mes "[Eskla]";

-	mes "Then... without warning.... the piece of paper attacked me!! ME! One of the GREATEST Sages in Yuno!!";

-	emotion e_omg;

-	next;

-	mes "[Eskla]";

-	mes "I said to the piece of paper, 'How dare you attack me you little piece of paper!!' and struck it with my trusty sword.";

-	mes "But that piece of paper was persistent and annoying at that.";

-	emotion e_gasp;

-	next;

-	mes "[Eskla]";

-	mes "Using its paper thin body it dodged my sword simply by turning itself.  The way it was turned I couldn't even tell if it was still there.";

-	mes "Dammit it was thin!!!";

-	next;

-	mes "[Eskla]";

-	mes "I decided to finally put an end to things and used a powerful magic spell to destroy that little piece of paper.";

-	mes "Because I had so much difficulty in defeating it, I decided to ask my colleagues if they knew anything about it.";

-	next;

-	mes "[Eskla]";

-	mes "I found out what I had fought was called ^FF3355'The Paper'^000000.";

-	mes "People say that it used to be part of an old book that contained a great deal of ancient knowledge about Yuno.";

-	next;

-	mes "[Eskla]";

-	mes "Somehow it became a monster....... isn't that weird?";

+yuno.gat,213,298,4	script	Sage Esklah	735,{

+	mes "[Esklah]";

+	mes "I remember watching a harmless";

+	mes "piece of paper floating";

+	mes "trough the air...";

+	next;

+	mes "[Esklah]";

+	mes "As i was thinking of how";

+	mes "wonderfully poetic that image was,";

+	mes "that paper suddenly attacked me!";

+	mes "Me, one of Juno's greatest Sages!";

+	next;

+	mes "[Esklah]";

+	mes "I tried defending myself with my";

+	mes "trusty sword, but being paper-thin,";

+	mes "that monster managed to dodge all";

+	mes "of my blows. I had to cast magic in";

+	mes "order to destroy it.";

+	next;

+	mes "[Esklah]";

+	mes "Later, I learned that monster is";

+	mes "known as ^FF3355The Paper^000000.";

+	next;

+	mes "[Esklah]";

+	mes "It used to be a part of an old book";

+	mes "that contained a lot of ancient";

+	mes "knowledge about Juno, but somehow,";

+	mes "became a monster. Isn't that";

+	mes "peculiar?";

 	close;

 }

 

 

 

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

-yuno.gat,166,111,4	script	Remorpheous	120,{

-	mes "[Remorpheous]";

-	mes "'Apocalypse'. he, an artificial human being,";

-	mes "was the chief of gatekeepers and in charge of public order of the city";

-	mes "of [Yuno] during the Ancient times civilization...";

-	close;

-	mes "[Remorpheus]";

-	mes "....similar to Robot. After living for a long time,";

-	mes "its A.I. totally screwed up,it couldn't recognize friend or foe anymore,";

-	mes "so without consideration of friends or foe......";

-	close;

-	mes "[Remorpheus]";

-	mes ".... it became a monster that attacks anyone regardless";

-	close;

-}

-

-//=====================================================================================

-yuno.gat,80,150,4	script	Young Woman	746,{

-	mes "[Young Woman]";

-	mes "Have you ever seen such a beautiful city?";

-	mes "And Yuno at night time is so wonderful with its lights shiny through the clouds";

-	next;

-	mes "[Young Woman]";

-	mes "I'm sorry i got carried away , its my first time being here in the City of Sages";

-	mes "i suggest you go look around and enjoy your self";

-	next;

-	mes "[Young Woman]";

-	mes "I believe i shall wait around here till nightfall just so i can see the lights clearly";

-	mes "maybe i will see you here later";

+yuno.gat,165,111,4	script	Juno Sage	123,{

+	mes "[Le Morpheous]";

+	mes "^FF5533Apocalypse...^000000";

+	mes "It is the name of an android that";

+	mes "used to guard Juno long ago.";

+	next;

+	mes "[Le Morpheus]";

+	mes "Because its artificial intelligence";

+	mes "has corrupted over the years, it";

+	mes "can no longer distinguish comrades";

+	mes "from enemies. Sadly, that android";

+	mes "is nothing but a mindless monster";

+	mes "now.";

 	close;

 }

 

diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index b70ca4961..0a34e94e6 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -4,7 +4,7 @@
 //= Nana (1.0)

 //= Sara-chan (1.1)

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

-//= 1.4

+//= 1.5

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

 //= Any Athena Version; RO Episode 5+

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

@@ -14,6 +14,7 @@
 //= 1.2 Moved all airports to Airplane Warps [Lupus]

 //= 1.3 Dr.Evil's yuno_05 warps update [Lupus]

 //= 1.4 optimized [Lupus]

+//= 1.5 Missing Juno warps [musashiden]

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

 

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

@@ -80,6 +81,11 @@ yuno_in01.gat,88,36,0	warp	yun59	1,1,yuno_in01.gat,173,34
 yuno_in01.gat,176,34,0	warp	yun60	1,1,yuno_in01.gat,91,36

 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,{

 	if(rand(2)){