* Optimized "Guild Battle NPC" (other\guildpvp.txt)

* Cleanup of "Gonryun Power Arena" script (other\powernpc.txt)
* Condensed "Seal Status" script a little bit (other\sealstatus.txt)
* Other general cleaning... :3

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

8 files changed, 158 insertions, 448 deletions

diff --git a/npc/merchants/diamond.txt b/npc/merchants/diamond.txt
index b6b42ec83..118a3d111 100644
--- a/npc/merchants/diamond.txt
+++ b/npc/merchants/diamond.txt
@@ -50,10 +50,8 @@
 	next;
 
 	set .@menu$, "^FF82FF'17 Carat Diamond'^000000?";
-
-	if (countitem(6024)) {
-		set .@menu$, .@menu$ + ":Exchange my 17 Carat Diamond for zeny..";
-	}
+	if (countitem(6024))
+		set .@menu$, .@menu$ + ":Exchange my 17 Carat Diamond for zeny...";
 
 	switch(select(.@menu$)) {
 	case 1:
@@ -109,7 +107,6 @@
 		next;
 		
 		while(1) {
-			
 			if (select("^B9062FI will sign the contract.^000000:^828282Nevermind, I changed my mind.^000000") == 2) {
 				mes .@npc$;
 				mes "I see, that's too bad..";
@@ -129,7 +126,6 @@
 			next;
 			
 			input .@charname$;
-			
 			if (.@charname$ == strcharinfo(0)) {
 				mes .@npc$;
 				mes "Okay, good.";
@@ -145,11 +141,8 @@
 					mes "Calculating the price and service fee..";
 					mes "501,000,000 zeny.";
 					mes "Amount has been confirmed.";
-					
 					emotion e_loud;
-					
 					set Zeny, Zeny - 501000000;
-					
 					getitem 6024, 1;
 					next;
 
@@ -157,9 +150,7 @@
 					mes "You may exchange the diamond back for zeny at any time.";
 					mes "However, there will be a 1,000,000z service fee.";
 					mes "Thank you for your business.";
-					
 					emotion e_thx;
-					
 					close;
 				}
 				else {
@@ -168,9 +159,7 @@
 					mes "I'm sorry, but you don't have sufficient funds.";
 					mes "Including the service fee, a total of 501,000,000z is required.";
 					mes "Please check your zeny balance and try again.";
-					
 					emotion e_hmm;
-					
 					close;
 				}
 			}
@@ -184,15 +173,12 @@
 	case 2:
 		mes .@npc$;
 		mes "AAH. You would like to exchange your ^FF82FF'17 Carat Diamond'^000000 for zeny?";
-
 		emotion e_gasp;
 		next;
-
 		if (select("Yes:No") == 2) {
 			mes .@npc$;
 			mes "Then, what is it you desire?..";
 			mes ". . . . . ....";
-
 			emotion e_dots;
 			close;
 		}
@@ -223,7 +209,6 @@
 			}
 			
 			input .@charname$;
-			
 			if (.@charname$ == strcharinfo(0)) {
 				mes .@npc$;
 				mes "Your signature has been received.";
@@ -235,11 +220,8 @@
 				mes "Thank you for your business.";
 				mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,";
 				mes "come back anytime with 500 million zeny.";
-				
 				emotion e_thx;
-				
 				delitem 6024, 1;
-				
 				set Zeny, Zeny + 499000000;
 				close;
 			}
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
index e9b59b803..34143b748 100644
--- a/npc/other/guildpvp.txt
+++ b/npc/other/guildpvp.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,9 +11,15 @@
 //= Guild Battle with PVP mechanics.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Optimized. [Euphy]
 //============================================================ 
 
 pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
+
+	setarray .@map1X[1],7,9,16,8,20;
+	setarray .@map2X[1],91,90,83,91,79;
+	setarray .@mapY[1],49,49,50,49,50;
+
 	mes "[Guild Battle Guide]";
 	mes "How are you doing?";
 	mes "I'm the Guild Battle Guide";
@@ -21,261 +27,29 @@ pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
 	mes "Let me know to which map";
 	mes "you want me to move you.";
 	next;
-	switch(select("Map 1:Map 2:Map 3:Map 4:Map 5")) {
-	case 1:
-		mes "[Guild Battle Guide]";
-		mes "You've chosen Map 1.";
-		mes "Now, which team are";
-		mes "you on? You can choose";
-		mes "either Team 1 or Team 2.";
-		next;
-		switch(select("Team 1:Team 2")) {
-		case 1:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 1 as a member";
-			mes "of Team 1. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs1",7,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		case 2:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 1 as a member";
-			mes "of Team 2. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs1",91,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		}
-	case 2:
-		mes "[Guild Battle Guide]";
-		mes "You've chosen Map 2.";
-		mes "Now, which team are";
-		mes "you on? You can choose";
-		mes "either Team 1 or Team 2.";
-		next;
-		switch(select("Team 1:Team 2")) {
-		case 1:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 2 as a member";
-			mes "of Team 1. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs2",9,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		case 2:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 2 as a member";
-			mes "of Team 2. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs2",90,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		}
-	case 3:
-		mes "[Guild Battle Guide]";
-		mes "You've chosen Map 3.";
-		mes "Now, which team are";
-		mes "you on? You can choose";
-		mes "either Team 1 or Team 2.";
-		next;
-		switch(select("Team 1:Team 2")) {
-		case 1:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 3 as a member";
-			mes "of Team 1. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs3",16,50;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		case 2:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 3 as a member";
-			mes "of Team 2. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs3",83,50;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		}
-	case 4:
-		mes "[Guild Battle Guide]";
-		mes "You've chosen Map 4.";
-		mes "Now, which team are";
-		mes "you on? You can choose";
-		mes "either Team 1 or Team 2.";
-		next;
-		switch(select("Team 1:Team 2")) {
-		case 1:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 4 as a member";
-			mes "of Team 1. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs4",8,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		case 2:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 4 as a member";
-			mes "of Team 2. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs4",91,49;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		}
-	case 5:
+	set .@i, select("Map 1:Map 2:Map 3:Map 4:Map 5");
+	mes "[Guild Battle Guide]";
+	mes "You've chosen Map "+.@i+".";
+	mes "Now, which team are";
+	mes "you on? You can choose";
+	mes "either Team 1 or Team 2.";
+	next;
+	set .@j, select("Team 1:Team 2");
+	mes "[Guild Battle Guide]";
+	mes "Alright, I'll move you";
+	mes "to Map "+.@i+" as a member";
+	mes "of Team "+.@j+". Are you ready";
+	mes "to be transported there now?";
+	next;
+	if(select("Yes:No")==2) {
 		mes "[Guild Battle Guide]";
-		mes "You've chosen Map 5.";
-		mes "Now, which team are";
-		mes "you on? You can choose";
-		mes "either Team 1 or Team 2.";
-		next;
-		switch(select("Team 1:Team 2")) {
-		case 1:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 5 as a member";
-			mes "of Team 1. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs5",20,50;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		case 2:
-			mes "[Guild Battle Guide]";
-			mes "Alright, I'll move you";
-			mes "to Map 4 as a member";
-			mes "of Team 2. Are you ready";
-			mes "to be transported there now?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Guild Battle Guide]";
-				mes "Great! Have a good time~";
-				close2;
-				warp "guild_vs5",79,50;
-				end;
-			case 2:
-				mes "[Guild Battle Guide]";
-				mes "Alright, I hope to";
-				mes "see you again on";
-				mes "the PvP fields!";
-				close;
-			}
-		}
-	}
-}
+		mes "Alright, I hope to";
+		mes "see you again on";
+		mes "the PvP fields!";
+		close; }
+	mes "[Guild Battle Guide]";
+	mes "Great! Have a good time~";
+	close2;
+	warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i];
+	end;
+}
\ No newline at end of file
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index bd2ffabaf..834321f42 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -1,5 +1,4 @@
 //===== rAthena Script ======================================= 
