edit out NPCs that need fixing and added some fixes

edited out krickkrackrock, rockscissor, baktar

golbenez and santa language clean up and small fixes.

5 files changed, 12 insertions, 12 deletions

diff --git a/npc/020-1_Nivalis/KrickKrackKrock.txt b/npc/020-1_Nivalis/KrickKrackKrock.txt
index 722847cd..b3cc3dd8 100755
--- a/npc/020-1_Nivalis/KrickKrackKrock.txt
+++ b/npc/020-1_Nivalis/KrickKrackKrock.txt
@@ -1,6 +1,6 @@
 // author: Lien
 // reviewed by Pjotr Orial and Jenalya
-020-1.gat,82,82,0	script	Criker	192, {
+//020-1.gat,82,82,0	script	Criker	192, {
 
 L_Main:
 //Var
diff --git a/npc/020-1_Nivalis/rockscissor.txt b/npc/020-1_Nivalis/rockscissor.txt
index 0f5c20c9..d4a9d6f6 100755
--- a/npc/020-1_Nivalis/rockscissor.txt
+++ b/npc/020-1_Nivalis/rockscissor.txt
@@ -9,7 +9,7 @@
 //    ------------------------        #
 //#####################################
 
-020-1.gat,74,78,0	script	Gobmel	189,	{
+//020-1.gat,74,78,0	script	Gobmel	189,	{
 	//var
     set @NPC_name$, "[Gobmel]";
     set @NPC_point, 0;
diff --git a/npc/020-2_Nivalis/baktar.txt b/npc/020-2_Nivalis/baktar.txt
index f62c9bb8..644afddc 100755
--- a/npc/020-2_Nivalis/baktar.txt
+++ b/npc/020-2_Nivalis/baktar.txt
@@ -31,7 +31,7 @@
 //# bit 0  knows the name/location of the opponent
 //# bit 1  killed the ugly opponent
 //#=========================
-020-2.gat,70,61,0	script	Baktar	191,{
+//020-2.gat,70,61,0	script	Baktar	191,{
         set @npcname$, "[Baktar]";
 
         set @Q_MASK, BYTE_0_MASK;
diff --git a/npc/xmas/2010/golbanez.txt b/npc/xmas/2010/golbanez.txt
index 0c308ef4..e3c4d488 100755
--- a/npc/xmas/2010/golbanez.txt
+++ b/npc/xmas/2010/golbanez.txt
@@ -22,15 +22,15 @@
 	mes "[Golbenez]";
 	mes "\"Mortal!  I am Golbenez!  I have broken through the barriers of space and time!\"";
 	next;
-	mes "\"Well to let you know, I am taking Santa Claus and rudolph and the fellow rendiers as hostages.\"";
+	mes "\"Well to let you know, I have taken Santa Claus, Rudolph and his fellow raindeer hostage.\"";
 	next;
-	mes "\"This sounds hard to you maybe... But I need lots of stuff for building the way to the leisure place.";
+	mes "\"This may sound hard to you ... But I need lots of stuff for building the way to place of leisure.";
 	next;
-	mes "\"So if you want to have donations at christmas... we should make a deal: Bring me money or presents.";
+	mes "\"So if you want to have donations at Christmas... we should make a deal: Bring me money or presents.";
 	next;
-	mes "\"Maybe I will release Santa Claus and the rendiers then.\"";
+	mes "\"Maybe I will release Santa Claus and the raindeer then.\"";
 	next;
-	mes "\"Do you really expect a promise to let him free on christmas?\"";
+	mes "\"But do you really expect a promise to let him free on Christmas?\"";
 	next;
 	mes "\"Uhm well, then you should get away!\"";
 	next;
@@ -41,7 +41,7 @@
 		"I'd like to give some yellow presents.", -, 
 		"I'd like to give some blue presents.", -,
 		"I'd like to give some green presents.", -,
-		"I'd like to give some pink presents.", -,
+		"I'd like to give some purple presents.", -,
 		"Why do you want present boxes?",Glb_whypresents,
 		"Can I bring other items?", Glb_otheritems,
 		"Nevermind.", Glb_nvm;
@@ -133,7 +133,7 @@ Glb_nvm:
 
 Glb_whypresents:
 	mes "[Golbenez]";
-	mes "\"The presents contain some sort of spiritual attachment that aids in the creation of dimensional connections to this plane of existence. The green ones contain the stronger spiritual attachment, followed by the blue and then pink present boxes. But the yellow ones, they have amazing spiritual attachment.\"";
+	mes "\"The presents contain some sort of spiritual attachment that aids in the creation of dimensional connections to this plane of existence. The green ones contain the stronger spiritual attachment, followed by the blue and then purple present boxes. But the yellow ones, they have amazing spiritual attachment.\"";
 	close;
 
 Glb_otheritems:
@@ -151,7 +151,7 @@ Glb_Inn_Enough:
 	next;
 	mes "\"I have collected enough for now.\"";
 	next;
-	mes "\"This helps me working on the leisure place.\"";
+	mes "\"This helps me finish the place of leisure.\"";
 	next;
 	mes "\"Although I did not promise I let Santa be free again!\"";
 	next;
diff --git a/npc/xmas/2010/santa.txt b/npc/xmas/2010/santa.txt
index 2b2870c1..85f46da1 100755
--- a/npc/xmas/2010/santa.txt
+++ b/npc/xmas/2010/santa.txt
@@ -34,7 +34,7 @@ L_start:
                 "Im " + strcharinfo(0) + " and I am here to save you from Golbenez.",-;
         mes "\"I cant believe it... are you really " +strcharinfo(0)+ "? I remember all the comments that... 'Thing' was making about building his way to a 'Leisure Place' and how your donations would really help him.\"";
         next;
-        mes "\"What is his name again? Erh... Golbinos? Galvanis? Ho-hum... All I know is that it was keeping me and my fellow rendiers as hostages in this cold labyrinth. And you proved yourself a good " +@gender$+ " by helping me with all those donations!\"";
+        mes "\"What is his name again? Erh... Golbinos? Galvanis? Ho-hum... All I know is that it was keeping me and my raindeer hostage in this cold labyrinth. And you proved yourself a good " +@gender$+ " by helping me with all those donations!\"";
         next;
         if (gettime(6) != 12 || gettime(5) >= 25) goto L_Skip_Dialogue;
         mes "\"Well, we are really late! In a few hours we have to start our usual present giving routine... But not before I give you a special gift for all you did.\"";