- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

1 files changed, 211 insertions, 118 deletions

diff --git a/npc/guides/guides_juno.txt b/npc/guides/guides_juno.txt
index c7af7a9e3..429c25f69 100644
--- a/npc/guides/guides_juno.txt
+++ b/npc/guides/guides_juno.txt
@@ -1,118 +1,211 @@
-//===== eAthena Script ======================================= 
-//= Yuno Guides
-//===== By: ================================================== 
-//= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= eAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the City of Juno
-//===== Additional Comments: ================================= 
-//= Edited Miss Yoon text. Added town soldiers by usul. Edited town soldiers
-//= and added map location option for them. [kobra_k88]
-//= 1.1 Changed sprites and cutins to Schwarzwald 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]
-//= 1.5 Removed Duplicates [Silent].
-//= 1.6 Changed one of the Juno soldier's sprite. [Musashiden]
-//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//============================================================ 
-
-yuno,153,47,4	script	Juno Guide#yuno	700,{
-	mes "[Ms. Yoon]";
-	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
-	mes "the city of Juno!";
-	next;
-	switch(select("Armory:Tool Shop:Sage Castle (Sage Job Change Place):Street of Book Stores:Juphero Plaza:Library of the Republic:Schweicherbil Magic Academy:Monster Museum:Forge:Airport:End Conversation")) {
-	case 1:
-		viewpoint 1,120,138,0,0xFF3355;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^FF3355+^000000 -> Armory";
-		mes "Thank you,";
-		mes "have a good day.";
-		close;
-	case 2:
-		viewpoint 1,193,142,1,0x3355FF;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^3355FF+^000000 -> Tool Shop";
-		mes "Thank you,";
-		mes "have a good day.";
-		close;
-	case 3:
-		viewpoint 1,90,318,2,0x33FF55;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^33FF55+^000000 -> Sage Castle";
-		mes "( Sage Job Change Place )";
-		mes "Thank you, have a good day.";
-		close;
-	case 4:
-		viewpoint 1,257,102,3,0xFF3355;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^FF3355+^000000 -> Street of Book Stores";
-		mes "Thank you, have a good day.";
-		close;
-	case 5:
-		viewpoint 1,157,170,4,0x3355FF;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^3355FF+^000000 -> Juphero Plaza";
-		mes "Thank you,";
-		mes "have a good day.";
-		close;
-	case 6:
-		viewpoint 1,336,204,5,0x33FF55;
-		mes "[Ms. Yoon]";
-		mes "Please look";
-		mes "at the mini map.";
-		mes "^33FF55+^000000 -> Library of the Republic";
-		mes "Thank you, have a good day.";
-		close;
-	case 7:
-		viewpoint 1,323,281,6,0xFF3355;
-		mes "[Ms. Yoon]";
-		mes "Please look at the mini map.";
-		mes "^FF3355+^000000 -> Schweicherbil Magic Academy";
-		mes "Thank you, have a good day.";
-		close;
-	case 8:
-		viewpoint 1,278,288,7,0x3355FF;
-		mes "[Ms. Yoon]";
-		mes "Please look at the mini map.";
-		mes "^3355FF+^000000 -> Monster Museum";
-		mes "Thank you, have a good day.";
-		close;
-	case 9:
-		viewpoint 1,120,138,8,0xFF3355;
-		mes "[Ms. Yoon]";
-		mes "Please look at the mini map.";
-		mes "^FF3355+^000000 -> Forge";
-		mes "The forge is located underneath Armory.";
-		mes "Thank you, have a good day.";
-		close;
-	case 10:
-		viewpoint 1,53,214,9,0xFF3355;
-		mes "[Ms. Yoon]";
-		mes "Please look at the mini map.";
-		mes "^FF3355+^000000 -> Airport";
-		mes "Thank you, have a good day.";
-		close;
-	case 11:
-		mes "[Ms. Yoon]";
-		mes "A great city of wise men.";
-		mes "A city of Knowledge!";
-		mes "Welcome to Juno.";
-		close;
-	}
-}
+//===== eAthena Script ======================================= 

+//= Juno Guides

+//===== By: ================================================== 

+//= L0ne_W0lf

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

+//= 1.0

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