-//===== rAthena Script ======================================= 
 //= Mercenary related NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
@@ -9,8 +8,8 @@
 //= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Sells Lancer, Sword, and Archer, mercenaries
-//= Sells related mercenary items.
+//= Sells Lancer, Sword, and Archer mercenaries,
+//= along with related mercenary items.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimization. [Zephyrus]
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index eb12a84c4..a563a190f 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -1,23 +1,24 @@
 //===== rAthena Script =======================================
 //= Official Gonryun Power Arena
 //===== By: ==================================================
-//= KarLaeda (Aegis script cnversion)
+//= KarLaeda
 //===== Current Version: =====================================
 //= 1.1
 //===== Compatible With: =====================================
 //= Athena SVN 9000+
 //===== Additional Comments: =================================
+//= [Aegis Conversion]
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.2 Cleaning. [Euphy]
 //============================================================
 
-
 gonryun,180,118,4	script	Iron man#gnp	85,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	if (BaseJob == Job_Novice) {
@@ -29,7 +30,7 @@ gonryun,180,118,4	script	Iron man#gnp	85,{
 	if (in_battle < 1) {
 		mes "[Songmoodoo]";
 		mes "Hey hey~ This is not something";
-		mes "You can see everyday.";
+		mes "you can see everyday.";
 		mes "Oh~ you look strong!";
 		mes "Wanna try?";
 		next;
@@ -41,78 +42,22 @@ gonryun,180,118,4	script	Iron man#gnp	85,{
 			mes "I'll tell you something interesting.";
 			mes "Ready?";
 			next;
-			mes "^0000FFSongmoodoo pointed to a rock";
-			mes "and asked you to lift.";
-			if (BaseJob < Job_Knight) {
-				if (checkweight(7049,690)) {
-					mes "^0000FFYou lifted the Stone lightly.^000000";
-					set in_battle,1;
-					getitem 7049,690; // Stone
-					next;
-					emotion e_no1;
-					mes "[Songmoodoo]";
-					mes "Wow~ Excellent~";
-					mes "I'll take you to someplace nice";
-					mes "next time I see you.";
-					mes "See ya~";
-				} else {
-					mes "Looks too heavy for you.^000000";
-					next;
-					mes "[Songmoodoo]";
-					mes "You are yet lack of training.";
-					mes "Come after more practice.";
-				}
-			} else if (BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Merchant || BaseJob == Job_Monk) {
-				if (checkweight(7049,1100)) {
-					mes "^0000FFYou lifted the Stone lightly.^000000";
-					set in_battle,1;
-					getitem 7049,1100; // Stone
-					next;
-					emotion e_no1;
-					mes "[Songmoodoo]";
-					mes "Wow~ Excellent~";
-					mes "I'll take you to someplace nice";
-					mes "next time I see you.";
-					mes "See ya~";
-				} else {
-					mes "Seemed too heavy to lift.^000000";
-					next;
-					mes "[Songmoodoo]";
-					mes "You are yet lack of training.";
-					mes "come after more practice.";
-				}
-			} else {
-				if (checkweight(7049,730)) {
-					mes "^0000FFYou lifted the Stone lightly.^000000";
-					set in_battle,1;
-					getitem 7049,730; // Stone
-					next;
-					emotion e_no1;
-					mes "[Songmoodoo]";
-					mes "Wow~ Excellent~";
-					mes "I'll take you to someplace nice";
-					mes "next time I see you.";
-					mes "See ya~";
-				} else {
-					mes "Seemed too heavy to lift.^000000";
-					next;
-					mes "[Songmoodoo]";
-					mes "You are yet lack of training.";
-					mes "come after more practice.";
-				}
-			}
+			mes "^0000FFSongmoodoo points to a rock";
+			mes "and asks you to lift it.";
+			if (BaseJob < Job_Knight) callsub L_Lifting,690;
+			else if (BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Merchant || BaseJob == Job_Monk) callsub L_Lifting,1100;
+			else callsub L_Lifting,730;
 			break;
 		case 2:
 			mes "[Songmoodoo]";
 			mes "That's not a big deal.";
 			mes "If you believe you're strong,";
-			mes "This might be a good chance to experience";
+			mes "this might be a good chance to experience";
 			mes "something new. Wanna try??";
 			break;
 		case 3:
 			mes "[Songmoodoo]";
-			mes "I guess not..";
-			mes "....";
+			mes "I guess not...";
 			emotion e_pif;
 			break;
 		}
