More aggressive whitespace cleanup. Follow up to 51329e6

Signed-off-by: Haru <haru@dotalux.com>

9 files changed, 162 insertions, 204 deletions

diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index a6c09fe80..c6628ef12 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -65,9 +65,7 @@ prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
 		mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000.";
 		Memorial08 = 1;
 		close;
-	}
-
-	else if (Memorial08 == 1) {
+	} else if (Memorial08 == 1) {
 		if (countitem(1059) < 30 || countitem(914) < 20) {
 			mes "[Mad Sago Lauds]";
 			mes "What are these? They aren't enough?!";
@@ -94,9 +92,7 @@ prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
 			Memorial08 = 2;
 			close;
 		}
-	}
-	
-	else if (Memorial08 == 2) {
+	} else if (Memorial08 == 2) {
 		mes "[Mad Sago Lauds]";
 		mes "Ah, you have fluffy new towel now I even put your name on it";
 		next;
@@ -116,22 +112,16 @@ prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
 		mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000.";
 		Memorial08 = 3;
 		close;
-	}
-
-	else if (Memorial08 == 3) {
+	} else if (Memorial08 == 3) {
 		mes "[Mad Sago Lauds]";
 		mes "What are you still doing here?";
 		mes "I told you to go speak to Grast in Prontera!";
 		close;
-	}
-
-	else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
+	} else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
 		mes "[Mad Sago Lauds]";
 		mes "Go help Grast, and then come back.";
 		close;
-	}
-
-	else if (Memorial08 == 7) {
+	} else if (Memorial08 == 7) {
 		mes "[Mad Sago Lauds]";
 		mes "Oh, you've brought them all.";
 		mes "Hahaha!";
@@ -151,16 +141,12 @@ prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
 		mes "You should be going to the plaque!";
 		Memorial08 = 8;
 		close;
-	}
-
-	else if (Memorial08 == 8) {
+	} else if (Memorial08 == 8) {
 		mes "[Mad Sago Lauds]";
 		mes "Stop trying to give me your garbage!";
 		mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!";
 		close;
-	}
-	
-	else if (Memorial08 >= 9) {
+	} else if (Memorial08 >= 9) {
 		.@RandomMsg = rand(1,5);
 		if (.@RandomMsg == 1) {
 			mes "[Mad Sago Lauds]";
@@ -191,7 +177,7 @@ prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
 		}
 	}
 }
-		
+
 // Memorial Plaque
 //============================================================
 prontera,153,286,4	script	Memorial Plaque#Memorial	4_BOARD3,{
@@ -199,9 +185,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	4_BOARD3,{
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		close;
-	}
-	
-	else if (Memorial08 == 8) {
+	} else if (Memorial08 == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		mes "'This must be what Lauds was talking about.'";
@@ -210,43 +194,41 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	4_BOARD3,{
 		Memorial08 = 9;
 		getexp 93750,43750;
 		goto L_CleanPlaque;
-	}
-	
-	else if (Memorial08 >= 9) {
+	} else if (Memorial08 >= 9) {
 		goto L_CleanPlaque;
 	}
-	
-	L_CleanPlaque:
-		mes "- You see a message from the cleaned plaque.-";
-		next;
-		mes "-Although no sculptured marble should rise to their memory,-";
-		mes "-nor engraved stone bear record of their deeds,-";
-		mes "-yet will their remembrance be as lasting as the land they honored.-";
-		mes "-Daniel Webster-";
-		if (Memorial08 == 9) {
-			getexp 93750,43750;
-		}
-		next;
-		mes "-There's another message.-";
-		next;
-		mes "-I may not have gone where I intended to go,-";
-		mes "-but I think I have ended up where I needed to be.-";
-		mes "- Douglas Adams.-";
-		if (Memorial08 == 9) {
-			getexp 93750,43750;
-		}
-		next;
-		mes "-This is the last message.-";
-		next;
-		mes "-True heroism is remarkably sober, very undramatic.-";
-		mes "-It is not the urge to surpass all others at whatever cost,-";
-		mes "- but the urge to serve others at whatever cost. -";
-		mes "- Arthur Ashe -";
-		if (Memorial08 == 9) {
-			getexp 93750,43750;
-			Memorial08 = 10;
-		}
-		close;
+
+L_CleanPlaque:
+	mes "- You see a message from the cleaned plaque.-";
+	next;
+	mes "-Although no sculptured marble should rise to their memory,-";
+	mes "-nor engraved stone bear record of their deeds,-";
+	mes "-yet will their remembrance be as lasting as the land they honored.-";
+	mes "-Daniel Webster-";
+	if (Memorial08 == 9) {
+		getexp 93750,43750;
+	}
+	next;
+	mes "-There's another message.-";
+	next;
+	mes "-I may not have gone where I intended to go,-";
+	mes "-but I think I have ended up where I needed to be.-";
+	mes "- Douglas Adams.-";
+	if (Memorial08 == 9) {
+		getexp 93750,43750;
+	}
+	next;
+	mes "-This is the last message.-";
+	next;
+	mes "-True heroism is remarkably sober, very undramatic.-";
+	mes "-It is not the urge to surpass all others at whatever cost,-";
+	mes "- but the urge to serve others at whatever cost. -";
+	mes "- Arthur Ashe -";
+	if (Memorial08 == 9) {
+		getexp 93750,43750;
+		Memorial08 = 10;
+	}
+	close;
 }
 
 // Grast
