Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 37 insertions, 35 deletions

diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index f681aa4e4..e3085c6b3 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -1,27 +1,29 @@
 //===== Hercules Script ======================================
 //= Juno City
-//===== By: ================================================== 
+//===== By: ==================================================
 //= KitsuneStarwind, kobra_k88, L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.4a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= NPCs for the City of Juno
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Added additional npcs.  Added Metto quest. [kobra_k88]
 //= Moved item quest to quest folder. Re-edited a majority of the npcs. [kobra_k88]
 //=a 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.
-//= 1.3.3 Removed Noyee	NPC (it's implemented in sleipnir_seal.txt)
+//= 1.3.3 Removed Noyee NPC (it's implemented in sleipnir_seal.txt)
 //= 1.4 Updated to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added Juno Airship Representative.
+//=     Added Juno Airship Representative.
 //= 1.4a Corrected a Typo error (bugreport:716) [Samuray22]
-//============================================================ 
+//= 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy]
+//=     Split Soldier NPCs into Pre-RE/RE (sprite change).
+//============================================================
 
 // Juno
-//============================================================ 
+//============================================================
 yuno,184,173,4	script	Freidrich#juno	729,{
 	if (rand(1,5) == 1) {
 		mes "[Freidrich]";
@@ -74,7 +76,7 @@ yuno,337,227,4	script	Juno Granny#juno	103,{
 				mes "[Granny]";
 				mes "*Giggle*";
 				mes "There you go~";
-				set zeny,zeny-1000;
+				set Zeny, Zeny-1000;
 				getitem 529,1; //Candy
 				next;
 				mes "[Granny]";
@@ -165,7 +167,7 @@ yuno,165,111,4	script	Juno Sage#juno	123,,{
 			if (select("Choose ^FF3355Red Herb^000000:Choose ^3355FFBlue Herb^000000.") == 1) {
 				mes "[Le Morpheus]";
 				mes "As you have chosen, you will forget everything, and remain in this virtual reality.";
-				set zeny,zeny-5000;
+				set Zeny, Zeny-5000;
 				getitem 507,1; //Red_Herb
 				close2;
 				warp "prontera",182,206;
@@ -173,7 +175,7 @@ yuno,165,111,4	script	Juno Sage#juno	123,,{
 			}
 			mes "[Le Morpheus]";
 			mes "You will see the truth.";
-			set zeny,zeny-5000;
+			set Zeny, Zeny-5000;
 			getitem 510,1; //Blue_Herb
 			close2;
 			warp "pay_dun03",200,222;
@@ -237,7 +239,7 @@ yuno,157,205,4	script	Juno Artisan#juno	54,{
 	}
 }
 
-yuno,150,283,4	script	Juno Soldier#juno	105,{
+-	script	::JunoSoldier1	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -251,8 +253,8 @@ yuno,150,283,4	script	Juno Soldier#juno	105,{
 	mes "You'd better be careful when you encounter this monster. It will damage armor and weapons in the twinkling of an eye.";
 	close;
 }
-	
-yuno,165,283,4	script	Juno Soldier#2juno	105,{
+
+-	script	::JunoSoldier2	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -267,8 +269,8 @@ yuno,165,283,4	script	Juno Soldier#2juno	105,{
 	mes "The name of this monster originated from a story about a poor geographer who, unfortunately, was eaten by this monster while he was immersed in his studies.";
 	close;
 }
-	
-yuno,227,292,4	script	Juno Soldier#3juno	105,{
+
+-	script	::JunoSoldier3	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -279,8 +281,8 @@ yuno,227,292,4	script	Juno Soldier#3juno	105,{
 	mes "Don't be fooled by its appearance, or you'll find yourself in trouble.";
 	close;
 }
-	
-yuno,165,228,4	script	Juno Soldier#4juno	105,{
+
+-	script	::JunoSoldier4	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -294,8 +296,8 @@ yuno,165,228,4	script	Juno Soldier#4juno	105,{
 	mes "Goat's legs are so strong because it's always climbing cliffs when it's not busy slaughtering the innocent.";
 	close;
 }
-	
-yuno,150,228,4	script	Juno Soldier#5juno	105,{
+
+-	script	::JunoSoldier5	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -310,8 +312,8 @@ yuno,150,228,4	script	Juno Soldier#5juno	105,{
 	mes "shining jellopy even exists!";
 	close;
 }
-	
-yuno,334,182,4	script	Juno Soldier#6juno	105,{
+
+-	script	::JunoSoldier6	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -322,8 +324,8 @@ yuno,334,182,4	script	Juno Soldier#6juno	105,{
 	mes "Its use is limited to the Sage class, and it increases the chance of inflicting critical attacks. So, for Sages, that dagger can be very useful, as well as make them look stylish in battle.";
 	close;
 }
-	
-yuno,263,320,4	script	Juno Soldier#7juno	105,{
+
+-	script	::JunoSoldier7	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -364,19 +366,19 @@ yuno,142,183,5	script	Airship Representative	100,{
 	mes "The teleport fee is 1,800 zeny, regardless of where you want to go. Please let me know your desired destination.";
 	next;
 	switch(select("Prontera:Izlude:Geffen:Morroc:Payon:Alberta:Comodo:Cancel")) {
-	case 1: callsub S_Warp,"prontera",116,72;
-	case 2: callsub S_Warp,"izlude",94,103;
-	case 3: callsub S_Warp,"geffen",120,39;
-	case 4: callsub S_Warp,"morocc",156,46;
-	case 5: callsub S_Warp,"payon",69,100;
-	case 6: callsub S_Warp,"alberta",117,56;
-	case 7: callsub S_Warp,"comodo",209,143;
-	case 8: close;
+		case 1: callsub S_Warp,"prontera",116,72;
+		case 2: if (checkre(0)) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103;
+		case 3: callsub S_Warp,"geffen",120,39;
+		case 4: callsub S_Warp,"morocc",156,46;
+		case 5: if (checkre(0)) callsub S_Warp,"payon",162,59; else callsub S_Warp,"payon",69,100;
+		case 6: callsub S_Warp,"alberta",117,56;
+		case 7: callsub S_Warp,"comodo",209,143;
+		case 8: close;
 	}
 
 S_Warp:
 	if (Zeny >= 1800) {
-		set zeny,zeny-1800;
+		set Zeny, Zeny-1800;
 		warp getarg(0),getarg(1),getarg(2);
 		end;
 	}