@@ -125,26 +70,46 @@ gonryun,180,118,4	script	Iron man#gnp	85,{
 			mes "[Songmoodoo]";
 			mes "Good! Haha.";
 			mes "I like your confidence.";
-			mes "Good luck on you~";
+			mes "Good luck to you~";
 			close2;
 			warp "gon_test",53,6;
 			end;
 		} else {
 			mes "[Songmoodoo]";
-			mes "well..";
-			mes "alright.";
+			mes "Well... alright.";
 			mes "I'll see you next time then.";
 		}
 	} else {
 		mes "[Songmoodoo]";
 		mes "You ran away from there?";
-		mes "Guess you're not strong enough?";
+		mes "Guess you're not strong enough!";
 		mes "I'll give you another chance.";
 		mes "See you again.";
 		emotion e_pif;
 		set in_battle,1;
 	}
 	close;
+
+L_Lifting:
+	if (checkweight(7049,getarg(0))) {
+		mes "You lifted the Stone lightly.^000000";
+		set in_battle,1;
+		getitem 7049, getarg(0); // Stone
+		next;
+		emotion e_no1;
+		mes "[Songmoodoo]";
+		mes "Wow~ Excellent~";
+		mes "I'll take you to someplace nice";
+		mes "next time I see you.";
+		mes "See ya~";
+	} else {
+		mes "Looks too heavy for you.^000000";
+		next;
+		mes "[Songmoodoo]";
+		mes "You lack training.";
+		mes "Come back after more practice.";
+	}
+	return;
 }
 
 gon_test,50,14,4	script	Administrator#gnp	780,{
