Merge remote-tracking branch 'upstream/master'

1 files changed, 51 insertions, 66 deletions

diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 6503091ce..3b3e51fc8 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //= Sara-chan (1.1)
 //===== Current Version: =====================================
 //= 1.9
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno
 //===== Additional Comments: =================================
@@ -91,112 +89,99 @@ yuno_in01,101,85,0	warp	yun66	1,1,yuno,245,144
 
 // Yuno In05 (Entering Random Warps) -------------------------------------------
 yuno_in05,153,141,0	script	#yun63	45,1,1,{
-	if(rand(2)){
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
 // Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
 yuno_in05,196,102,0	script	#yun64	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",169,102; end;
-w2:	warp "yuno_in05",128,82;  end;
-w3:	warp "yuno_in05",156,141; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",169,102; end;
+		case 1: warp "yuno_in05",128,82;  end;
+		case 2: warp "yuno_in05",156,141; end;
+	}
 }
 yuno_in05,181,116,0	script	#yun65	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 yuno_in05,165,102,0	script	#yun66	45,1,1,{
-	if(rand(2)){
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
 yuno_in05,181,91,0	script	#yun67	45,1,1,{
-	if(rand(2)){
+	if (rand(2))
 		warp "yuno_in05",181,112;
-	} else {
+	else
 		warp "yuno_in05",176,48;
-	}
 	end;
 }
 // Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
 yuno_in05,148,82,0	script	#yun68	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",169,102; end;
-w2:	warp "yuno_in05",128,82;  end;
-w3:	warp "yuno_in05",156,141; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",169,102; end;
+		case 1: warp "yuno_in05",128,82;  end;
+		case 2: warp "yuno_in05",156,141; end;
+	}
 }
 yuno_in05,125,82,0	script	#yun69	45,1,1,{
-	if(rand(2)){
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
 yuno_in05,136,71,0	script	#yun70	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,112; end;
-w2:	warp "yuno_in05",16,185;  end;
-w3:	warp "yuno_in05",176,48;  end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,112; end;
+		case 1: warp "yuno_in05",16,185;  end;
+		case 2: warp "yuno_in05",176,48;  end;
+	}
 }
 // Yuno In05 (Random Warps - Other) --------------------------------------------
 yuno_in05,16,188,0	script	#yun71	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 yuno_in05,176,9,0	script	#yun72	45,1,1,{
-	if(rand(2)){
+	if (rand(2))
 		warp "yuno_in05",181,112;
-	} else {
+	else
 		warp "yuno_in05",176,48;
-	}
 	end;
 }
 yuno_in05,176,52,0	script	#yun73	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 // Yuno In05 (Destination - Room) ----------------------------------------------
 yuno_in05,40,178,0	script	#yun74	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 yuno_in05,47,186,0	script	#yun75	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 // Yuno In05 (Destination - Escaped Random Warps) ------------------------------
 yuno_in05,31,167,0	warp	yun76	1,1,yuno_in05,50,85