NPCs on 030-* fixed

15 files changed, 60 insertions, 60 deletions

diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt
index 970197a0..d3322b89 100644
--- a/world/map/npc/030-2/avalia.txt
+++ b/world/map/npc/030-2/avalia.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // Author: cinderweb, wushin
 
-030-2.gat,198,61,0|script|Avalia|356,
+030-2.gat,198,61,0|script|Avalia|356
 {
     callfunc "XmasStates";
 
@@ -189,7 +189,7 @@ L_Close:
     close;
 }
 
-030-2.gat,190,64,0|script|Milis|330,
+030-2.gat,190,64,0|script|Milis|330
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/basic_npcs.txt b/world/map/npc/030-2/basic_npcs.txt
index b8573912..9e78162f 100644
--- a/world/map/npc/030-2/basic_npcs.txt
+++ b/world/map/npc/030-2/basic_npcs.txt
@@ -3,7 +3,7 @@
 
 // In the office
 
-030-2.gat,37,81,0|script|Oswal|328,
+030-2.gat,37,81,0|script|Oswal|328
 {
     mes "[Oswal]";
     mes "\"Welcome. I hope you enjoy your visit in Santa's residence. You already saw the workshop where the Christmas presents are crafted, right?\"";
@@ -13,14 +13,14 @@
     close;
 }
 
-030-2.gat,37,85,0|script|Taito|328,
+030-2.gat,37,85,0|script|Taito|328
 {
     mes "[Taito]";
     mes "\"Hello. I'm sorry, but I'm very busy at the moment and want to concentrate. If you have any questions, ask one of the other helpers.\"";
     close;
 }
 
-030-2.gat,31,77,0|script|Rikhard|329,
+030-2.gat,31,77,0|script|Rikhard|329
 {
     mes "[Rikhard]";
     mes "\"I'm really glad that this year's Christmas preparations are going well. You know, last year nearly everything went wrong, so we all had to work really hard on that, and the everyday issues had to be neglected.\"";
@@ -35,7 +35,7 @@
     close;
 }
 
-030-2.gat,31,85,0|script|Akseli|329,
+030-2.gat,31,85,0|script|Akseli|329
 {
     mes "[Akseli]";
     mes "\"Ah, a visitor! Do you enjoy your time in Santa's residence?\"";
@@ -65,7 +65,7 @@ L_Close:
 
 // In the workshop
 
-030-2.gat,78,34,0|script|Aaron|328,
+030-2.gat,78,34,0|script|Aaron|328
 {
     mes "[Aaron]";
     mes "\"Welcome to Santa's famous Christmas workshop. Feel free to have a look around and talk to the craftsmen.\"";
@@ -74,7 +74,7 @@ L_Close:
     close;
 }
 
-030-2.gat,154,33,0|script|Iivo|329,
+030-2.gat,154,33,0|script|Iivo|329
 {
     mes "You see a helper cutting some leather pieces. He looks very focused on his work. Then he notices you.";
     mes "[Iivo]";
diff --git a/world/map/npc/030-2/bedding_helper.txt b/world/map/npc/030-2/bedding_helper.txt
index 62fa6b34..c07105f0 100644
--- a/world/map/npc/030-2/bedding_helper.txt
+++ b/world/map/npc/030-2/bedding_helper.txt
@@ -3,7 +3,7 @@
 // Osmo asks for some White Fur which is used for bedding some presents in the boxes
 // can be sabotaged by given Cloth instead
 
-030-2.gat,37,77,0|script|Osmo|328,
+030-2.gat,37,77,0|script|Osmo|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/chief_helper.txt b/world/map/npc/030-2/chief_helper.txt
index 3c63ac14..0f361872 100644
--- a/world/map/npc/030-2/chief_helper.txt
+++ b/world/map/npc/030-2/chief_helper.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, wushin
 // Warrick is the Chief of Santa's helpers
 
-030-2.gat,127,42,0|script|Chief Warrick|329,
+030-2.gat,127,42,0|script|Chief Warrick|329
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 33c54bf6..96119fe4 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -1,7 +1,7 @@
 // Annual Xmas and Year round info
 // Author: Jenalya, wushin
 
-030-2.gat,87,41,0|script|Eljas|328,5,1,
+030-2.gat,87,41,0|script|Eljas|328,5,1
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
diff --git a/world/map/npc/030-2/empty_boxes_helper.txt b/world/map/npc/030-2/empty_boxes_helper.txt
index 248fb9d1..aabf07a2 100644
--- a/world/map/npc/030-2/empty_boxes_helper.txt
+++ b/world/map/npc/030-2/empty_boxes_helper.txt
@@ -3,7 +3,7 @@
 // Urmas asks for raw logs to make empty presents boxes
 // later he can be asked for those boxes to put toys in
 
-030-2.gat,140,41,0|script|Urmas|328,
+030-2.gat,140,41,0|script|Urmas|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/gaurds.txt b/world/map/npc/030-2/gaurds.txt
index c0f30e76..3fdc1ffa 100644
--- a/world/map/npc/030-2/gaurds.txt
+++ b/world/map/npc/030-2/gaurds.txt
@@ -1,6 +1,6 @@
 // Annual Xmas Bouncers
 
-030-2.gat,85,43,0|script|Valjas|330,
+030-2.gat,85,43,0|script|Valjas|330
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
@@ -9,7 +9,7 @@
     close;
 }
 
-030-2.gat,89,43,0|script|Halas|330,
+030-2.gat,89,43,0|script|Halas|330
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
@@ -18,7 +18,7 @@
     close;
 }
 