@@ -154,13 +119,13 @@ gon_test,50,14,4	script	Administrator#gnp	780,{
 		close;
 	}
 	if ($@in_battle) {
-		mes "Sorry, a field of fight";
+		mes "Sorry, the field of fight";
 		mes "is occupied right now.";
 		mes "Try again later.";
 		close;
 	}
 	mes "Are you ready?";
-	mes "";
+	mes " ";
 	mes "Remember, you have to pay";
 	mes "500z to fight.";
 	next;
@@ -196,71 +161,67 @@ gon_test,42,89,4	script	Summoner#gnp	774,{
 		close;
 	}
 	mes "Welcome.";
-	mes "Which monster would you recall?";
+	mes "Which monster will you recall?";
 	next;
 	set @gnpGroup,select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11");
 	set @gnpGroupMob$,.gnpMobsName$[(@gnpGroup-1)*6];
-	for (set @i,1; @i < 6; set @i, @i+1) {
+	for (set @i,1; @i < 6; set @i, @i+1)
 		set @gnpGroupMob$, @gnpGroupMob$ + ":" + .gnpMobsName$[(@gnpGroup-1)*6 + @i];
-	}
 	set @gnpMob,select(@gnpGroupMob$);
 	mes "[SongYeunWoo]";
 	mes "Let the fight begin!";
 	close2;
 	set in_battle,2;
 	if (getnpctimer(0) < 180000) monster "gon_test",56,86,.gnpMobsName$[(@gnpGroup-1)*6 + @gnpMob - 1],.gnpMobsId[(@gnpGroup-1)*6 + @gnpMob - 1],1,"Summoner#gnp::OnGnpMobDead";
-//  do init timer on mob select ?
-//	setnpctimer 0;
 	end;
-
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		setarray .gnpMobsName$[0],"Leather ribbon","Sitotoxism","Certificate of blood donation","Tarantulla","DangRangKwon","Molar of Desert";
-		setarray .gnpMobsId[0],1419,1428,1434,1430,1457,1432;
-		setarray .gnpMobsName$[6],"Hog Skeleton","Cannibal Bear","Miner","Fighting Dog","Mermaid Princess","Only Son";
-		setarray .gnpMobsId[6],1462,1442,1469,1460,1425,1472;
-		setarray .gnpMobsName$[12],"SamYeupchoom","Hunting Dog","Nutcracker","Sea Horse","JAKK","Corpse";
-		setarray .gnpMobsId[12],1454,1455,1443,1426,1436,1423;
-		setarray .gnpMobsName$[18],"Marduk","Onion Stem","Worm","Autodoll","Girl with Matches","Red Evil";
-		setarray .gnpMobsId[18],1458,1440,1429,1459,1444,1422;
-		setarray .gnpMobsName$[24],"Naga","Mold","Tracing Missiles","Aryong","Abiryong","Bacterium";
-		setarray .gnpMobsId[24],1421,1481,1424,1465,1466,1433;
-		setarray .gnpMobsName$[30],"Winning System","Fat Archer","Little black goat","Perverted","Treasure Box","Greenhorn";
-		setarray .gnpMobsId[30],1427,1473,1431,1446,1474,1471;
-		setarray .gnpMobsName$[36],"Hurricane","External Hog","Landlord of Maze","Knight of grudge","Archer of grudge","Papillon";
-		setarray .gnpMobsId[36],1450,1439,1461,1467,1453,1479;
-		setarray .gnpMobsName$[42],"Lip","Wendigo","E Card","Tentacle Monster","Muscular Alarm","Devil Cross";
-		setarray .gnpMobsId[42],1451,1475,1437,1441,1476,1435;
-		setarray .gnpMobsName$[48],"Maggot","Large Frame","Season of reading","Shining Fingers","Handbag","Major knight of grudge";
-		setarray .gnpMobsId[48],1477,1448,1478,1489,1488,1438;
-		setarray .gnpMobsName$[54],"Queen","Man of Fire","Sword of Executor","Mutant Dragon","Mixed Soup","Great Sword";
-		setarray .gnpMobsId[54],1482,1464,1487,1449,1456,1486;
-		setarray .gnpMobsName$[60],"Monster Bird","Torturer","Warrior","Vice-Torturer","Huge Sword";
-		setarray .gnpMobsId[60],1447,1483,1490,1484,1485;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	setarray .gnpMobsName$[0],"Leather ribbon","Sitotoxism","Certificate of blood donation","Tarantulla","DangRangKwon","Molar of Desert";
+	setarray .gnpMobsId[0],1419,1428,1434,1430,1457,1432;
+	setarray .gnpMobsName$[6],"Hog Skeleton","Cannibal Bear","Miner","Fighting Dog","Mermaid Princess","Only Son";
+	setarray .gnpMobsId[6],1462,1442,1469,1460,1425,1472;
+	setarray .gnpMobsName$[12],"SamYeupchoom","Hunting Dog","Nutcracker","Sea Horse","JAKK","Corpse";
+	setarray .gnpMobsId[12],1454,1455,1443,1426,1436,1423;
+	setarray .gnpMobsName$[18],"Marduk","Onion Stem","Worm","Autodoll","Girl with Matches","Red Evil";
+	setarray .gnpMobsId[18],1458,1440,1429,1459,1444,1422;
+	setarray .gnpMobsName$[24],"Naga","Mold","Tracing Missiles","Aryong","Abiryong","Bacterium";
+	setarray .gnpMobsId[24],1421,1481,1424,1465,1466,1433;
+	setarray .gnpMobsName$[30],"Winning System","Fat Archer","Little black goat","Perverted","Treasure Box","Greenhorn";
+	setarray .gnpMobsId[30],1427,1473,1431,1446,1474,1471;
+	setarray .gnpMobsName$[36],"Hurricane","External Hog","Landlord of Maze","Knight of grudge","Archer of grudge","Papillon";
+	setarray .gnpMobsId[36],1450,1439,1461,1467,1453,1479;
+	setarray .gnpMobsName$[42],"Lip","Wendigo","E Card","Tentacle Monster","Muscular Alarm","Devil Cross";
+	setarray .gnpMobsId[42],1451,1475,1437,1441,1476,1435;
+	setarray .gnpMobsName$[48],"Maggot","Large Frame","Season of reading","Shining Fingers","Handbag","Major knight of grudge";
+	setarray .gnpMobsId[48],1477,1448,1478,1489,1488,1438;
+	setarray .gnpMobsName$[54],"Queen","Man of Fire","Sword of Executor","Mutant Dragon","Mixed Soup","Great Sword";
+	setarray .gnpMobsId[54],1482,1464,1487,1449,1456,1486;
+	setarray .gnpMobsName$[60],"Monster Bird","Torturer","Warrior","Vice-Torturer","Huge Sword";
+	setarray .gnpMobsId[60],1447,1483,1490,1484,1485;
 	end;
 
