* Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)

* Misc. standardization...

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

1 files changed, 17 insertions, 21 deletions

diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index cda9c2abe..04133ed89 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -22,8 +22,7 @@
 	mes "explaining the PVP Mode.";
 	mes "I am the PVP Narrator!";
 	next;
-	switch(select("What is PVP?","What are the PVP Modes?","What are the rules for PVP?","Save Position.","End Dialog."))
-	{
+	switch(select("What is PVP?","What are the PVP Modes?","What are the rules for PVP?","Save Position.","End Dialog.")) {
 		case 1:
 			mes "[PVP Narrator]";
 			mes "In short form";
@@ -44,7 +43,7 @@
 			mes "must pay the 500 zeny";
 			mes "entrance fee in order to";
 			mes "To enter a PVP Fight Square.";
-		break;
+			break;
 		case 2:
 			mes "[PVP Narrator]";
 			mes "When you are qualified, You";
@@ -75,7 +74,7 @@
 			mes "You should think it over";
 			mes "twice before you go there...";
 			mes "Good Luck!";
-		break;
+			break;
 		case 3:
 			mes "[PVP Narrator]";
 			mes "Each of the Fight squares";
@@ -141,7 +140,7 @@
 			mes "You cannot save your position.";
 			mes "Remember well... These rules";
 			mes "can help to ensure your victory.";
-		break;
+			break;
 		case 4:
 			mes "[PVP Narrator]";
 			mes "Position saved...";
@@ -153,7 +152,7 @@
 				if(strnpcinfo(4) == "prt_in") { savepoint "prt_in",54,137; }
 				if(strnpcinfo(4) == "geffen_in") { savepoint "geffen_in",70,59; }
 				if(strnpcinfo(4) == "payon_in01") { savepoint "payon_in01",142,46; }
-		break;
+			break;
 		case 5:
 			mes "[PVP Narrator]";
 			mes "In this war between Monsters";
@@ -162,9 +161,9 @@
 			mes "Encourages us all to become";
 			mes "stronger. Come again.";
 			mes "We welcome your challenge!";
-		break;
+			break;
 	}
-close;
+	close;
 }
 
 //PVP Narrator's Duplicates
@@ -185,13 +184,12 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 	mes "modes or rules, Please ask";
 	mes "the Narrator...";
 	next;
-	switch(select("^FF5533' PvP Nightmare Mode'^000000","^3355FF' PvP Yoyo Mode'^000000","^3355FF' PvP Event Mode'^000000","Quit"))
-	{
+	switch(select("^FF5533' PvP Nightmare Mode'^000000","^3355FF' PvP Yoyo Mode'^000000","^3355FF' PvP Event Mode'^000000","Quit")) {
 		case 1:
 			mes "[Gate Keeper]";
 			mes "I am sorry, but currently the Nightmare mode service is not available.";
 			mes "Please use the Yoyo mode instead. We apologize for the inconvenience.";
-		break;
+			break;
 		case 2:
 			mes "[Gate Keeper]";
 			mes "The admission fee is 500 Zeny.";
@@ -213,7 +211,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 					mes "500 Zeny entrance fee, and";
 					mes "that you are at least level 31!";
 				}
-			break;
+				break;
 			case 2:
 				mes "[Gate Keeper]";
 				mes "In this war between Monsters";
@@ -222,17 +220,16 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 				mes "Encourages us all to become";
 				mes "stronger. Come again.";
 				mes "We welcome your challenge!";
-			break;
+				break;
 			}
-		break;
+			break;
 		case 3:
 			mes "[Gate Keeper]";
 			mes "Welcome";
 			mes "Please double check";
 			mes "That you have the admission or viewing ticket!";
 			next;
-			if ((countitem(7028) == 0) && (countitem(7029) == 0))
-			{
+			if ((countitem(7028) == 0) && (countitem(7029) == 0)) {
 				mes "[Gate Keeper]";
 				mes "Eh? You don't have it? Then I";
 				mes "am sorry, this fight square is";
@@ -244,7 +241,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 			mes "[Gate Keeper]";
 			mes "Yes, thank you for participating. Have fun!";
 			warp "pvp_room",51,23;
-		break;
+			break;
 		case 4:
 			mes "[Gate Keeper]";
 			mes "In this war between Monsters";
@@ -253,9 +250,9 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 			mes "Encourages us all to become";
 			mes "stronger. Come again.";
 			mes "We welcome your challenge!";
-		break;
+			break;
 	}
-close;
+	close;
 }
 
 //Gate Keeper Duplicates
@@ -435,14 +432,13 @@ pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	45,1,1
 pvp_2vs2,40,40,0	script	Combat Square Staff#5	45,1,1,{
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
-	if (select("To the side viewer seat.:Leave Combat Square.") == 1) {
+	if (select("To the side viewer seat.:Leave Combat Square.") == 1)
 		switch(rand(1,4)) {
 		case 1: warp "pvp_2vs2",39,7; end;
 		case 2: warp "pvp_2vs2",39,73; end;
 		case 3: warp "pvp_2vs2",7,39; end;
 		case 4: warp "pvp_2vs2",73,39; end;
 		}
-	}
 	warp "pvp_c_room",84,39;
 	end;
 }