-030-2.gat,89,84,0|script|Kilis|330,5,2,
+030-2.gat,89,84,0|script|Kilis|330,5,2
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
diff --git a/world/map/npc/030-2/glitter_helper.txt b/world/map/npc/030-2/glitter_helper.txt
index c4ee84bb..e0637675 100644
--- a/world/map/npc/030-2/glitter_helper.txt
+++ b/world/map/npc/030-2/glitter_helper.txt
@@ -3,7 +3,7 @@
 // Veneri asks for Diamond Powder and Ruby Powder for decoration
 // can be sabotaged with Red Powder and Yellow Powder, Saboteur can make that out of Wisp and Spectre Powder
 
-030-2.gat,31,81,0|script|Veneri|328,
+030-2.gat,31,81,0|script|Veneri|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt
index ca4246e2..248c296a 100644
--- a/world/map/npc/030-2/present_helper.txt
+++ b/world/map/npc/030-2/present_helper.txt
@@ -2,7 +2,7 @@
 // Author: wushin
 // Present Reclaimation
 
-030-2.gat,47,82,0|script|Jonanthan|328,
+030-2.gat,47,82,0|script|Jonanthan|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt
index 2c901153..f942c118 100644
--- a/world/map/npc/030-2/roasted_acrons_helper.txt
+++ b/world/map/npc/030-2/roasted_acrons_helper.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // author: Jenalya, wushin
 
-030-2.gat,89,23,0|script|Verneri|334,
+030-2.gat,89,23,0|script|Verneri|334
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt
index 29a0ae26..e7f7b2f0 100644
--- a/world/map/npc/030-2/shipping_helper.txt
+++ b/world/map/npc/030-2/shipping_helper.txt
@@ -1,28 +1,28 @@
 // Annual Xmas
 // Author: Jenalya, wushin
 
-030-2.gat,30,88,0|script|Mo|328,
+030-2.gat,30,88,0|script|Mo|328
 {
     set $@npc_name$, "Mo";
     callfunc "helpersPacking";
     close;
 }
 
-030-2.gat,33,88,0|script|Lorrie|329,
+030-2.gat,33,88,0|script|Lorrie|329
 {
     set $@npc_name$, "Lorrie";
     callfunc "helpersPacking";
     close;
 }
 