-	OnTimer120000:
-		areaannounce "gon_test",41,81,74,92,"1 min. left",0;
+OnTimer120000:
+	areaannounce "gon_test",41,81,74,92,"1 min. left",0;
 	end;
 
-	OnTimer180000:
-		killmonster "gon_test","Summoner#gnp::OnGnpMobDead";
+OnTimer180000:
+	killmonster "gon_test","Summoner#gnp::OnGnpMobDead";
 	end;
 
-	OnTimer182000:
-		areaannounce "gon_test",41,81,74,92,"Time Over.",0;
+OnTimer182000:
+	areaannounce "gon_test",41,81,74,92,"Time Over.",0;
 	end;
 
-	OnGnpMobDead:
-		setnpctimer 0;
-		set in_battle,1;
-		areaannounce "gon_test",41,81,74,92,"Thank you. Please, come again.",0;
-		sleep 4000;
-	OnTimer184000:
-		stopnpctimer;
-		areawarp "gon_test",41,81,74,92,"gon_test",44,4;
-		set $@in_battle,0;
+OnGnpMobDead:
+	setnpctimer 0;
+	set in_battle,1;
+	areaannounce "gon_test",41,81,74,92,"Thank you. Please come again.",0;
+	sleep 4000;
+OnTimer184000:
+	stopnpctimer;
+	areawarp "gon_test",41,81,74,92,"gon_test",44,4;
+	set $@in_battle,0;
 	end;
 }
 