@@ -257,9 +239,7 @@ prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
 		mes "Memorial Day is a sad and yet glorious day.";
 		mes "I wonder how many people remember them...";
 		close;
-	}
-	
-	else if (Memorial08 == 3) {
+	} else if (Memorial08 == 3) {
 		mes "[Grast]";
 		mes "Oh, isn't that a Towel of Memory?";
 		mes "I'm so glad to meet someone who understands the meaning of Memorial Day.";
@@ -275,9 +255,7 @@ prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
 		mes "I'll be waiting for your return.";
 		Memorial08 = 4;
 		close;
-	}
-
-	else if (Memorial08 == 4) {
+	} else if (Memorial08 == 4) {
 		if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -306,9 +284,7 @@ prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
 			Memorial08 = 5;
 			close;
 		}
-	}
-	
-	else if (Memorial08 == 5) {
+	} else if (Memorial08 == 5) {
 		if (countitem(1065) < 1 || countitem(610) < 1 || countitem(717) < 1 || countitem(747) < 1 || countitem(517) < 1 || countitem(515) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -333,9 +309,7 @@ prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
 			Memorial08 = 6;
 			close;
 		}
-	}
-	
-	else if (Memorial08 == 6) {
+	} else if (Memorial08 == 6) {
 		if (countitem(643) < 1 || countitem(12018) < 1 || countitem(741) < 1 || countitem(745) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -388,42 +362,38 @@ prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
 			getitem 12109,1;
 			close;
 		}
-	}
-	
-	else if (Memorial08 == 7) {
+	} else if (Memorial08 == 7) {
 		mes "[Grast]";
 		mes "Have you met Lauds?";
 		mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war.";
 		close;
-	}
-
-	else if (Memorial08 >= 8) {
+	} else if (Memorial08 >= 8) {
 		mes "[Grast]";
 		mes "A towel is about the most massively useful thing an adventurer can have.";
 		close;
 	}
 
-	L_GiveUp:
-		mes "[Grast]";
-		mes "Oh, I see. I guess you're quite busy nowadays, huh?";
-		mes "No problem; I'll give you all the supplies...";
-		next;
-		mes "[Grast]";
-		mes "There you go.";
-		mes "I crushed all the items together into a more compact form for you.";
-		mes "You can thank me later for that extra service.";
-		mes "Please bring them to Lauds.";
-		Memorial08 = 7;
-		getitem 7126,1;
-		next;
-		mes "[Grast]";
-		mes "By the way, he had an unfortunate accident, and has kind of lost his mind.";
-		mes "Please don't be alarmed even if he starts babbling.";
-		close;
-	
-	L_Continue:
-		mes "[Grast]";
-		mes "That's a good idea.";
-		mes "Then I'll be waiting for your return.";
-		close;
+L_GiveUp:
+	mes "[Grast]";
+	mes "Oh, I see. I guess you're quite busy nowadays, huh?";
+	mes "No problem; I'll give you all the supplies...";
+	next;
+	mes "[Grast]";
+	mes "There you go.";
+	mes "I crushed all the items together into a more compact form for you.";
+	mes "You can thank me later for that extra service.";
+	mes "Please bring them to Lauds.";
+	Memorial08 = 7;
+	getitem 7126,1;
+	next;
+	mes "[Grast]";
+	mes "By the way, he had an unfortunate accident, and has kind of lost his mind.";
+	mes "Please don't be alarmed even if he starts babbling.";
+	close;
+
+L_Continue:
+	mes "[Grast]";
+	mes "That's a good idea.";
+	mes "Then I'll be waiting for your return.";
+	close;
 }
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index 43b884a0d..faefaa16a 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -313,14 +313,14 @@ prontera,147,59,3	script	Goldberg#pron	4_M_OILMAN,{
 		mes "The enchant option in your item will be initialized.";
 		delitem 6665,1; //RWC_Inicializer
 		delequip .@part;