-030-2.gat,37,88,0|script|Curlee|329,
+030-2.gat,37,88,0|script|Curlee|329
 {
     set $@npc_name$, "Curlee";
     callfunc "helpersPacking";
     close;
 }
 
-function|script|helpersPacking|,
+function|script|helpersPacking
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt
index 092d9a7d..1767ceaf 100644
--- a/world/map/npc/030-2/storage_helper.txt
+++ b/world/map/npc/030-2/storage_helper.txt
@@ -1,7 +1,7 @@
 // Annual Christmas
 // author: Jenalya, wushin
 
-030-2.gat,25,35,0|script|Vellamo|328,
+030-2.gat,25,35,0|script|Vellamo|328
 {
     set @halloween_npc_id, $@halloween_npc_vellamo;
     callfunc "TrickOrTreat";
@@ -50,7 +50,7 @@ L_Close:
     close;
 }
 
-030-2.gat,33,29,0|script|Ismo|329,
+030-2.gat,33,29,0|script|Ismo|329
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt
index dcd5a36e..75198417 100644
--- a/world/map/npc/030-2/wrapping_paper_helper.txt
+++ b/world/map/npc/030-2/wrapping_paper_helper.txt
@@ -3,7 +3,7 @@
 // also for some dyes to make them colorful
 // later he can be asked for those papers to wrap boxes
 
-030-2.gat,140,31,0|script|Reino|328,
+030-2.gat,140,31,0|script|Reino|328
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index 85e825a9..ee325875 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // Authors: Wushin, Chayenne
 
-019-3.gat,79,30,0|script|#OrumTelepathy1|45,3,3,
+019-3.gat,79,30,0|script|#OrumTelepathy1|45,3,3
 {
     callfunc "XmasStates";
 
@@ -24,7 +24,7 @@ L_End:
     end;
 }
 
-019-3.gat,104,67,0|script|#OrumTelepathy2|45,1,1,
+019-3.gat,104,67,0|script|#OrumTelepathy2|45,1,1
 {
     callfunc "XmasStates";
 
@@ -47,7 +47,7 @@ L_End:
     end;
 }
 
-019-3.gat,102,95,0|script|#OrumTelepathy3|45,3,3,
+019-3.gat,102,95,0|script|#OrumTelepathy3|45,3,3
 {
     callfunc "XmasStates";
 
@@ -70,7 +70,7 @@ L_End:
     end;
 }
 
-019-3.gat,81,61,0|script|#OrumTelepathy4|45,3,3,
+019-3.gat,81,61,0|script|#OrumTelepathy4|45,3,3
 {
     callfunc "XmasStates";
 
@@ -93,7 +93,7 @@ L_End:
     end;
 }
 
-030-3.gat,62,74,0|script|#OrumTelepathy5|45,1,1,
+030-3.gat,62,74,0|script|#OrumTelepathy5|45,1,1
 {
     callfunc "XmasStates";
 
@@ -116,7 +116,7 @@ L_End:
     end;
 }
 
-030-3.gat,48,73,0|script|#OrumTelepathy6|45,1,1,
+030-3.gat,48,73,0|script|#OrumTelepathy6|45,1,1
 {
     callfunc "XmasStates";
 
@@ -139,7 +139,7 @@ L_End:
     end;
 }
 
-030-3.gat,55,52,0|script|#OrumTelepathy7|45,1,1,
+030-3.gat,55,52,0|script|#OrumTelepathy7|45,1,1
 {
     callfunc "XmasStates";
 
@@ -162,7 +162,7 @@ L_End:
     end;
 }
 
-030-3.gat,28,28,0|script|Orum's Homunculus|385,
+030-3.gat,28,28,0|script|Orum's Homunculus|385
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 6f59d10e..ed6101a7 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -21,7 +21,7 @@
 //TODO Add an icreasing particle effect to the chest, move it half a tile right
 // and make it one of those lab tables from the slime quests
 
