4 files changed, 16 insertions, 16 deletions
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/hetchel.txt b/world/map/npc/021-1/hetchel.txt
index d2ed7012..f4072c01 100644
--- a/world/map/npc/021-1/hetchel.txt
+++ b/world/map/npc/021-1/hetchel.txt
@@ -1,7 +1,7 @@
 //  Hetchel the Silk Weaver
-//  bh28, 
+//  bh28,
 //  2013-03, GPLv2.
-//  
+//
 //  Hetchel is referred to by Lora Tay.
 //  She weaves and sells standard double elbow square silk sheets.
 //  She could also sell, dyed sheets, Silk robes from Lora Tay.
@@ -9,7 +9,7 @@
 //
 //  Hetchel's workshop is actually under repair, Shé'll be back in 021-2 when workers have finished their job.
 //
-//  QUEST_WG_state: Global variable indicating winter gloves status. 
+//  QUEST_WG_state: Global variable indicating winter gloves status.
 //  Lora Tay proposes silk Robe if (QUEST_WG_state>= 11).
 //  @SHEET_COCOONS_NR : Number of cocoons required per sheet.
 //  Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR
@@ -79,7 +79,7 @@ L_sheet_menu:
         goto L_TooMany;
     set Zeny, Zeny - @SheetCount * @SHEET_ZENY;
     delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR;
-    getitem "Silksheet", @SheetCount;
+    getitem "SilkSheet", @SheetCount;
     mes "[Hetchel]";
     mes "\"Thank you, I hope the sheets will fit your needs.";
     mes "Please greet Lora for me when you see her.\"";
diff --git a/world/map/npc/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
index 3719ed0f..91131c25 100644
--- a/world/map/npc/021-1/mapflags.txt
+++ b/world/map/npc/021-1/mapflags.txt
@@ -1,2 +1,2 @@
-021-1.gat mapflag no_player_drops
-021-1.gat mapflag town
+021-1.gat|mapflag|no_player_drops
+021-1.gat|mapflag|town
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.\"";