Give every NPC a unique name

37 files changed, 83 insertions, 82 deletions

diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt
index 4ebea361..be22cb89 100644
--- a/world/map/npc/001-1/soul-menhir.txt
+++ b/world/map/npc/001-1/soul-menhir.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,38,69,0|script|Soul Menhir|345,
+001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345,
 {
     callfunc "ClearVariables";
     set @map$, "001-1.gat";
diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index 78ee6ca6..38acaf85 100644
--- a/world/map/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
@@ -1,6 +1,6 @@
 //
 
-001-3.gat,77,37,0|script|Phaet|125,
+001-3.gat,77,37,0|script|Phaet#arena|125,
 {
     mes "[Phaet the Royal Guard]";
     mes "\"Do you want to go back?\"";
diff --git a/world/map/npc/002-4/mine_triggerone.txt b/world/map/npc/002-4/mine_triggerone.txt
index 6d7e8e13..86d9a501 100644
--- a/world/map/npc/002-4/mine_triggerone.txt
+++ b/world/map/npc/002-4/mine_triggerone.txt
@@ -1,7 +1,7 @@
 //Sandstorm mine trigger 1 Trigger 002-4 35,43 (127)
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-4.gat,30,47,0|script|Button|400,0,0,
+002-4.gat,30,47,0|script|Button#mine-1|400,0,0,
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-4/mine_triggerthree.txt b/world/map/npc/002-4/mine_triggerthree.txt
index 015928f1..76ea8e9e 100644
--- a/world/map/npc/002-4/mine_triggerthree.txt
+++ b/world/map/npc/002-4/mine_triggerthree.txt
@@ -1,7 +1,7 @@
 //Sandstorm mine trigger 3 Trigger 002-4 98,42 (127)
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-4.gat,91,99,0|script|Button|400,0,0,
+002-4.gat,91,99,0|script|Button#mine-3|400,0,0,
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-4/mine_triggertwo.txt b/world/map/npc/002-4/mine_triggertwo.txt
index 4af6ad7e..f51a85e3 100644
--- a/world/map/npc/002-4/mine_triggertwo.txt
+++ b/world/map/npc/002-4/mine_triggertwo.txt
@@ -3,7 +3,7 @@
 // - nibble 4 and 5 of QUEST_SouthTulimshar
 // - in FLAGS, FLAG_OPENED_UNDERGROUND
 
-002-4.gat,100,37,0|script|Button|400,0,0,
+002-4.gat,100,37,0|script|Button#mine-2|400,0,0,
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt
index 499b637e..fda22da2 100644
--- a/world/map/npc/005-1/npcs.txt
+++ b/world/map/npc/005-1/npcs.txt
@@ -1,6 +1,6 @@
 //
 
-005-1.gat,69,76,0|shop|George|115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2
+005-1.gat,69,76,0|shop|George#sandstorm|115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2
 
 005-1.gat,66,75,0|script|Kieron|132,
 {
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index fb7406bb..5faf73bf 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -1,6 +1,6 @@
 //
 
-008-1.gat,136,36,0|script|George|138,
+008-1.gat,136,36,0|script|George#pirate|138,
 {
     set @hw2011_npc_id, $@hw2011_npc_george;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt
index 063ac7a9..cc711625 100644
--- a/world/map/npc/009-1/soul-menhir.txt
+++ b/world/map/npc/009-1/soul-menhir.txt
@@ -1,6 +1,6 @@
 //
 
-009-1.gat,53,40,0|script|Soul Menhir|344,
+009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344,
 {
     callfunc "ClearVariables";
     set @map$, "009-1.gat";
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index d97100ac..73158c14 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,6 +1,6 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0|script|Drinker|121,
+009-2.gat,65,55,0|script|Drinker#1|121,
 {
     mes "[Binge Drinker]";
     mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
@@ -9,7 +9,7 @@
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0|script|Drinker|121,
+009-2.gat,68,55,0|script|Drinker#2|121,
 {
     mes "[Binge Drinker]";
     mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index 5c80dc90..7af10c83 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,6 +1,6 @@
 //Note in bar
 
-009-2.gat,54,49,0|script|Note|400,
+009-2.gat,54,49,0|script|Note#bar|400,
 {
     mes "[Note]";
     mes "\"We refuse service to anyone who:\"";
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index c6267ceb..7837b816 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -10,7 +10,7 @@
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0|script|Receptionist|108,
+009-2.gat,50,48,0|script|Receptionist#inn|108,
 {
     set @npcname$, "Receptionist";
     set @cost, 100;
@@ -27,4 +27,4 @@
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0|shop|General Store|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
+009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index a8c4b505..c6cbd403 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -18,7 +18,7 @@
 //# OrumQuestBarrier    nibble (0,1,2) stores the color of the barriers           #
 //#################################################################################
 
-009-4.gat,37,115,0|script|Orum|158,
+009-4.gat,37,115,0|script|Orum#barrier|158,
 {
     // needed to pass the very first barrier
     set @B0_WISPPOWDER, 4;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 03acc6b0..79fb6ca1 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -268,7 +268,7 @@ L_Failed:
 }
 
 // First Torch
-009-4.gat,68,21,0|script|Torch|400,
+009-4.gat,68,21,0|script|Torch#1|400,
 {
     callfunc "InRangeTorch1";
     callfunc "DoneWithTorches";
@@ -279,7 +279,7 @@ L_Failed:
 }
 
 // Second Torch
-009-4.gat,67,42,0|script|Torch|400,
+009-4.gat,67,42,0|script|Torch#2|400,
 {
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
@@ -290,7 +290,7 @@ L_Failed:
 }
 
 // Third Torch
-009-4.gat,33,86,0|script|Torch|400,
+009-4.gat,33,86,0|script|Torch#3|400,
 {
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 9231bb94..13187203 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -19,7 +19,7 @@
     close;
 }
 
-009-4.gat,120,43,0|script|Orum|158,
+009-4.gat,120,43,0|script|Orum#trap|158,
 {
     mes "[Orum]";
     mes "\"I told you to forget about this place but you did not heed my advice!\"";
@@ -28,7 +28,7 @@
     close;
 }
 
-009-4.gat,118,42,0|script|Waric|153,
+009-4.gat,118,42,0|script|Waric#trap|153,
 {
     set @EXP_LEARNED_ALOT, 10000;
     if (OrumQuest >= 13)
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 6343e517..0a295d65 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,4 +1,4 @@
-010-2.gat,33,25,0|script|Chef|148,
+010-2.gat,33,25,0|script|Chef#dimond|148,
 {
 // lines belong to Easter 2011:
 // set @month, 4;
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 3bc1f75d..300891c3 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -501,14 +501,14 @@ leave:
     close;
 }
 
-010-2.gat,71,38,0|script|Store Policy|400,
+010-2.gat,71,38,0|script|Store Policy#1|400,
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,77,38,0|script|Store Policy|400,
+010-2.gat,77,38,0|script|Store Policy#2|400,
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
@@ -565,7 +565,7 @@ leave:
 
 010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow :-1,IronArrow :-1,LeatherShield :-1
 
-010-2.gat,65,41,0|shop|General Store|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
+010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
 
 010-2.gat,75,68,0|script|Basil|107,
 {
diff --git a/world/map/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt
index 4dd2336d..bb92d1fe 100644
--- a/world/map/npc/012-3/warningsigns.txt
+++ b/world/map/npc/012-3/warningsigns.txt
@@ -1,6 +1,6 @@
 //warning signs at pvp entrance!
 
-012-3.gat,445,61,0|script|sign|187,
+012-3.gat,445,61,0|script|sign#pvp-1|187,
 {
     mes "You are about to enter a dangerous area!";
     next;
@@ -9,11 +9,11 @@
     close;
 }
 
-012-3.gat,451,61,0|script|sign|186,
+012-3.gat,451,61,0|script|sign#pvp-2|186,
 {
     mes "You are about to enter a dangerous area!";
     next;
     mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!";
     mes "That is why other players are able to attack you.";
     close;
-}
\ No newline at end of file
+}
diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index f946254f..f0aee204 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -1,25 +1,25 @@
 //
 
-013-2.gat,23,32,0|script|Motto|400,
+013-2.gat,23,32,0|script|Motto#wiz|400,
 {
     mes "Mid pleasures and palaces though we may roam,";
     mes "Be it ever so humble, there's no place like home.";
     close;
 }
 
-013-2.gat,30,32,0|script|Note|400,
+013-2.gat,30,32,0|script|Note#wiz|400,
 {
     mes "Please do not open.";
     close;
 }
 
-013-2.gat,38,20,0|script|Saying|400,
+013-2.gat,38,20,0|script|Saying#wiz|400,
 {
     mes "The early bird catcheth the worm.";
     close;
 }
 
-013-2.gat,27,21,0|script|Mirror|400,
+013-2.gat,27,21,0|script|Mirror#wiz|400,
 {
     mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\"";
     next;
@@ -35,7 +35,7 @@
 }
 
 // Warp to north-eastern woods
-013-2.gat,25,23,0|script|Spell|400,
+013-2.gat,25,23,0|script|Spell#wiz1|400,
 {
     mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\"";
     next;
@@ -48,7 +48,7 @@
 }
 
 // Warp to Indian in south-eastern desert
-013-2.gat,27,24,0|script|Spell|400,
+013-2.gat,27,24,0|script|Spell#wiz2|400,
 {
     mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\"";
     next;
@@ -69,7 +69,7 @@ L_cheat:
 }
 
 // Warp to snow area
-013-2.gat,25,27,0|script|Spell|400,
+013-2.gat,25,27,0|script|Spell#wiz3|400,
 {
     mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\"";
     next;
@@ -100,7 +100,7 @@ L_Close:
 }
 
 // Warp to Dimond
-013-2.gat,27,27,0|script|Spell|400,
+013-2.gat,27,27,0|script|Spell#wiz4|400,
 {
     mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\"";
     next;
@@ -111,7 +111,7 @@ L_Close:
 }
 
 // Warp to mines level 2
-013-2.gat,26,28,0|script|Spell|400,
+013-2.gat,26,28,0|script|Spell#wiz5|400,
 {
     mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\"";
     next;
@@ -122,7 +122,7 @@ L_Close:
 }
 
 // Death
-013-2.gat,21,29,0|script|Spell|400,
+013-2.gat,21,29,0|script|Spell#wiz6|400,
 {
     mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\"";
     next;
@@ -133,7 +133,7 @@ L_Close:
 }
 
 // Naked
-013-2.gat,28,29,0|script|Spell|400,
+013-2.gat,28,29,0|script|Spell#wiz7|400,
 {
     mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\"";
     next;
diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt
index eadfef13..60324fff 100644
--- a/world/map/npc/013-3/misc.txt
+++ b/world/map/npc/013-3/misc.txt
@@ -1,6 +1,6 @@
 //
 
-013-3.gat,127,68,0|script|Chest|111,
+013-3.gat,127,68,0|script|Chest#boring|111,
 {
     mes "You can't see any way to open this chest.";
     close;
diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt
index f6b9836e..1bd579e8 100644
--- a/world/map/npc/013-3/sword_chest.txt
+++ b/world/map/npc/013-3/sword_chest.txt
@@ -1,6 +1,6 @@
 //
 
-013-3.gat,177,22,0|script|Chest|111,
+013-3.gat,177,22,0|script|Chest#sword|111,
 {
     callfunc "ClearVariables";
     if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished;
diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index 019e6f42..45635cfd 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -1,6 +1,6 @@
 //
 
-018-2.gat,50,24,0|script|Receptionist|108,
+018-2.gat,50,24,0|script|Receptionist#mine|108,
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt
index 75ba384a..6a53b8cd 100644
--- a/world/map/npc/020-1/soul-menhir.txt
+++ b/world/map/npc/020-1/soul-menhir.txt
@@ -1,6 +1,6 @@
 //
 
-020-1.gat,63,89,0|script|Soul Menhir|346,
+020-1.gat,63,89,0|script|Soul Menhir#nivalis|346,
 {
     callfunc "ClearVariables";
     set @map$, "020-1.gat";
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index 52fa5a4b..2cb97658 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -1,14 +1,14 @@
 // Various guards at gates
 
 // Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard|104,
+021-1.gat,70,23,0|script|Guard#port1|104,
 {
     mes "[Guard]";
     mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
     close;
 }
 
-021-1.gat,110,23,0|script|Guard|104,
+021-1.gat,110,23,0|script|Guard#port2|104,
 {
     mes "[Guard]";
     mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
@@ -16,7 +16,7 @@
 }
 
 // Guard near the magic school
-021-1.gat,46,65,0|script|Guard|104,
+021-1.gat,46,65,0|script|Guard#school|104,
 {
     mes "[Guard]";
     mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
@@ -24,20 +24,20 @@
 }
 
 // Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard|104,
+021-1.gat,146,23,0|script|Guard#east1|104,
 {
     mes "[Guard]";
     mes "\"I make sure less desirables don't enter the Noble District.\"";
     close;
 }
-021-1.gat,156,42,0|script|Guard|104,
+021-1.gat,156,42,0|script|Guard#east2|104,
 {
     mes "[Guard]";
     mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
     close;
 }
 
-021-1.gat,156,95,0|script|Guard|104,
+021-1.gat,156,95,0|script|Guard#east3|104,
 {
     mes "[Guard]";
     mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
@@ -45,7 +45,7 @@
 }
 
 // Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard|123,
+021-1.gat,55,136,0|script|Guard#govt_out|123,
 {
     mes "[Guard]";
     mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
diff --git a/world/map/npc/021-1/workers.txt b/world/map/npc/021-1/workers.txt
index 59419da0..cdba39b3 100644
--- a/world/map/npc/021-1/workers.txt
+++ b/world/map/npc/021-1/workers.txt
@@ -1,20 +1,20 @@
 //
 
-021-1.gat,144,22,0|script|Construction Worker|155,
+021-1.gat,144,22,0|script|Construction Worker#1|155,
 {
     mes "[Construction worker]";
     mes "\"I can't let you beyond this gate.  The area is closed for renovation.\"";
     close;
 }
 
-021-1.gat,156,97,0|script|Construction Worker|155,
+021-1.gat,156,97,0|script|Construction Worker#2|155,
 {
     mes "[Construction worker]";
     mes "\"East Tulimshar is closed for repairs.\"";
     close;
 }
 
-021-1.gat,156,44,0|script|Construction Worker|155,
+021-1.gat,156,44,0|script|Construction Worker#3|155,
 {
     mes "[Construction worker]";
     mes "\"East Tulimshar is closed for repairs.\"";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 1422e50a..79edfe37 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -227,7 +227,7 @@ L_TrickOrTreat:
 }
 
 // Guard
-021-2.gat,20,19,0|script|Guard|123,1,1,
+021-2.gat,20,19,0|script|Guard#govt_in|123,1,1,
 {
     mes "[Guard]";
     mes "\"You can't come back here.\"";
diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index 1ecbb1a8..b8fcf2c6 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -2,7 +2,7 @@
 // Author: Jenalya
 // if you enter the tutorial area from outside, it is set to be already done
 
-022-1.gat,19,37,0|script|#tutorial|45,0,2
+022-1.gat,19,37,0|script|#tutorial-outside1|45,0,2
 {
     callfunc "TutorialCompleted";
     warp "042-1.gat", 95, 69;
diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index b33ad67e..b4d9e273 100644
--- a/world/map/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
@@ -8,7 +8,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,89,62,0|script|Grave|400,
+027-1.gat,89,62,0|script|Grave#1|400,
 {
     callfunc "GraveTooFar";
     mes "~ FotherJ ~";
@@ -16,7 +16,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,118,54,0|script|Grave|400,
+027-1.gat,118,54,0|script|Grave#2|400,
 {
     callfunc "GraveTooFar";
     mes "~ Yosuhara ~";
@@ -24,7 +24,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,111,62,0|script|Grave|400,
+027-1.gat,111,62,0|script|Grave#3|400,
 {
     callfunc "GraveTooFar";
     mes "~ Feline Monstrosity ~";
@@ -32,7 +32,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,112,76,0|script|Grave|400,
+027-1.gat,112,76,0|script|Grave#4|400,
 {
     callfunc "GraveTooFar";
     mes "~ Superkoop ~";
@@ -40,7 +40,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,120,76,0|script|Grave|400,
+027-1.gat,120,76,0|script|Grave#5|400,
 {
     callfunc "GraveTooFar";
     mes "~ Aroleon ~";
@@ -48,7 +48,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,100,68,0|script|Grave|400,
+027-1.gat,100,68,0|script|Grave#6|400,
 {
     callfunc "GraveTooFar";
     mes "~ John P ~";
@@ -56,7 +56,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,94,70,0|script|Grave|400,
+027-1.gat,94,70,0|script|Grave#7|400,
 {
     callfunc "GraveTooFar";
     mes "~ Spit23 ~";
@@ -64,7 +64,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,106,60,0|script|Grave|400,
+027-1.gat,106,60,0|script|Grave#8|400,
 {
     callfunc "GraveTooFar";
     mes "~ Black Don ~";
@@ -72,7 +72,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,92,54,0|script|Grave|400,
+027-1.gat,92,54,0|script|Grave#9|400,
 {
     callfunc "GraveTooFar";
     mes "~ Jaxad0127 ~";
@@ -80,7 +80,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,122,64,0|script|Grave|400,
+027-1.gat,122,64,0|script|Grave#10|400,
 {
     callfunc "GraveTooFar";
     mes "~ Ces Vargavind ~";
@@ -88,7 +88,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,102,62,0|script|Grave|400,
+027-1.gat,102,62,0|script|Grave#11|400,
 {
     callfunc "GraveTooFar";
     mes "~ Crush ~";
@@ -96,7 +96,7 @@ function|script|GraveTooFar|,
     close;
 }
 
-027-1.gat,104,76,0|script|Grave|400,
+027-1.gat,104,76,0|script|Grave#12|400,
 {
     callfunc "GraveTooFar";
     mes "~ Freeyorp ~";
diff --git a/world/map/npc/027-2/door.txt b/world/map/npc/027-2/door.txt
index 8c0c54cc..08513582 100644
--- a/world/map/npc/027-2/door.txt
+++ b/world/map/npc/027-2/door.txt
@@ -15,7 +15,8 @@ L_Warp:
     end;
 }
 
-027-2.gat,26,99,0|script|#DoorOut|45,1,1,
+// TODO replace this with a plain warp
+027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1,
 {
     warp "027-2.gat", 23, 98;
     end;
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 15ec2292..da1c3c57 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -7,7 +7,7 @@
 // banker: function
 
 
-027-2.gat,75,22,0|shop|Chef|300,ZombieNachos :-1,LadyFingers :-1,JellAhh :-1,Snapple :-1
+027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos :-1,LadyFingers :-1,JellAhh :-1,Snapple :-1
 027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice :-1,GutBuster :-1,BloodWine :-1
 027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows :-1,ShockSweet :-1
 027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink :-1,CactusPotion :-1,BugLeg :-1,SmallMushroom :-1,IronPotion :-1,ConcentrationPotion :-1,HardSpike :-1,DarkCrystal :-1,Root :-1,WispPowder :-1,SpectrePowder :-1,PoltergeistPowder :-1
diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt
index 03b1b7c7..9ef5bfb6 100644
--- a/world/map/npc/031-2/angelaHouse.txt
+++ b/world/map/npc/031-2/angelaHouse.txt
@@ -3,7 +3,7 @@
 // state3: it's your first visit, you can choose a reward
 // state4: you can do daily quests with white and yellow presents boxes
 
-031-2.gat,29,28,0|script|Angela|196,
+031-2.gat,29,28,0|script|Angela#house|196,
 {
     set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
     set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index ba8c3005..8a24a7cf 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -2,7 +2,7 @@
 // state0,1,2: you shouldn't be able to reach this place
 // state3 and greater: Cindy is saved, she says one of some random phrases
 
-031-2.gat,27,26,0|script|Cindy|197,
+031-2.gat,27,26,0|script|Cindy#house|197,
 {
     set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
     set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt
index ff9374b1..6fc31fad 100644
--- a/world/map/npc/031-3/labyrinth.txt
+++ b/world/map/npc/031-3/labyrinth.txt
@@ -1,7 +1,7 @@
 // Conditional warp for yeti cave
 // Authors: Jenalya
 
-031-3.gat,46,24,0|script|#YetiBarrier|45,0,0,
+031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0,
 {
     if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
     warp "031-4.gat", 40, 70;
diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt
index e8401ba8..460a3985 100644
--- a/world/map/npc/031-4/barrier.txt
+++ b/world/map/npc/031-4/barrier.txt
@@ -1,4 +1,4 @@
-031-4.gat,40,71,0|script|#YetiBarrier|45,0,0,
+031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0,
 {
     if ($@FIGHT_YETI_STATUS == 1) goto L_Block;
     warp "031-3.gat", 46, 25;
diff --git a/world/map/npc/041-1/tutorial.txt b/world/map/npc/041-1/tutorial.txt
index 813df482..98793d23 100644
--- a/world/map/npc/041-1/tutorial.txt
+++ b/world/map/npc/041-1/tutorial.txt
@@ -2,7 +2,7 @@
 // Author: Jenalya
 // if you enter the tutorial area, it is set to be already done
 
-041-1.gat,58,5,0|script|#tutorial|45,1,0
+041-1.gat,58,5,0|script|#tutorial-outside2|45,1,0
 {
     set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
     warp "042-1.gat", 44, 143;
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index dd63b753..b01a83c7 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -270,7 +270,7 @@ OnTouch:
     close;
 }
 
-042-2.gat,27,23,0|script|Chest|111,
+042-2.gat,27,23,0|script|Chest#sorfina|111,
 {
     if (sorfina > 2) goto L_Empty;
     if (sorfina == 2) goto L_Shirt;
@@ -297,7 +297,7 @@ L_Empty:
     close;
 }
 
-042-2.gat,44,31,0|script|#DoorOut|45,0,0
+042-2.gat,44,31,0|script|#DoorOut-sorfina|45,0,0
 {
     end;
 
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index f1c9872e..59fe8ae4 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -12,7 +12,7 @@
 //     3: player choosed to leave the room
 //-----------------------------------------------------------------------------
 
-052-2.gat,136,73,0|script|Chest|111,
+052-2.gat,136,73,0|script|Chest#illia|111,
 {
     set @step, 8;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -139,11 +139,11 @@ L_PrepareLeaving:
 L_Leave:
     set @illia_got_rewards, 3;
     set @illia_current_num_rewards, 0;
-    addtimer 1000, "Chest::OnMsg1";
-    addtimer 4000, "Chest::OnMsg2";
-    addtimer 7000, "Chest::OnMsg3";
-    addtimer 9000, "Chest::OnFx";
-    addtimer 10000, "Chest::OnRing";
+    addtimer 1000, "Chest#illia::OnMsg1";
+    addtimer 4000, "Chest#illia::OnMsg2";
+    addtimer 7000, "Chest#illia::OnMsg3";
+    addtimer 9000, "Chest#illia::OnFx";
+    addtimer 10000, "Chest#illia::OnRing";
     close;
 
 OnMsg1:
diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt
index fb29cd68..a458c2a9 100644
--- a/world/map/npc/056-2/notes.txt
+++ b/world/map/npc/056-2/notes.txt
@@ -1,4 +1,4 @@
-056-2.gat,77,34,0|script|Warning|400,
+056-2.gat,77,34,0|script|Warning#mirak|400,
 {
     mes "Turn around. Do not come any closer!";
     mes "Go back upstairs and leave! I don't want to see anybody!";
@@ -6,7 +6,7 @@
     mes "- Mirak";
     close;
 }
-056-2.gat,29,30,0|script|Note|400,
+056-2.gat,29,30,0|script|Note#mirak|400,
 {
     mes "DO NOT GO ANY FURTHER!";
     mes "Put the supplies on the table and do not come downstairs. I don't want to be bothered.";