-	
+
 //		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
 		for(.@i = 0; .@i < 4; ++.@i) {
 			if (.@equip_card[.@i] >= 4700) // Armor Enchant System
 				.@equip_card[.@i] = 0;
 		}
 		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
-		
+
 		close;
 	}
 }
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 2b6d67eca..c412541cc 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -163,81 +163,81 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 						}
 					}
 				}
+				mes "[Caroller]";
+				mes "You know about Christmas!";
+				mes "Talking about Christmas...";
+				mes "...it's carols!!!";
+				mes "I've been waiting for this for when";
+				mes "Christmas comes around!";
+				next;
+				mes "[Caroller]";
+				mes "But there's been no caroling here and there like before, so we can't feel the Christmas spirit.";
+				next;
+				mes "[Caroller]";
+				mes "So, I installed a Singing Crystal in Prontera...";
+				next;
+				mes "[Caroller]";
+				mes "but that jerk Antonio broke the crystal!";
+				next;
+				mes "[Caroller]";
+				mes "The gift boxes have been changing into monsters since Antonio placed some magic on them, so the monsters ate up the crystal fragments!";
+				next;
+				mes "[Caroller]";
+				mes "I am so devastated, since the Singing Crystal has been the hope of many children around the villages.";
+				next;
+				if (select("There's no other way to carol?:You can hear carols in Lutie.") == 2) {
 					mes "[Caroller]";
-					mes "You know about Christmas!";
-					mes "Talking about Christmas...";
-					mes "...it's carols!!!";
-					mes "I've been waiting for this for when";
-					mes "Christmas comes around!";
-					next;
-					mes "[Caroller]";
-					mes "But there's been no caroling here and there like before, so we can't feel the Christmas spirit.";
-					next;
-					mes "[Caroller]";
-					mes "So, I installed a Singing Crystal in Prontera...";
-					next;
-					mes "[Caroller]";
-					mes "but that jerk Antonio broke the crystal!";
-					next;
-					mes "[Caroller]";
-					mes "The gift boxes have been changing into monsters since Antonio placed some magic on them, so the monsters ate up the crystal fragments!";
-					next;
-					mes "[Caroller]";
-					mes "I am so devastated, since the Singing Crystal has been the hope of many children around the villages.";
-					next;
-					if (select("There's no other way to carol?:You can hear carols in Lutie.") == 2) {
-						mes "[Caroller]";
-						mes "And just stay there, every Christmas, for your whole life?";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "What? What do you mean?";
-						next;
-						mes "[Caroller]";
-						mes "Oh, nevermind.";
-						mes "Ah...";
-						close;
-					}
-					mes "[Caroller]";
-					mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible.";
-					next;
-					mes "[Caroller]";
-					mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up.";
-					next;
-					mes "[Caroller]";
-					mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!";
-					next;
-					mes "[Caroller]";
-					mes "Sounds cool, huh!!";
-					next;
-					select("........................");
-					mes "[Caroller]";
-					mes "...Why are you staring at me like that?";
-					next;
-					mes "[Caroller]";
-					mes "You're thinking that we are always getting our plans spoiled, aren't you?";
-					next;
-					mes "[Caroller]";
-					mes "I know that we are not good at controlling stuff, but our rewards are good, right?";
-					next;
-					select("........................");
-					mes "[Caroller]";
-					mes "Hey, we treat you good...";
-					next;
-					select("........................");
-					mes "[Caroller]";
-					mes "You are so cruel to me!";
-					mes "Bad! Bad!";
+					mes "And just stay there, every Christmas, for your whole life?";
 					next;
-					mes "[Caroller]";
-					mes "Please, for our children's hope!!!?";
-					mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
+					mes "["+strcharinfo(0)+"]";
+					mes "What? What do you mean?";
 					next;
-					emotion e_ok;
 					mes "[Caroller]";
-					mes "They're definitely as harsh as their name.";
-					mes "Go on please!";
-					iROxmas08carol = 1;
+					mes "Oh, nevermind.";
+					mes "Ah...";
 					close;
+				}
+				mes "[Caroller]";
+				mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible.";
+				next;
+				mes "[Caroller]";
+				mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up.";
+				next;
+				mes "[Caroller]";
+				mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!";
+				next;
+				mes "[Caroller]";
+				mes "Sounds cool, huh!!";
+				next;
+				select("........................");
+				mes "[Caroller]";
+				mes "...Why are you staring at me like that?";
+				next;
+				mes "[Caroller]";
+				mes "You're thinking that we are always getting our plans spoiled, aren't you?";
+				next;
+				mes "[Caroller]";
+				mes "I know that we are not good at controlling stuff, but our rewards are good, right?";
+				next;
+				select("........................");
+				mes "[Caroller]";
+				mes "Hey, we treat you good...";
+				next;
+				select("........................");
+				mes "[Caroller]";
+				mes "You are so cruel to me!";
+				mes "Bad! Bad!";
+				next;
+				mes "[Caroller]";
+				mes "Please, for our children's hope!!!?";
+				mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
+				next;
+				emotion e_ok;
+				mes "[Caroller]";
+				mes "They're definitely as harsh as their name.";
+				mes "Go on please!";
+				iROxmas08carol = 1;
+				close;
 
 			case 4:
 				mes "[Caroller]";
