* 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

5 files changed, 64 insertions, 55 deletions

diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index a65e86873..a3aba3771 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -8,7 +8,6 @@
 //= rAthena SVN
 //===== Description: =========================================
 //= Write you name on your rare equipment or weapon ^_-
-//= Original X-Mas mini-quest(could be used as a permanent one)
 //===== Additional Comments: =================================
 //= 1.1 Cleaned and edited for general use. [Euphy]
 //============================================================
@@ -21,7 +20,7 @@ prt_in,24,61,7	script	Perchik	47,{
 	mes "[Perchik]";
 	mes "I can ^0055FFsign your name^000000 on almost any rare item you hold.";
 	next;
-	if(select("Tell me more...:Sign my items, please!")==1) {
+	if(select("Tell me more...:Sign my items, please!") == 1) {
 		mes "[Perchik]";
 		mes "I can put your name on any slotless equipment or weapon.";
 		emotion e_ic;
@@ -29,11 +28,11 @@ prt_in,24,61,7	script	Perchik	47,{
 		mes "[Perchik]";
 		if (getarraysize(.@Item) || getarraysize(.@Cost)) {
 			mes "For my work I accept:";
-			if (getarraysize(.@Item))
-				for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
-					mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
+			if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
+				mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
 			if (.@Cost[0]) mes " ~ "+.@Cost[0]+" Zeny";
-			if (.@Cost[1]) mes " ~ "+.@Cost[1]+" Zeny per refine"; }
+			if (.@Cost[1]) mes " ~ "+.@Cost[1]+" Zeny per refine";
+		}
 		else mes "I work for free, but...";
 		next;
 		emotion e_cry;
@@ -45,7 +44,8 @@ prt_in,24,61,7	script	Perchik	47,{
 		mes "Or it was 12 angry children";
 		mes "and a very hungry wife...";
 		emotion e_hmm;
-		close; }
+		close;
+	}
 	mes "[Perchik]";
 	mes "Show me your items to sign...";
 	next;
@@ -54,7 +54,8 @@ prt_in,24,61,7	script	Perchik	47,{
 	for (set .@i,1; .@i<=10; set .@i,.@i+1) {
 		if (getequipisequiped(.@i))
 			set .@menu$, .@menu$+.@pos$[.@i]+" [^0055FF"+getequipname(.@i)+"^000000]";
-		set .@menu$, .@menu$+":"; }
+		set .@menu$, .@menu$+":";
+	}
 	set .@part, select(.@menu$);
 	set .@id, getequipid(.@part);
 	set .@ref, getequiprefinerycnt(.@part);
@@ -62,59 +63,67 @@ prt_in,24,61,7	script	Perchik	47,{
 	if (!getequipisequiped(.@part)) {
 		mes "Nothing is equipped there!";
 		emotion e_wah;
-		close; }
+		close;
+	}
 	for(set .@i,0; .@i<4; set .@i,.@i+1)
 		set .@slot[.@i], getequipcardid(.@part,.@i);
 	if (.@slot[0]==255 || .@slot[0]==254 || .@slot[0]<0) {
 		mes "Alas, this item's already signed.";
 		mes "I would never touch a master's work.";
 		emotion e_hmm;
-		close; }
+		close;
+	}
 	if (.@slot[0]>4000 && .@slot[0]<5000) {
 		mes "A card? Here?!";
 		mes "As I said before, I don't sign items with cards.";
 		emotion e_hmm;
-		close; }
+		close;
+	}
 	if (getiteminfo(.@id,10)) {
 		mes "Sorry, I don't sign slotted items.";
 		emotion e_sry;
-		close; }
+		close;
+	}
 	getinventorylist;
 	for(set .@i,0; .@i<@inventorylist_count; set .@i,.@i+1)
 		if (@inventorylist_expire[.@i] != 0) {
 			mes "Sorry, I don't sign rental items!";
 			emotion e_hmm;
-			close; }
+			close;
+		}
 	set .@price, .@Cost[0]+(.@Cost[1]*.@ref);
 	if (getarraysize(.@Item) || .@price) {
 		mes "I will need:";
-		if (getarraysize(.@Item))
-			for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) {
-				mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
-				if (countitem(.@Item[.@i]) < .@Item[.@i+1]) set .@nr,1; }
-		if (.@price) mes " ~ "+.@price+" Zeny"; }
+		if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) {
+			mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
+			if (countitem(.@Item[.@i]) < .@Item[.@i+1]) set .@nr,1;
+		}
+		if (.@price) mes " ~ "+.@price+" Zeny";
+	}
 	mes "Shall I sign your ^0055FF"+getitemname(.@id)+"^000000?";
 	next;
 	if(select("Ok!:Leave")==2) {
 		mes "[Perchik]";
 		mes "See you...";
 		emotion e_yawn;
-		close; }
+		close;
+	}
 	mes "[Perchik]";
 	if (Zeny < .@price || .@nr) {
 		mes "I don't work for 'thanks'.";
 		emotion e_sry;
-		close; }
+		close;
+	}
 	if (!countitem2(.@id,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3])) {
 		mes "Where is "+getitemname(@id)+"...?";
 		npctalk "You're a snoozy cheater!";
 		logmes "CHEATER: Tried to sign an item not having it: "+getitemname(@id);
 		emotion e_wah;
-		close; }
+		close;
+	}
 	if (.@price) set Zeny, Zeny-.@price;
-	if (getarraysize(.@Item)) 
-		for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
-			delitem .@Item[.@i], .@Item[.@i+1];
+	if (getarraysize(.@Item))  for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
+		delitem .@Item[.@i], .@Item[.@i+1];
 	delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3];
 	mes "Done!";
 	emotion e_proud;
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index 7eb933106..4de742817 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -28,8 +28,8 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 	if (select("Yes Please:No") == 2) {
 		mes "[Platinum Skill NPC]";
 		mes "Have a nice day... >.>";
-		close; }
-
+		close;
+	}
 	skill 142,1,0;
 	switch(BaseClass) {
 		case 0: if (Class !=23) skill 143,1,0; break;
@@ -39,8 +39,9 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 		case 4: skill 156,1,0; break;
 		case 5: skill 153,1,0; skill 154,1,0; skill 155,1,0; break;
 		case 6: skill 149,1,0; skill 150,1,0; skill 151,1,0; skill 152,1,0; break;
-		default: break; }
-	switch(roclass(eaclass()&EAJ_UPPERMASK)) {
+		default: break;
+	}
+	switch(BaseJob) {
 		case 7: skill 1001,1,0; break;
 		case 8: skill 1014,1,0; break;
 		case 9: skill 1006,1,0; break;
@@ -54,8 +55,8 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 		case 18: skill 238,1,0; break;
 		case 19: skill 1010,1,0; break;
 		case 20: skill 1011,1,0; break;
-		default: break; }
-
+		default: break;
+	}
 	mes "[Platinum Skill NPC]";
 	mes "There you go!";
 	close;
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index c0839212c..eb34137e4 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -33,7 +33,8 @@ prontera,150,193,4	script	Reset Girl	124,{
 		mes "[Reset Girl]";
 		if (Zeny < .@ResetSkill) {
 			mes "Sorry, you don't have enough Zeny.";
-			close; }
+			close;
+		}
 		set Zeny, Zeny-.@ResetSkill;
 		sc_end SC_ALL;
 		ResetSkill;
@@ -43,7 +44,8 @@ prontera,150,193,4	script	Reset Girl	124,{
 		mes "[Reset Girl]";
 		if (Zeny < .@ResetStat) {
 			mes "Sorry, you don't have enough Zeny.";
-			close; }
+			close;
+		}
 		set Zeny, Zeny-.@ResetStat;
 		ResetStatus;
 		mes "There you go!";
@@ -52,7 +54,8 @@ prontera,150,193,4	script	Reset Girl	124,{
 		mes "[Reset Girl]";
 		if (Zeny < .@ResetBoth) {
 			mes "Sorry, you don't have enough Zeny.";
-			close; }
+			close;
+		}
 		set Zeny, Zeny-.@ResetBoth;
 		sc_end SC_ALL;
 		ResetSkill;
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index e988f6b93..7b4678c52 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -118,7 +118,7 @@ gefg_cas02,145,114,0	script	#lever_G02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas2	111
+gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas02	111
 
 // Guild Treasure Spawns
 //============================================================
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;
 }