@@ -285,13 +246,13 @@ gon_test,46,14,3	script	Guide of field of fight	770,{
 		break;
 	case 2:
 		mes "[SongHeeYeon]";
-		mes "eh.... excuse me?";
-		mes "ah..I'm afraid I have to work right now...";
-		mes "I am sorry..";
+		mes "Eh.... excuse me?";
+		mes "Ah, I'm afraid I have to work right now...";
+		mes "Sorry...";
 		break;
 	case 3:
 		mes "[SongHeeYeon]";
-		mes "Yes, Thank you.";
+		mes "Yes, thank you.";
 		mes "Have a good time.";
 		close2;
 		set in_battle,3;
@@ -307,7 +268,7 @@ gon_test,46,14,3	script	Guide of field of fight	770,{
 	case 5:
 		mes "[SongHeeYeon]";
 		mes "........";
-		mes "Good bye..";
+		mes "Goodbye...";
 		break;
 	}
 	close;
diff --git a/npc/other/sealstatus.txt b/npc/other/sealstatus.txt
index c314ba976..74cae182e 100644
--- a/npc/other/sealstatus.txt
+++ b/npc/other/sealstatus.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,45 +11,27 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Translated from the official. [L0ne_W0lf]
 //= 1.1 Now checks proper char vars. [L0ne_W0lf]
+//= 1.2 Cleaning. [Euphy]
 //============================================================ 
 
 prontera,113,294,3	script	Sign Post	837,{
 	mes "======== God Seal Status ========";
-	
-	if ($god1 == 0) { mes "Sleipnir Seal: Unseen"; }
-	else if ($god1 < 50) { mes "Sleipnir Seal: Active"; }
-	else if ($god1 < 100) { mes "Sleipnir Seal: Appeared"; }
-	else { mes "Sleipnir Seal: Released"; }
-	
-	if ($god2 == 0) { mes "Megingjard Seal: Unseen"; }
-	else if ($god2 < 50) { mes "Megingjard Seal: Active"; }
-	else if ($god2 < 100) { mes "Megingjard Seal: Appeared"; }
-	else { mes "Megingjard Seal: Released"; }
-	
-	if ($god3 == 0) { mes "Brisingamen Seal: Unseen"; }
-	else if ($god3 < 50) { 	mes "Brisingamen Seal: Active"; }
-	else if ($god3 < 100) { mes "Brisingamen Seal: Appeared"; }
-	else { mes "Brisingamen Seal: Released"; }
-	
-	if ($god4 == 0) { mes "Mjolnir Seal: Unseen"; }
-	else if ($god4 < 50) { mes "Mjolnir Seal: Active"; }
-	else if ($god4 < 100) { mes "Mjolnir Seal: Appeared"; }
-	else { mes "Mjolnir Seal: Released"; }
-	
+	setarray .@n$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
+	for(set .@i,1; .@i<5; set .@i,.@i+1) {
+		if (getd("$god"+.@i) == 0) mes .@n$[.@i]+" Seal: Unseen";
+		else if (getd("$god"+.@i) < 50) mes .@n$[.@i]+" Seal: Active";
+		else if (getd("$god"+.@i) < 100) mes .@n$[.@i]+" Seal: Appeared";
+		else mes .@n$[.@i]+" Seal: Released";
+	}
 	mes " ";
 	mes "======= Your Seal Status ========";
-	
-	if (god_sl_1 < 51) { mes "^ff0000Sleipnir Seal: Not Completed^000000"; }
-	else { mes "^00ff00Sleipnir Seal: Completed^000000"; }
-	
-	if (god_eremes < 28) { mes "^ff0000Megingjard Seal: Not Completed^000000"; }
-	else { mes "^00ff00Megingjard Seal: Completed^000000"; }
-	
-	if (god_brising < 50) { mes "^ff0000Brisingamen Seal: Not Completed^000000"; }
-	else { mes "^00ff00Brisingamen Seal: Completed^000000"; }
-	
-	if (god_mjo_0 < 11) { mes "^ff0000Mjolnir Seal: Not Completed^000000"; }
-	else { mes "^00ff00Mjolnir Seal: Completed^000000"; }
-	
-close;
-}
+	if (god_sl_1 < 51) mes "^ff0000Sleipnir Seal: Not Completed^000000";
+		else mes "^00ff00Sleipnir Seal: Completed^000000";
+	if (god_eremes < 28) mes "^ff0000Megingjard Seal: Not Completed^000000";
+		else mes "^00ff00Megingjard Seal: Completed^000000";
+	if (god_brising < 50) mes "^ff0000Brisingamen Seal: Not Completed^000000";
+		else mes "^00ff00Brisingamen Seal: Completed^000000";
+	if (god_mjo_0 < 11) mes "^ff0000Mjolnir Seal: Not Completed^000000";
+		else mes "^00ff00Mjolnir Seal: Completed^000000";
+	close;
+}
\ No newline at end of file
diff --git a/npc/quests/Dandelion_Request.txt b/npc/quests/Dandelion_Request.txt
index cb2add4f9..60af8ace2 100644
--- a/npc/quests/Dandelion_Request.txt
+++ b/npc/quests/Dandelion_Request.txt
@@ -1,6 +1,18 @@
-//==================================================================================//
-//			Dandelion's Request / Morocc Invasion quest
-//==================================================================================//
+//===== rAthena Script ======================================= 
+//= Dandelion's Request / Morocc Invasion quest
+//===== By: ================================================== 
+//= SinSloth
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= A Morroc quest that is no longer used.
+//===== Additional Comments: ================================= 
+//= 1.1 Fixed a small bug in Dandelion's Request. [SinSloth]
+//= 1.2 Moved Dandelion's Request to its own file.
+//============================================================ 
+
 izlude,103,106,3	script	Guildsman#1	48,3,3,{
 
 	if(checkweight(7416,1) != 1)
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index fcc76b832..097d7f78b 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-// [Aegis COnversion]
+// [Aegis Conversion]
 //= Old Blue Box quest (?)
 //= Officially this quest gave an OBB in exhange for a the
 //= required items unlimitedly, however this was changed by
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 8628ff426..89c565c32 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script ======================================= 
 //= Quest NPCs related to Morroc
 //===== By: ================================================== 
 //= kobra_k88
@@ -32,7 +32,7 @@
 //= 2.2 Updated Binocular and Stop Post quests. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
 //= 2.4 Implemented Ep. 12.1 Continental Guard Quest. [L0ne_W0lf]
-//=     Moved Dandelion's Request to a it's own file.
+//=     Moved Dandelion's Request to its own file.
 //=     Added support NPCs required to finish Gaebolg quest.
 //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf]
 //= 2.6 Added quest log commands for Resurrection of Satan Morroc. [L0ne_W0lf]