@@ -260,7 +260,6 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 				mes "It's hot, huh?";
 				close;
 
-
 			case 5:
 				mes "[Caroller]";
 				mes "A-N-T-O-N-I-O!!!";
@@ -279,7 +278,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 				close;
 		}
 	}
-	
+
 	if (iROxmas08carol == 1) {
 		if (countitem(6092) < 6) {
 			mes "[Caroller]";
@@ -345,7 +344,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 			close;
 		}
 	}
-	
+
 	if (iROxmas08carol == 2) {
 		if (countitem(1019) < 10 || countitem(1005) < 1 || countitem(7312) < 1 || countitem(938) < 10 || countitem(732) < 1) {
 			mes "[Caroller]";
@@ -442,7 +441,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 	mes "All right, what comes to your mind when you think about Christmas?";
 	next;
 	switch(select("Carolling:Santa Claus:Gift Boxes:Santa Costume:Not much really...")) {
-	
+
 	case 1:
 		mes "[Santa Claus]";
 		mes "Carolling! That's good!";
@@ -471,7 +470,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 		mes "A bad Santa ruins us good Santa's reputations!";
 		mes "The World Santa Organization is considering this a grave situation.";
 		close;
-	
+
 	case 3:
 		mes "[Santa Claus]";
 		mes "A gift box! That sounds good!";
@@ -680,7 +679,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 		mes "There used to be designer who visited my house to make my Santa costumes.";
 		mes "Do you have any ideas?";
 		close;
-	
+
 	case 5:
 		mes "[Santa Claus]";
 		mes "........................";
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 23a085eb8..e20e4dd2a 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -10,7 +10,7 @@
 //= Ver 1.0- Duplicate of MRO's Dumpling Event
 //= 1.01 fixed bugs [Lupus]
 //============================================================
-  
+
 payon,93,81,4	script	Exorcist Master Fahae	4_M_BUDDHIST,{
 
 	mes "[Exorcist Master Fahae]";
@@ -64,7 +64,7 @@ payon,93,81,4	script	Exorcist Master Fahae	4_M_BUDDHIST,{
 	mes "Here you go, I hope you may succeed in my quest.";
 	close;
 }
-  
+
 // Monsters
 //============================================================
 gef_fild00,0,0,0,0	monster	Dumpling	1520,20,60000,66000
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 3b7dd50e8..aed725db5 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -120,7 +120,6 @@ yuno,118,192,5	script	Rmimi Ravies#gq_fes01	4_F_HUGIRL,{
 				mes "[Rmimi Ravies]";
 				mes "Have a good time.";
 				donpcevent "Rmimi Ravies#gq_fes01::OnStart";
-				
 				announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
 				close;
 			}
@@ -390,7 +389,6 @@ OnTimer3900000:
 	end;
 }
 
-
 // Original name: "Festival Manager#god_se_fes02"
 rachel,1,1,0	script	Festival Manager#gq_fes2	4_F_HUGIRL,{
 	callfunc "F_GM_NPC";
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index f67841c15..2f3a978e3 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -193,17 +193,17 @@ OnInit:
 	hideonnpc "Trick or Treater#iRO7";
 	hideonnpc "Trick or Treater#iRO8";
 	end;
-	
+
 OnEnableTreat:
 	enablenpc strnpcinfo(3);
 	hideonnpc strnpcinfo(3);
 	end;
-	
+
 OnTimer15000:
 	hideonnpc strnpcinfo(3);
 	disablenpc strnpcinfo(3);
 	end;
-		
+
 OnTimer300000:
 	donpcevent strnpcinfo(3)+"::OnEnableTreat";
 	stopnpctimer;
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index dcd3dbc14..830ded7f9 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -94,9 +94,6 @@ nguild_alde,74,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-18	GUILD_FLAG
 nguild_alde,203,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-19	GUILD_FLAG
 nguild_alde,210,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-20	GUILD_FLAG
 
-
-
-
 //============================================================================//
 // 			Castle 2
 //============================================================================//
@@ -125,8 +122,6 @@ nguild_gef,17,171,5	duplicate(NGuildGef)	NGuild Geffen#g1-10	GUILD_FLAG
 nguild_gef,59,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-11	GUILD_FLAG
 nguild_gef,64,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-12	GUILD_FLAG
 
-
-
 //============================================================================//
 // 			Castle 3
 //============================================================================//
@@ -155,9 +150,6 @@ nguild_pay,221,116,4	duplicate(NGuildPay)	NGuild Payon#f1-9	GUILD_FLAG
 nguild_pay,206,108,4	duplicate(NGuildPay)	NGuild Payon#f1-10	GUILD_FLAG
 nguild_pay,212,108,4	duplicate(NGuildPay)	NGuild Payon#f1-11	GUILD_FLAG
 
-
-
-
 //=============================================================================//
 // 			Castle 4
 //=============================================================================//
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index 56195d06a..aaaf74a85 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -314,7 +314,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	4_F_KAFRA7,{
 		mes "Come back when you're experienced enough to handle the quests.";
 		close;
 	}
-	
+
 	if (iROval09ring >= 1) {
 		mes "[Event Ring Maker]";
 		mes "The box with the ring, carved with your name, is for the one you love.";
@@ -328,7 +328,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	4_F_KAFRA7,{
 		mes "Be aware, and always try to stay popular!";
 		close;
 	}
-	
+
 	mes "[Event Ring Maker]";
 	mes "Hi, there, how are ya?";
 	mes "Come to me if you're interested in the event, 'Who's Valentine's Hottest?'";
@@ -435,7 +435,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 					next;
 					break;
 				}
-				
+
 				if (Sex) {
 					if (countitem(7947) > .@input) {
 						mes "[Valentine Vote Manager]";
@@ -444,7 +444,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 						next;
 						break;
 					}
-					
+
 					if (countitem(7947) < .@input) {
 						mes "[Valentine Vote Manager]";
 						mes "Seems like the value you entered is too large.";
@@ -452,7 +452,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 						next;
 						break;
 					}
-					
+
 					mes "[Valentine Vote Manager]";
 					mes "I'll take those silver rings, and count the votes for you.";
 					mes "Thank you for participating.";
@@ -472,7 +472,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 						next;
 						break;
 					}
-					
+
 					if (countitem(7946) < .@input) {
 						mes "[Valentine Vote Manager]";
 						mes "Seems like the value you entered is too large.";
@@ -480,7 +480,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 						next;
 						break;
 					}
-					
+
 					mes "[Valentine Vote Manager]";
 					mes "I'll take those gold rings, and count the votes for you.";
 					mes "Thank you for participating.";
@@ -533,7 +533,7 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	1_M_01,{
 		mes "Annoying, annoying, annoying~~!";
 		close;
 	}
-	
+
 	mes "[Charles Orleans]";
 	mes "Oh, Mademoiselle!";
 	mes "This little trifling space felt like heaven the minute you walked in!";
@@ -629,5 +629,4 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	1_M_01,{
 		mes "I hope this is just what you wanted, for it bears your beautiful heart inside.";
 		close;
 	}
-	
 }
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index e420f9e6d..be43b3752 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -90,7 +90,7 @@ L_Start:
 		mes "If you get 3 more, I'll give you another.";
 		mes "Hope you get a good item.";
 		close;
-	
+
 		L_NotEnuf:
 			mes "You don't have enough socks as proof.";
 			mes "Go take down those evil Santas";