+//= eAthena  SVN

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

+//= [Aegis Conversion]

+//= Guides for the city of Juno

+//===== Additional Comments: ================================= 

+//= 1.0 First version, Renewal guide.

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

+

+yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{

+	mes "[Juno Guide]";

+	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";

+	mes "the city of ^8B4513Juno^00000!";

+	next;

+	while (1) {

+		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {

+		case 1:

+			set .@loop,1;

+			while (.@loop) {

+				switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaze ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {

+				case 1:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^FF0000Tool Shop^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,194,140,0,0xFF0000;

+					next;

+					break;

+				case 2:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^FF4500Forge^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,120,137,1,0xFF4500;

+					next;

+					break;

+				case 3:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^DAA520Airport^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,16,261,2,0xDAA520;

+					next;

+					break;

+				case 4:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^008000Government Building^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,157,317,3,0x008000;

+					next;

+					break;

+				case 5:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^0000FFStreet of Book Stores^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,172,100,4,0x0000FF;

+					next;

+					break;

+				case 6:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^000080Inn & Pub^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,51,105,5,0x000080;

+					next;

+					break;

+				case 7:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^800080Sage Castle^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,90,318,6,0x800080;

+					next;

+					break;

+				case 8:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^834683Monster Academy^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,95,184,7,0x834683;

+					next;

+					break;

+				case 9:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^4B0082Juno Library^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,338,203,8,0x4B0082;

+					next;

+					break;

+				case 10:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^008080Weapon & Armor Shop^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,120,137,9,0x008080;

+					next;

+					break;

+				case 11:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^FF1493Juphero Plaza^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,115,157,10,0xFF1493;

+					next;

+					break;

+				case 12:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^DA70D6Monster Museum^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,278,290,11,0xDA70D6;

+					next;

+					break;

+				case 13:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^CD1039Schweicherbil Magic Academy^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,323,280,12,0xCD1039;

+					next;

+					break;

+				case 14:

+					set .@loop,0;

+					break;

+				}

+			}

+			break;

+		case 2:

+			set .@loop,1;

+			while (.@loop) {

+				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {

+				case 1:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^FA8072Kafra Employees^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,152,187,13,0xFA8072;

+					viewpoint 1,277,221,14,0xFA8072;

+					viewpoint 1,327,108,15,0xFA8072;

+					next;

+					break;

+				case 2:

+					mes "[Juno Guide]";

+					mes "I will mark the location";

+					mes "of the ^803232Eden Teleport Officer^000000";

+					mes "on your mini-map.";

+					mes "Would you like to check any other locations?";

+					viewpoint 1,144,189,16,0x803232;

+					next;

+					break;

+				case 3:

+					set .@loop,0;

+					break;

+				}

+			}

+			break;

+		case 3:

+			mes "[Juno Guide]";

+			mes "Sure, I'll remove all marks from your mini-map.";

+			mes "Is there anything else I can do for you?";

+			viewpoint 2,194,140,0,0xFFFFFF;

+			viewpoint 2,120,137,1,0xFFFFFF;

+			viewpoint 2,16,261,2,0xFFFFFF;

+			viewpoint 2,157,317,3,0xFFFFFF;

+			viewpoint 2,172,100,4,0xFFFFFF;

+			viewpoint 2,51,105,5,0xFFFFFF;

+			viewpoint 2,90,318,6,0xFFFFFF;

+			viewpoint 2,95,184,7,0xFFFFFF;

+			viewpoint 2,338,203,8,0xFFFFFF;

+			viewpoint 2,120,137,9,0xFFFFFF;

+			viewpoint 2,115,157,10,0xFFFFFF;

+			viewpoint 2,278,290,11,0xFFFFFF;

+			viewpoint 2,323,280,12,0xFFFFFF;

+			viewpoint 2,152,187,13,0xFFFFFF;

+			viewpoint 2,277,221,14,0xFFFFFF;

+			viewpoint 2,327,108,15,0xFFFFFF;

+			viewpoint 2,144,189,16,0xFFFFFF;

+			next;

+			break;

+		case 4:

+			mes "[Juno Guide]";

+			mes "Have fun on your adventures!";

+			close;

+		}

+	}

+}

+

+yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700