-030-4.gat,32,21,0|script|AniManOMat|400,
+030-4.gat,32,21,0|script|AniManOMat|400
 {
     set $@XmasBattleStatusClone, 0;
     callfunc "XmasStates";
@@ -361,33 +361,33 @@ L_Restart:
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
     "Avalia: I am getting a weird sensation ... ",
-    "Orums Homunculus : I think they know what we are up to!",
-    "Avalia : Oh no! This is going to blow up",
-    "Orums Homunculus : The Door is locked you idiot, fight for your life.",
-    "Avalia : Guards of Honor I demand you: STOP!",
-    "Orums Homunculus : Okay, this is somewhat funny... why are they coming back?!?",
-    "Avalia : You brave fighters! Deactivate the nutcrackers! they are out of control!",
-    "Orums Homunculus : The good news is: if we make it this time we will never have to do that again!",
-    "Avalia : Oh boy we are so screwed.",
-    "Orums Homunculus : Report: I am an Idiot",
-    "Avalia : Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.",
-    "Orums Homunculus : Strange they are getting more and not less.",
-    "Avalia : Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.",
-    "Orums Homunculus : If I was smart enough to stop talking, it would have happened already..",
-    "Avalia : I cannot believe it, this is making them stronger. More and more of them are coming.",
-    "Orums Homunculus : I think we are almost done, the bomb should explode any second.",
-    "Avalia : Those poor creatures. Just kill them all.",
-    "Orums Homunculus : A N Y  S E C O N D.",
-    "Avalia : Oh well... just try again, I trust in you.",
-    "Orum's Homunculus : just lol.",
-    "Avalia : Wow! You saved christmas.",
-    "Orum's Homunculus : Yep, it's over... and strange enough you survived.";
+    "Orums Homunculus:* I think they know what we are up to!",
+    "Avalia:* Oh no! This is going to blow up",
+    "Orums Homunculus:* The Door is locked you idiot, fight for your life.",
+    "Avalia:* Guards of Honor I demand you: STOP!",
+    "Orums Homunculus:* Okay, this is somewhat funny... why are they coming back?!?",
+    "Avalia:* You brave fighters! Deactivate the nutcrackers! they are out of control!",
+    "Orums Homunculus:* The good news is: if we make it this time we will never have to do that again!",
+    "Avalia:* Oh boy we are so screwed.",
+    "Orums Homunculus:* Report: I am an Idiot",
+    "Avalia:* Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.",
+    "Orums Homunculus:* Strange they are getting more and not less.",
+    "Avalia:* Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.",
+    "Orums Homunculus:* If I was smart enough to stop talking, it would have happened already..",
+    "Avalia:* I cannot believe it, this is making them stronger. More and more of them are coming.",
+    "Orums Homunculus:* I think we are almost done, the bomb should explode any second.",
+    "Avalia:* Those poor creatures. Just kill them all.",
+    "Orums Homunculus:* A N Y  S E C O N D.",
+    "Avalia:* Oh well... just try again, I trust in you.",
+    "Orum's Homunculus:* just lol.",
+    "Avalia:* Wow! You saved christmas.",
+    "Orum's Homunculus:* Yep, it's over... and strange enough you survived.";
 
     setarray $@xmas_final_announce$,
-        "Avalia : Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!",
-        "Orum's Homunculus : Boy are you lame. So what now? The battery is still not placed! Go try again!",
-        "Avalia : W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.",
-        "Orum's Homunculus : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
+        "Avalia:* Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!",
+        "Orum's Homunculus:* Boy are you lame. So what now? The battery is still not placed! Go try again!",
+        "Avalia:* W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.",
+        "Orum's Homunculus:* Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
     // Danger Cells to attack sitters
     // 0: 19,20,29,29
     // 1: 30,20,40,29
@@ -438,7 +438,7 @@ S_ClearVariables:
     return;
 }
 
-030-4.gat,0,0,0|script|#XmasChamberCooler|-1,
+030-4.gat,0,0,0|script|#XmasChamberCooler|-1
 {
     end;
 OnCommandCoolDown: