Index: zones/Bastok_Markets/npcs/Teerth.lua
===================================================================
--- zones/Bastok_Markets/npcs/Teerth.lua	(revision 4026)
+++ zones/Bastok_Markets/npcs/Teerth.lua	(working copy)
@@ -21,7 +21,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(5221,8,23,4)) then
+	if(player:sendGuild(527,8,23,4)) then
 		player:showText(npc,TEERTH_SHOP_DIALOG);
 	end
 end;
Index: zones/Bastok_Markets/npcs/Visala.lua
===================================================================
--- zones/Bastok_Markets/npcs/Visala.lua	(revision 4026)
+++ zones/Bastok_Markets/npcs/Visala.lua	(working copy)
@@ -2,11 +2,13 @@
 --  Area: Bastok Markets
 --  NPC: Visala
 --  Guild Merchant NPC: Goldsmithing Guild 
---  @zone: 235
---  @pos: -202.000 -7.814 -56.823
+--  @pos -202.000 -7.814 -56.823 235
 -----------------------------------
+package.loaded["scripts/zones/Bastok_Markets/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Bastok_Markets/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Bastok_Markets/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(522,8,23,4)) then
+	if(player:sendGuild(5272,8,23,4)) then
 		player:showText(npc, VISALA_SHOP_DIALOG);
 	end	
 end;
Index: zones/Bastok_Mines/npcs/Maymunah.lua
===================================================================
--- zones/Bastok_Mines/npcs/Maymunah.lua	(revision 4026)
+++ zones/Bastok_Mines/npcs/Maymunah.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Bastok Mines
 -- NPC: Maymunah
 -- Guild Merchant NPC: Alchemy Guild 
--- @zone: 234
--- @pos: 108.738 5.017 -3.129
+-- @pos 108.738 5.017 -3.129 234
 -----------------------------------
+package.loaded["scripts/zones/Bastok_Mines/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Bastok_Mines/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Bastok_Mines/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(521,8,23,6)) then
+	if(player:sendGuild(5262,8,23,6)) then
 		player:showText(npc, MAYMUNAH_SHOP_DIALOG);
 	end
 end;
Index: zones/Bastok_Mines/npcs/Odoba.lua
===================================================================
--- zones/Bastok_Mines/npcs/Odoba.lua	(revision 4026)
+++ zones/Bastok_Mines/npcs/Odoba.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Bastok Mines
 -- NPC: Odoba
 -- Guild Merchant NPC: Alchemy Guild 
--- @zone: 234
--- @pos: 108.473 5.017 1.089
+-- @pos 108.473 5.017 1.089 234
 -----------------------------------
+package.loaded["scripts/zones/Bastok_Mines/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Bastok_Mines/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Bastok_Mines/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(521,8,23,6)) then
+	if(player:sendGuild(526,8,23,6)) then
 		player:showText(npc, ODOBA_SHOP_DIALOG);
 	end
 end;
Index: zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua
===================================================================
--- zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua	(revision 4026)
+++ zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Bibiki Bay
 -- NPC: Mep Nhapopoluko
 -- Guild Merchant NPC: Fishing Guild 
--- @zone: 4
--- @pos: 464.350 -6 752.731
+-- @pos 464.350 -6 752.731 4
 -----------------------------------
+package.loaded["scripts/zones/Bibiki_Bay/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Bibiki_Bay/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Bibiki_Bay/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(518,1,23,5)) then
+	if(player:sendGuild(519,1,18,5)) then
 		player:showText(npc, MEP_NHAPOPOLUKO_DIALOG);
 	end
 end;
Index: zones/Bibiki_Bay/TextIDs.lua
===================================================================
--- zones/Bibiki_Bay/TextIDs.lua	(revision 4026)
+++ zones/Bibiki_Bay/TextIDs.lua	(working copy)
@@ -8,7 +8,7 @@
  FISHING_MESSAGE_OFFSET = 7219; -- You can't fish here
     
 -- Dialogs
- MEP_NHAPOPOLUKO_DIALOG = 7177; -- Welcome! Fishermen's Guild representative, at your service!
+ MEP_NHAPOPOLUKO_DIALOG = 7179; -- Welcome! Fishermen's Guild representative, at your service!
 NOTHING_OUT_OF_ORDINARY = 6392; -- There is nothing out of the ordinary here.
 
 -- Manacliper
Index: zones/Carpenters_Landing/npcs/Beugungel.lua
===================================================================
--- zones/Carpenters_Landing/npcs/Beugungel.lua	(revision 0)
+++ zones/Carpenters_Landing/npcs/Beugungel.lua	(working copy)
@@ -0,0 +1,48 @@
+-----------------------------------
+--  Area: Carpenters' Landing
+--  NPC: Beugungel
+--  Guild Merchant NPC: Woodworking Guild 
+--  @pos -333.729, -5.512, 475.647 2
+-----------------------------------
+package.loaded["scripts/zones/Carpenters_Landing/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Carpenters_Landing/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end;
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(534,5,22,0)) then
+		player:showText(npc,BEUGUNGEL_SHOP_DIALOG);
+	end
+end;
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
Index: zones/Carpenters_Landing/TextIDs.lua
===================================================================
--- zones/Carpenters_Landing/TextIDs.lua	(revision 4026)
+++ zones/Carpenters_Landing/TextIDs.lua	(working copy)
@@ -13,4 +13,7 @@
 NOTHING_OUT_OF_ORDINARY = 6392; -- There is nothing out of the ordinary here.
 
 -- Logging
-LOGGING_IS_POSSIBLE_HERE = 7334; -- Logging is possible here if you have <item>
\ No newline at end of file
+LOGGING_IS_POSSIBLE_HERE = 7334; -- Logging is possible here if you have <item>
+
+-- Shop Texts
+BEUGUNGEL_SHOP_DIALOG =  7368; --Hello, sir/mam! I'm selling goods direct from the Carpenters' Guild.
\ No newline at end of file
Index: zones/Lower_Jeuno/npcs/Akamafula.lua
===================================================================
--- zones/Lower_Jeuno/npcs/Akamafula.lua	(revision 4026)
+++ zones/Lower_Jeuno/npcs/Akamafula.lua	(working copy)
@@ -1,16 +1,15 @@
 -----------------------------------
 --  Area: Lower Jeuno
---   NPC: Akamafula
+--  NPC: Akamafula
 --  Type: Tenshodo Merchant
--- @zone: 245
---  @pos: 28.465 2.899 -46.699
---
--- Auto-Script: Requires Verification (Verified by Brawndo)
+--  @pos 28.465 2.899 -46.699 245
 -----------------------------------
 package.loaded["scripts/zones/Lower_Jeuno/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
 require("scripts/globals/shop");
+require("scripts/globals/keyitems");
 require("scripts/zones/Lower_Jeuno/TextIDs");
 
 -----------------------------------
@@ -26,9 +25,11 @@
 
 function onTrigger(player,npc)
 	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
-		if(player:sendGuild(60417,1,23,2)) then
+		if(player:sendGuild(60417,1,23,1)) then
 			player:showText(npc, AKAMAFULA_SHOP_DIALOG);
 		end
+	else
+		player:startEvent(0x0096);
 	end
 end;
 
Index: zones/Lower_Jeuno/npcs/Amalasanda.lua
===================================================================
--- zones/Lower_Jeuno/npcs/Amalasanda.lua	(revision 4026)
+++ zones/Lower_Jeuno/npcs/Amalasanda.lua	(working copy)
@@ -1,16 +1,15 @@
 -----------------------------------
 --  Area: Lower Jeuno
---   NPC: Amalasanda
+--  NPC: Amalasanda
 --  Type: Tenshodo Merchant
--- @zone: 245
---  @pos: 28.149 2.899 -44.780
---
--- Auto-Script: Requires Verification (Verified by Brawndo)
+--  @pos 28.149 2.899 -44.780 245
 -----------------------------------
 package.loaded["scripts/zones/Lower_Jeuno/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
 require("scripts/globals/shop");
+require("scripts/globals/keyitems");
 require("scripts/zones/Lower_Jeuno/TextIDs");
 
 -----------------------------------
@@ -26,9 +25,11 @@
 
 function onTrigger(player,npc)
 	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
-		if(player:sendGuild(60420,1,23,2)) then
+		if(player:sendGuild(60416,1,23,1)) then
 			player:showText(npc, AMALASANDA_SHOP_DIALOG);
 		end
+	else
+		player:startEvent(0x0096);
 	end
 end;
 
Index: zones/Lower_Jeuno/TextIDs.lua
===================================================================
--- zones/Lower_Jeuno/TextIDs.lua	(revision 4026)
+++ zones/Lower_Jeuno/TextIDs.lua	(working copy)
@@ -31,5 +31,5 @@
      HASIM_SHOP_DIALOG = 7008; -- Welcome to Waag-Deeg's Magic Shop.
       TAZA_SHOP_DIALOG = 7008; -- Welcome to Waag-Deeg's Magic Shop.
       SUSU_SHOP_DIALOG = 7008; -- Welcome to Waag-Deeg's Magic Shop.
- AKAMAFULA_SHOP_DIALOG = 7557; -- We ain't cheap, but you get what you pay for! Take your time, have a look around, see if there's somethin' you like.
-AMALASANDA_SHOP_DIALOG = 7556; -- Welcome to the Tenshodo. You want something, we got it. We got all kinds of special merchandise you won't find anywhere else!
+ AKAMAFULA_SHOP_DIALOG = 7560; -- We ain't cheap, but you get what you pay for! Take your time, have a look around, see if there's somethin' you like.
+AMALASANDA_SHOP_DIALOG = 7559; -- Welcome to the Tenshodo. You want something, we got it. We got all kinds of special merchandise you won't find anywhere else!
Index: zones/Metalworks/npcs/Amulya.lua
===================================================================
--- zones/Metalworks/npcs/Amulya.lua	(revision 4026)
+++ zones/Metalworks/npcs/Amulya.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Metalworks
 -- NPC: Amulya
 -- Guild Merchant NPC: Blacksmithing Guild 
--- @zone: 237
--- @pos: -106.093 0.999 -24.564
+-- @pos -106.093 0.999 -24.564 237
 -----------------------------------
+package.loaded["scripts/zones/Metalworks/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Metalworks/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Metalworks/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(528,8,23,2)) then
+	if(player:sendGuild(5332,8,23,2)) then
 		player:showText(npc, AMULYA_SHOP_DIALOG);
 	end
 end;
Index: zones/Metalworks/npcs/Vicious_Eye.lua
===================================================================
--- zones/Metalworks/npcs/Vicious_Eye.lua	(revision 4026)
+++ zones/Metalworks/npcs/Vicious_Eye.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Metalworks
 -- NPC: Vicious Eye
 -- Guild Merchant NPC: Blacksmithing Guild 
--- @zone: 237
--- @pos: -106.132 0.999 -28.757
+-- @pos -106.132 0.999 -28.757 237
 -----------------------------------
+package.loaded["scripts/zones/Metalworks/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Metalworks/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Metalworks/TextIDs");
 
 -----------------------------------
@@ -21,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(528,8,23,2)) then
+	if(player:sendGuild(533,8,23,2)) then
 		player:showText(npc, VICIOUS_EYE_SHOP_DIALOG);
 	end
 end;
Index: zones/Mhaura/npcs/Celestina.lua
===================================================================
--- zones/Mhaura/npcs/Celestina.lua	(revision 4026)
+++ zones/Mhaura/npcs/Celestina.lua	(working copy)
@@ -4,12 +4,13 @@
 -- Finish Quest: The Sand Charm
 -- Involved in Quest: Riding on the Clouds
 -- Guild Merchant NPC: Goldsmithing Guild 
--- @zone 249
--- @pos -36 -16 72
+-- @pos -37.624 -16.050 75.681 249
 -----------------------------------
 package.loaded["scripts/zones/Mhaura/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/globals/keyitems");
 require("scripts/globals/quests");
 require("scripts/zones/Mhaura/TextIDs");
@@ -45,7 +46,7 @@
 	
 	if(player:getVar("theSandCharmVar") == 3) then 
 		player:startEvent(0x007e,13095); -- During quest "The Sand Charm" - 3rd dialog
-	elseif(player:sendGuild(523,8,23,4)) then
+	elseif(player:sendGuild(528,8,23,4)) then
 		player:showText(npc,GOLDSMITHING_GUILD);
 	end
 	
Index: zones/Mhaura/npcs/Kamilah.lua
===================================================================
--- zones/Mhaura/npcs/Kamilah.lua	(revision 4026)
+++ zones/Mhaura/npcs/Kamilah.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Mhaura
 -- NPC: Kamilah
 -- Guild Merchant NPC: Blacksmithing Guild 
--- @zone 249
+-- @pos -64.302 -16.000 35.261 249
 -----------------------------------
 package.loaded["scripts/zones/Mhaura/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Mhaura/TextIDs");
 
 -----------------------------------
@@ -23,7 +25,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(527,8,23,2)) then
+	if(player:sendGuild(532,8,23,2)) then
 		player:showText(npc,SMITHING_GUILD);
 	end
 end;
Index: zones/Mhaura/npcs/Mololo.lua
===================================================================
--- zones/Mhaura/npcs/Mololo.lua	(revision 4026)
+++ zones/Mhaura/npcs/Mololo.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Mhaura
 -- NPC:  Mololo
 -- Guild Merchant NPC: Blacksmithing Guild 
--- @zone 249
+-- @pos -64.278 -16.624 34.120 249
 -----------------------------------
 package.loaded["scripts/zones/Mhaura/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Mhaura/TextIDs");
 
 -----------------------------------
@@ -23,7 +25,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(527,8,23,2)) then
+	if(player:sendGuild(532,8,23,2)) then
 		player:showText(npc,SMITHING_GUILD);
 	end
 end;
Index: zones/Mhaura/npcs/Yabby_Tanmikey.lua
===================================================================
--- zones/Mhaura/npcs/Yabby_Tanmikey.lua	(revision 4026)
+++ zones/Mhaura/npcs/Yabby_Tanmikey.lua	(working copy)
@@ -2,14 +2,15 @@
 --	Area: Mhaura
 --	NPC: Yabby Tanmikey
 --  Guild Merchant NPC: Goldsmithing Guild 
+--  @pos -36.459 -16.000 76.840 249
 -----------------------------------
 package.loaded["scripts/zones/Mhaura/TextIDs"] = nil;
 -----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Mhaura/TextIDs");
 
-
 -----------------------------------
 -- onTrade Action
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(5222,8,23,4)) then
+	if(player:sendGuild(528,8,23,4)) then
 		player:showText(npc,GOLDSMITHING_GUILD);
 	end
 end;
Index: zones/Mhaura/TextIDs.lua
===================================================================
--- zones/Mhaura/TextIDs.lua	(revision 4026)
+++ zones/Mhaura/TextIDs.lua	(working copy)
@@ -16,8 +16,8 @@
 	 
 -- Quest Dialog
      SUBJOB_UNLOCKED = 6955; -- You can now use support jobs!
-  GOLDSMITHING_GUILD = 7058; -- Everything you need for your goldsmithing needs!
-      SMITHING_GUILD = 7059; -- Welcome to the Blacksmiths' Guild salesroom!
+  GOLDSMITHING_GUILD = 7060; -- Everything you need for your goldsmithing needs!
+      SMITHING_GUILD = 7061; -- Welcome to the Blacksmiths' Guild salesroom!
  NOMAD_MOOGLE_DIALOG = 6715; -- I'm a traveling moogle, kupo. I help adventurers in the Outlands access items they have stored in a Mog House elsewhere, kupo.
       RAMUH_UNLOCKED = 7272; -- You are now able to summon Ramuh.
 
Index: zones/Norg/npcs/Achika.lua
===================================================================
--- zones/Norg/npcs/Achika.lua	(revision 0)
+++ zones/Norg/npcs/Achika.lua	(working copy)
@@ -0,0 +1,53 @@
+-----------------------------------
+--  Area: Norg
+--  NPC: Achika
+--  Type: Tenshodo Merchant
+--  @pos: 1.300 0.000 19.259 252
+-----------------------------------
+package.loaded["scripts/zones/Norg/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/globals/keyitems");
+require("scripts/zones/Norg/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end;
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
+		if(player:sendGuild(60421,9,23,7)) then
+			player:showText(npc, ACHIKA_SHOP_DIALOG);
+		end
+	else
+		player:startEvent(0x0096);
+	end
+end;
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
Index: zones/Norg/npcs/Chiyo.lua
===================================================================
--- zones/Norg/npcs/Chiyo.lua	(revision 0)
+++ zones/Norg/npcs/Chiyo.lua	(working copy)
@@ -0,0 +1,53 @@
+-----------------------------------
+--  Area: Norg
+--  NPC: Chiyo
+--  Type: Tenshodo Merchant
+--  @pos 5.801 0.020 -18.739 252
+-----------------------------------
+package.loaded["scripts/zones/Norg/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/globals/keyitems");
+require("scripts/zones/Norg/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end;
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
+		if(player:sendGuild(60422,9,23,7)) then
+			player:showText(npc, CHIYO_SHOP_DIALOG);
+		end
+	else
+		player:startEvent(0x0096);
+	end
+end;
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
Index: zones/Norg/npcs/Jirokichi.lua
===================================================================
--- zones/Norg/npcs/Jirokichi.lua	(revision 0)
+++ zones/Norg/npcs/Jirokichi.lua	(working copy)
@@ -0,0 +1,53 @@
+-----------------------------------
+--  Area: Norg
+--   NPC: Jirokichi
+--  Type: Tenshodo Merchant
+--  @pos -1.463 0.000 18.846 252
+-----------------------------------
+package.loaded["scripts/zones/Norg/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/globals/keyitems");
+require("scripts/zones/Norg/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end;
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
+		if(player:sendGuild(60423,9,23,7)) then
+			player:showText(npc, JIROKICHI_SHOP_DIALOG);
+		end
+	else
+		player:startEvent(0x0096);
+	end
+end;
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+	-- printf("CSID: %u",csid);
+	-- printf("RESULT: %u",option);
+end;
+
Index: zones/Norg/npcs/Vuliaie.lua
===================================================================
--- zones/Norg/npcs/Vuliaie.lua	(revision 4026)
+++ zones/Norg/npcs/Vuliaie.lua	(working copy)
@@ -1,16 +1,15 @@
 -----------------------------------
 --  Area: Norg
---   NPC: Vuliaie
+--  NPC: Vuliaie
 --  Type: Tenshodo Merchant
--- @zone: 252
---  @pos: -24 0 -19
---
--- Auto-Script: Requires Verification (Verified by Brawndo)
+--  @pos -24.259 0.891 -19.556 252
 -----------------------------------
 package.loaded["scripts/zones/Norg/TextIDs"] = nil;
 -----------------------------------
 
+require("scripts/globals/settings");
 require("scripts/globals/shop");
+require("scripts/globals/keyitems");
 require("scripts/zones/Norg/TextIDs");
 
 -----------------------------------
@@ -26,10 +25,11 @@
 
 function onTrigger(player,npc)
 	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
-		if(player:sendGuild(60421,1,23,7)) then
+		if(player:sendGuild(60424,9,23,7)) then
 			player:showText(npc, VULIAIE_SHOP_DIALOG);
 		end
 	else
+		player:startEvent(0x0096);
 	end
 end;
 
Index: zones/Norg/TextIDs.lua
===================================================================
--- zones/Norg/TextIDs.lua	(revision 4026)
+++ zones/Norg/TextIDs.lua	(working copy)
@@ -27,9 +27,9 @@
 			   FOUIVA_DIALOG = 10487; -- Oi 'av naw business wi' de likes av you.
 
 -- Shop Texts
-   JIROKICHI_SHOP_DIALOG = 10271; -- Heh-heh-heh. Feast your eyes on these beauties. You won't find stuff like this anywhere!
-     VULIAIE_SHOP_DIALOG = 10272; -- Please, stay and have a look. You may find something you can only buy here.
-      ACHIKA_SHOP_DIALOG = 10273; -- Can I interest you in some armor forged in the surrounding regions?
-       CHIYO_SHOP_DIALOG = 10274; -- Magic scrolls! Magic scrolls! We've got parchment hot off the sheep!
+   JIROKICHI_SHOP_DIALOG = 10273; -- Heh-heh-heh. Feast your eyes on these beauties. You won't find stuff like this anywhere!
+     VULIAIE_SHOP_DIALOG = 10274; -- Please, stay and have a look. You may find something you can only buy here.
+      ACHIKA_SHOP_DIALOG = 10275; -- Can I interest you in some armor forged in the surrounding regions?
+       CHIYO_SHOP_DIALOG = 10276; -- Magic scrolls! Magic scrolls! We've got parchment hot off the sheep!
 	   
 SOLBYMAHOLBY_SHOP_DIALOG = 10501; -- Hiya! My name's Solby-Maholby! I'm new here, so they put me on tooty-fruity shop duty. I'll give you a super-duper deal on unwanted items!
\ No newline at end of file
Index: zones/Northern_San_dOria/npcs/Cauzeriste.lua
===================================================================
--- zones/Northern_San_dOria/npcs/Cauzeriste.lua	(revision 4026)
+++ zones/Northern_San_dOria/npcs/Cauzeriste.lua	(working copy)
@@ -2,7 +2,7 @@
 -- Area: Northern San d'Oria
 -- NPC: Cauzeriste
 -- Guild Merchant NPC: Woodworking Guild 
--- @zone 231
+-- @pos -175.946 3.999 280.301 231
 -----------------------------------
 package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
 -----------------------------------
@@ -17,7 +17,6 @@
 -----------------------------------
 
 function onTrade(player,npc,trade)
-
 end;
 
 -----------------------------------
@@ -25,7 +24,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(5131,6,21,0)) then
+	if(player:sendGuild(513,6,21,0)) then
 		player:showText(npc,CAUZERISTE_SHOP_DIALOG);
 	end
 end; 
Index: zones/Northern_San_dOria/npcs/Chaupire.lua
===================================================================
--- zones/Northern_San_dOria/npcs/Chaupire.lua	(revision 4026)
+++ zones/Northern_San_dOria/npcs/Chaupire.lua	(working copy)
@@ -2,7 +2,7 @@
 -- Area: Northern San d'Oria
 -- NPC: Chaupire
 -- Guild Merchant NPC: Woodworking Guild 
--- @zone 231
+-- @pos -174.476 3.999 281.854 231
 -----------------------------------
 package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
 -----------------------------------
@@ -17,7 +17,6 @@
 -----------------------------------
 
 function onTrade(player,npc,trade)
-
 end;
 
 -----------------------------------
@@ -25,7 +24,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(513,6,21,0)) then
+	if(player:sendGuild(5132,6,21,0)) then
 		player:showText(npc,CHAUPIRE_SHOP_DIALOG);
 	end
 end; 
Index: zones/Northern_San_dOria/npcs/Doggomehr.lua
===================================================================
--- zones/Northern_San_dOria/npcs/Doggomehr.lua	(revision 4026)
+++ zones/Northern_San_dOria/npcs/Doggomehr.lua	(working copy)
@@ -2,12 +2,13 @@
 --  Area: Northern San d'Oria
 --  NPC: Doggomehr
 --  Guild Merchant NPC: Blacksmithing Guild 
---  @zone: 231
---  @pos: -193.920 3.999 162.027
---
+--  @pos -193.920 3.999 162.027 231
 -----------------------------------
+package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Northern_San_dOria/TextIDs");
 
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(526,8,23,2)) then
+	if(player:sendGuild(531,8,23,2)) then
 		player:showText(npc,DOGGOMEHR_SHOP_DIALOG);
 	end
 end;
Index: zones/Northern_San_dOria/npcs/Gaudylox.lua
===================================================================
--- zones/Northern_San_dOria/npcs/Gaudylox.lua	(revision 4026)
+++ zones/Northern_San_dOria/npcs/Gaudylox.lua	(working copy)
@@ -1,13 +1,14 @@
 -----------------------------------
 -- Area: Northern San d'Oria
 -- NPC: Gaudylox
--- Standard Merchant NPC
+-- Standard merchant, though he acts like a guild merchant
+-- @pos -147.593 11.999 222.550 231
 -----------------------------------
 package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
 -----------------------------------
 
 require("scripts/globals/settings");
---require("scripts/globals/shop");
+require("scripts/globals/shop");
 require("scripts/globals/quests");
 require("scripts/zones/Northern_San_dOria/TextIDs");
 
@@ -33,19 +34,8 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(60418,11,22,1)) then
+	if(player:sendGuild(60418,11,22,0)) then
 	player:showText(npc,GAUDYLOX_SHOP_DIALOG);
-
---	stock = {0x01e1,21000,		-- Black Chip
---			 0x01db,21000,		-- Blue Chip
---			 0x01de,21000,		-- Clear Chip
---			 0x01dd,21000,		-- Green Chip
---			 0x01de,21000,		-- Purple Chip
---			 0x01da,21000,		-- Red Chip
---			 0x01e0,21000,		-- White Chip
---			 0x01dc,21000}		-- Yellow Chip
---	 
---	showShop(player, STATIC, stock);
 	end
 end; 
 
Index: zones/Northern_San_dOria/npcs/Lucretia.lua
===================================================================
--- zones/Northern_San_dOria/npcs/Lucretia.lua	(revision 4026)
+++ zones/Northern_San_dOria/npcs/Lucretia.lua	(working copy)
@@ -2,12 +2,13 @@
 --  Area: Northern San d'Oria
 --  NPC: Lucretia
 --  Guild Merchant NPC: Blacksmithing Guild 
---  @zone: 231
---  @pos: -193.729 3.999 159.412
---
+--  @pos -193.729 3.999 159.412 231
 -----------------------------------
+package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Northern_San_dOria/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Northern_San_dOria/TextIDs");
 
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(526,8,23,2)) then
+	if(player:sendGuild(5312,8,23,2)) then
 		player:showText(npc,LUCRETIA_SHOP_DIALOG);
 	end
 end;
Index: zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua
===================================================================
--- zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua	(revision 0)
+++ zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Open sea route to Al Zahbi
+-- NPC:  Cehn Teyohngo
+-- Guild Merchant NPC: Fishing Guild 
+-- @zone 4.986 -2.101 -12.026 46
+-----------------------------------
+package.loaded["scripts/zones/Open_sea_route_to_Al_Zahbi/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Open_sea_route_to_Al_Zahbi/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(522,1,23,5)) then
+		player:showText(npc,CEHN_TEYOHNGO_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua
===================================================================
--- zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua	(revision 0)
+++ zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Open sea route to Al Zahbi
+-- NPC:  Cehn Teyohngo
+-- Guild Merchant NPC: Fishing Guild 
+-- @zone 4.986 -2.101 -12.026 46
+-----------------------------------
+package.loaded["scripts/zones/Open_sea_route_to_Al_Zahbi/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Open_sea_route_to_Al_Zahbi/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(522,1,23,5)) then
+		player:showText(npc,CEHN_TEYOHNGO_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Open_sea_route_to_Al_Zahbi/TextIDs.lua
===================================================================
--- zones/Open_sea_route_to_Al_Zahbi/TextIDs.lua	(revision 4026)
+++ zones/Open_sea_route_to_Al_Zahbi/TextIDs.lua	(working copy)
@@ -7,3 +7,6 @@
        KEYITEM_OBTAINED = 6381; -- Obtained key item: <keyitem>
  FISHING_MESSAGE_OFFSET = 6994; -- You can't fish here
     DOCKING_IN_AL_ZAHBI = 7246; -- We are now docking in Al Zahbi.
+    
+-- Shops
+CEHN_TEYOHNGO_SHOP_DIALOG = 7261; -- If you're looking for fishing gear, you've come to the right place!
Index: zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua
===================================================================
--- zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua	(revision 0)
+++ zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Open sea route to Mhaura
+-- NPC:  Pashi Maccaleh
+-- Guild Merchant NPC: Fishing Guild 
+-- @zone 4.986 -2.101 -12.026 47
+-----------------------------------
+package.loaded["scripts/zones/Open_sea_route_to_Mhaura/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Open_sea_route_to_Mhaura/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(523,1,23,5)) then
+		player:showText(npc,PASHI_MACCALEH_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua
===================================================================
--- zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua	(revision 0)
+++ zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Open sea route to Mhaura
+-- NPC:  Pashi Maccaleh
+-- Guild Merchant NPC: Fishing Guild 
+-- @zone 4.986 -2.101 -12.026 47
+-----------------------------------
+package.loaded["scripts/zones/Open_sea_route_to_Mhaura/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Open_sea_route_to_Mhaura/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(523,1,23,5)) then
+		player:showText(npc,PASHI_MACCALEH_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Open_sea_route_to_Mhaura/TextIDs.lua
===================================================================
--- zones/Open_sea_route_to_Mhaura/TextIDs.lua	(revision 4026)
+++ zones/Open_sea_route_to_Mhaura/TextIDs.lua	(working copy)
@@ -7,3 +7,6 @@
        KEYITEM_OBTAINED = 6381; -- Obtained key item: <keyitem>
  FISHING_MESSAGE_OFFSET = 6994; -- You can't fish here
       DOCKING_IN_MHAURA = 7246; -- We are now docking in Mhaura.
+
+-- Shops
+PASHI_MACCALEH_SHOP_DIALOG = 7261; -- Step right up for the best fishing gear in these parts!
\ No newline at end of file
Index: zones/Port_Bastok/npcs/Blabbivix.lua
===================================================================
--- zones/Port_Bastok/npcs/Blabbivix.lua	(revision 4026)
+++ zones/Port_Bastok/npcs/Blabbivix.lua	(working copy)
@@ -2,12 +2,13 @@
 -- Area: Port Bastok
 -- NPC: Blabbivix
 -- Standard merchant, though he acts like a guild merchant
--- Confirmed shop stock, August 2013
+-- @pos -110.209 4.898 22.957 236
 -----------------------------------
+package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil;
 require("scripts/globals/settings");
---require("scripts/globals/shop");
+require("scripts/globals/shop");
 require("scripts/zones/Port_Bastok/TextIDs");
 
 -----------------------------------
@@ -24,17 +25,6 @@
 function onTrigger(player,npc)
     if(player:sendGuild(60418,11,22,3)) then
         player:showText(npc,BLABBIVIX_SHOP_DIALOG);
---        stock = {
---            0x01DA, 21000,   --Red Chip
---            0x01DB, 21000,   --Blue Chip
---            0x01DC, 21000    --Yellow Chip 
---            0x01DD, 21000,   --Green Chip
---            0x01DE, 21000,   --Clear Chip
---            0x01DE, 21000,   --Purple Chip
---            0x01E0, 21000,   --White Chip
---            0x01E1, 21000,   --Black Chip
---        }
-        showShop(player, STATIC, stock);
     end
 end; 
 
Index: zones/Port_Bastok/npcs/Jabbar.lua
===================================================================
--- zones/Port_Bastok/npcs/Jabbar.lua	(revision 4026)
+++ zones/Port_Bastok/npcs/Jabbar.lua	(working copy)
@@ -3,8 +3,7 @@
 -- NPC: Jabbar
 -- Type: Tenshodo Merchant
 -- Involved in Quests: Tenshodo Menbership
--- @zone 236
--- @pos -99 -2 24
+-- @pos -99.718 -2.299 26.027 236
 -----------------------------------
 package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil;
 -----------------------------------
@@ -28,7 +27,7 @@
 
 function onTrigger(player,npc)
 	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
-		if (player:sendGuild(0xEC03, 1, 23, 4)) then 
+		if (player:sendGuild(60419, 1, 23, 4)) then 
 			player:showText(npc,TENSHODO_SHOP_OPEN_DIALOG);
 		end
 	elseif (player:getQuestStatus(JEUNO,TENSHODO_MEMBERSHIP) == QUEST_ACCEPTED) then
Index: zones/Port_Bastok/npcs/Silver_Owl.lua
===================================================================
--- zones/Port_Bastok/npcs/Silver_Owl.lua	(revision 0)
+++ zones/Port_Bastok/npcs/Silver_Owl.lua	(working copy)
@@ -0,0 +1,52 @@
+-----------------------------------
+-- Area: Port Bastok
+-- NPC: Silver Owl
+-- Type: Tenshodo Merchant
+-- @pos -99.155 4.649 23.292 236
+-----------------------------------
+package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/globals/keyitems");
+require("scripts/zones/Port_Bastok/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if (player:hasKeyItem(TENSHODO_MEMBERS_CARD)) then 
+		if (player:sendGuild(60420, 1, 23, 4)) then 
+			player:showText(npc,TENSHODO_SHOP_OPEN_DIALOG);
+		end
+	else
+		player:startEvent(0x0096);
+	end
+end;
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
\ No newline at end of file
Index: zones/Port_Windurst/npcs/Babubu.lua
===================================================================
--- zones/Port_Windurst/npcs/Babubu.lua	(revision 4026)
+++ zones/Port_Windurst/npcs/Babubu.lua	(working copy)
@@ -2,10 +2,13 @@
 -- Area: Port Windurst
 -- NPC: Babubu
 -- Guild Merchant NPC: Fishing Guild 
--- @zone 240
+-- @pos -175.185 -3.324 70.445 240
 -----------------------------------
+package.loaded["scripts/zones/Port_Windurst/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Port_Windurst/TextIDs"] = nil;
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Port_Windurst/TextIDs");
 
 -----------------------------------
@@ -20,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(520,3,18,5)) then
+	if(player:sendGuild(517,3,18,5)) then
 		player:showText(npc,BABUBU_SHOP_DIALOG);
 	end
 end;
Index: zones/Selbina/npcs/Gibol.lua
===================================================================
--- zones/Selbina/npcs/Gibol.lua	(revision 4026)
+++ zones/Selbina/npcs/Gibol.lua	(working copy)
@@ -2,10 +2,14 @@
 -- Area: Selbina
 -- NPC:  Gibol
 -- Guild Merchant NPC: Clothcrafting Guild 
--- @zone 248
+-- @pos 13.591 -7.287 8.569 248
 -----------------------------------
+package.loaded["scripts/zones/Selbina/TextIDs"] = nil;
+-----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Selbina/TextIDs");
 
 -----------------------------------
 -- onTrade Action
@@ -19,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(515,6,21,0)) then
+	if(player:sendGuild(516,6,21,0)) then
 		player:showText(npc,TextID_Selbina.CLOTHCRAFT_SHOP_DIALOG);
 	end
 end; 
Index: zones/Selbina/npcs/Graegham.lua
===================================================================
--- zones/Selbina/npcs/Graegham.lua	(revision 4026)
+++ zones/Selbina/npcs/Graegham.lua	(working copy)
@@ -2,10 +2,13 @@
 -- Area: Selbina
 -- NPC:  Graegham
 -- Guild Merchant NPC: Fishing Guild 
--- @zone 248
+-- @pos -12.423 -7.287 8.665 248
 -----------------------------------
+package.loaded["scripts/zones/Selbina/TextIDs"] = nil;
+-----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Selbina/TextIDs");
 
 -----------------------------------
@@ -20,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(5171,3,18,5)) then
+	if(player:sendGuild(518,3,18,5)) then
 		player:showText(npc,TextID_Selbina.FISHING_SHOP_DIALOG);
 	end
 end; 
Index: zones/Selbina/npcs/Mendoline.lua
===================================================================
--- zones/Selbina/npcs/Mendoline.lua	(revision 4026)
+++ zones/Selbina/npcs/Mendoline.lua	(working copy)
@@ -2,10 +2,14 @@
 -- Area: Selbina
 -- NPC:  Mendoline
 -- Guild Merchant NPC: Fishing Guild 
--- @zone 248
+-- @pos -13.603 -7.287 10.916 248
 -----------------------------------
+package.loaded["scripts/zones/Selbina/TextIDs"] = nil;
+-----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Selbina/TextIDs");
 
 -----------------------------------
 -- onTrade Action
@@ -19,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(517,3,18,5)) then
+	if(player:sendGuild(5182,3,18,5)) then
 		player:showText(npc,TextID_Selbina.FISHING_SHOP_DIALOG);
 	end
 end; 
Index: zones/Selbina/npcs/Tilala.lua
===================================================================
--- zones/Selbina/npcs/Tilala.lua	(revision 4026)
+++ zones/Selbina/npcs/Tilala.lua	(working copy)
@@ -2,10 +2,14 @@
 -- Area: Selbina
 -- NPC:  Tilala
 -- Guild Merchant NPC: Clothcrafting Guild 
--- @zone 248
+-- @pos 14.344 -7.912 10.276 248
 -----------------------------------
+package.loaded["scripts/zones/Selbina/TextIDs"] = nil;
+-----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Selbina/TextIDs");
 
 -----------------------------------
 -- onTrade Action
@@ -19,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(515,6,21,0)) then
+	if(player:sendGuild(516,6,21,0)) then
 		player:showText(npc,TextID_Selbina.CLOTHCRAFT_SHOP_DIALOG);
 	end
 end; 
Index: zones/Selbina/TextIDs.lua
===================================================================
--- zones/Selbina/TextIDs.lua	(revision 4026)
+++ zones/Selbina/TextIDs.lua	(working copy)
@@ -18,8 +18,8 @@
 -- Shop Texts
   HERMINIA_SHOP_DIALOG = 6930, -- Hello there. What can I do for you?
  TORAPIONT_SHOP_DIALOG = 6931, -- Arm yourself before you step outside.
-CLOTHCRAFT_SHOP_DIALOG = 6933, -- Welcome to the Weavers' Guild salesroom.
-   FISHING_SHOP_DIALOG = 6934, -- Welcome to the Fishermen's Guild salesroom.
+CLOTHCRAFT_SHOP_DIALOG = 6935, -- Welcome to the Weavers' Guild salesroom.
+   FISHING_SHOP_DIALOG = 6936, -- Welcome to the Fishermen's Guild salesroom.
    QUELPIA_SHOP_DIALOG = 6935, -- In need of otherworldly protection?
 CHUTARMIRE_SHOP_DIALOG = 6936, -- I have items for those who delve in the black arts!
   DOHDJUMA_SHOP_DIALOG = 6932, -- I'm Dohdjuma, and I sell all kinds of things.
Index: zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua
===================================================================
--- zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua	(revision 4026)
+++ zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua	(working copy)
@@ -2,13 +2,15 @@
 -- Area: Ship Bound for Mhaura
 -- NPC: Chhaya
 -- Standard Merchant NPC
+-- @pos -1.139 -2.101 -9.000 221
 -----------------------------------
+package.loaded["scripts/zones/Ship_bound_for_Mhaura/TextIDs"] = nil;
+package.loaded["scripts/zones/Ship_bound_for_Mhaura_Pirate/TextIDs"] = nil;
+-----------------------------------
 
+require("scripts/globals/settings");
 require("scripts/globals/shop");
-package.loaded["scripts/zones/Ship_bound_for_Mhaura/TextIDs"] = nil;
 require("scripts/zones/Ship_bound_for_Mhaura/TextIDs");
-package.loaded["scripts/zones/Ship_bound_for_Mhaura_Pirate/TextIDs"] = nil;
---require("scripts/zones/Ship_bound_for_Mhaura_Pirate/TextIDs");
 
 -----------------------------------
 -- onTrade Action
Index: zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua
===================================================================
--- zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua	(revision 4026)
+++ zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua	(working copy)
@@ -2,10 +2,13 @@
 -- Area: Ship bound for Mhaura
 -- NPC: Lokhong
 -- Guild Merchant NPC: Fishing Guild 
+-- @pos 1.841 -2.101 -9.000 221
 -----------------------------------
-
 package.loaded["scripts/zones/Ship_bound_for_Mhaura/TextIDs"] = nil;
+-----------------------------------
 
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Ship_bound_for_Mhaura/TextIDs");
 
 -----------------------------------
@@ -20,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(519,1,23,5)) then
+	if(player:sendGuild(521,1,23,5)) then
 		player:showText(npc,LOKHONG_SHOP_DIALOG);
 	end
 end; 
Index: zones/Ship_bound_for_Mhaura/TextIDs.lua
===================================================================
--- zones/Ship_bound_for_Mhaura/TextIDs.lua	(revision 4026)
+++ zones/Ship_bound_for_Mhaura/TextIDs.lua	(working copy)
@@ -8,5 +8,5 @@
  FISHING_MESSAGE_OFFSET = 7156; -- You can't fish here
 
 -- Shop Texts
- CHHAYA_SHOP_DIALOG = 7255; -- May I offer you items to help you on your journey?
-LOKHONG_SHOP_DIALOG = 7254; -- There's nothing like fishing to pass the time!
+ CHHAYA_SHOP_DIALOG = 7267; -- May I offer you items to help you on your journey?
+LOKHONG_SHOP_DIALOG = 7266; -- There's nothing like fishing to pass the time!
Index: zones/Ship_bound_for_Selbina/npcs/Maera.lua
===================================================================
--- zones/Ship_bound_for_Selbina/npcs/Maera.lua	(revision 4026)
+++ zones/Ship_bound_for_Selbina/npcs/Maera.lua	(working copy)
@@ -2,10 +2,13 @@
 -- Area: Ship bound for Selbina
 -- NPC: Maera
 -- Standard Merchant NPC
+-- @pos -1.139 -2.101 -9.000 220
 -----------------------------------
+package.loaded["scripts/zones/Ship_bound_for_Selbina/TextIDs"] = nil;
+-----------------------------------
 
+require("scripts/globals/settings");
 require("scripts/globals/shop");
-package.loaded["scripts/zones/Ship_bound_for_Selbina/TextIDs"] = nil;
 require("scripts/zones/Ship_bound_for_Selbina/TextIDs");
 
 -----------------------------------
Index: zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua
===================================================================
--- zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua	(revision 4026)
+++ zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua	(working copy)
@@ -2,10 +2,13 @@
 -- Area: Ship bound for Selbina
 -- NPC: Rajmonda
 -- Guild Merchant NPC: Fishing Guild 
+-- @pos 1.841 -2.101 -9.000 220
 -----------------------------------
-
 package.loaded["scripts/zones/Ship_bound_for_Selbina/TextIDs"] = nil;
+-----------------------------------
 
+require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Ship_bound_for_Selbina/TextIDs");
 
 -----------------------------------
@@ -20,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(519,1,23,5)) then
+	if(player:sendGuild(520,1,23,5)) then
 		player:showText(npc,RAJMONDA_SHOP_DIALOG);
 	end
 
Index: zones/Ship_bound_for_Selbina/TextIDs.lua
===================================================================
--- zones/Ship_bound_for_Selbina/TextIDs.lua	(revision 4026)
+++ zones/Ship_bound_for_Selbina/TextIDs.lua	(working copy)
@@ -8,7 +8,7 @@
  FISHING_MESSAGE_OFFSET = 7156; -- You can't fish here
 
 -- Shop texts
-   MAERA_SHOP_DIALOG = 7255; -- May I offer you items to help you on your journey?
-RAJMONDA_SHOP_DIALOG = 7254; -- There's nothing like fishing to pass the time!
+   MAERA_SHOP_DIALOG = 7267; -- May I offer you items to help you on your journey?
+RAJMONDA_SHOP_DIALOG = 7266; -- There's nothing like fishing to pass the time!
 
 
Index: zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua
===================================================================
--- zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua	(revision 0)
+++ zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua	(working copy)
@@ -0,0 +1,49 @@
+-----------------------------------
+-- Area: Silver Sea route to Al Zahbi
+-- NPC:  Yahliq
+-- Guild Merchant NPC: Fishing Guild 
+-- @pos 4.986 -2.101 -12.026 59
+-----------------------------------
+package.loaded["scripts/zones/Silver_Sea_route_to_Al_Zahbi/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Silver_Sea_route_to_Al_Zahbi/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(525,1,23,5)) then
+		player:showText(npc,YAHLIQ_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
Index: zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua
===================================================================
--- zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua	(revision 0)
+++ zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua	(working copy)
@@ -0,0 +1,49 @@
+-----------------------------------
+-- Area: Silver Sea route to Al Zahbi
+-- NPC:  Yahliq
+-- Guild Merchant NPC: Fishing Guild 
+-- @pos 4.986 -2.101 -12.026 59
+-----------------------------------
+package.loaded["scripts/zones/Silver_Sea_route_to_Al_Zahbi/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Silver_Sea_route_to_Al_Zahbi/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(525,1,23,5)) then
+		player:showText(npc,YAHLIQ_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
Index: zones/Silver_Sea_route_to_Al_Zahbi/TextIDs.lua
===================================================================
--- zones/Silver_Sea_route_to_Al_Zahbi/TextIDs.lua	(revision 4026)
+++ zones/Silver_Sea_route_to_Al_Zahbi/TextIDs.lua	(working copy)
@@ -5,4 +5,8 @@
           ITEM_OBTAINED = 6378; -- Obtained: <item>
            GIL_OBTAINED = 6379; -- Obtained <number> gil
        KEYITEM_OBTAINED = 6381; -- Obtained key item: <keyitem>
- FISHING_MESSAGE_OFFSET = 6994; -- You can't fish here
\ No newline at end of file
+ FISHING_MESSAGE_OFFSET = 6994; -- You can't fish here
+ 
+ 
+-- Shops
+		 YAHLIQ_SHOP_DIALOG = 7261; -- You've picked the best place to shop for your items, guaranteed!
Index: zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua
===================================================================
--- zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua	(revision 0)
+++ zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Silver sea route to Mhaura
+-- NPC:  Jidwahn
+-- Guild Merchant NPC: Fishing Guild 
+-- @pos 4.986 -2.101 -12.026 58
+-----------------------------------
+package.loaded["scripts/zones/Silver_Sea_route_to_Nashmau/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Silver_Sea_route_to_Nashmau/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(524,1,23,5)) then
+		player:showText(npc,JIDWAHN_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua
===================================================================
--- zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua	(revision 0)
+++ zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua	(working copy)
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Area: Silver sea route to Mhaura
+-- NPC:  Jidwahn
+-- Guild Merchant NPC: Fishing Guild 
+-- @pos 4.986 -2.101 -12.026 58
+-----------------------------------
+package.loaded["scripts/zones/Silver_Sea_route_to_Nashmau/TextIDs"] = nil;
+-----------------------------------
+
+require("scripts/globals/settings");
+require("scripts/globals/shop");
+require("scripts/zones/Silver_Sea_route_to_Nashmau/TextIDs");
+
+-----------------------------------
+-- onTrade Action
+-----------------------------------
+
+function onTrade(player,npc,trade)
+end; 
+
+-----------------------------------
+-- onTrigger Action
+-----------------------------------
+
+function onTrigger(player,npc)
+	if(player:sendGuild(524,1,23,5)) then
+		player:showText(npc,JIDWAHN_SHOP_DIALOG);
+	end
+end; 
+
+-----------------------------------
+-- onEventUpdate
+-----------------------------------
+
+function onEventUpdate(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+-----------------------------------
+-- onEventFinish
+-----------------------------------
+
+function onEventFinish(player,csid,option)
+--printf("CSID: %u",csid);
+--printf("RESULT: %u",option);
+end;
+
+
+
Index: zones/Silver_Sea_route_to_Nashmau/TextIDs.lua
===================================================================
--- zones/Silver_Sea_route_to_Nashmau/TextIDs.lua	(revision 4026)
+++ zones/Silver_Sea_route_to_Nashmau/TextIDs.lua	(working copy)
@@ -6,3 +6,7 @@
            GIL_OBTAINED = 6379; -- Obtained <number> gil
        KEYITEM_OBTAINED = 6381; -- Obtained key item: <keyitem>
  FISHING_MESSAGE_OFFSET = 6994; -- You can't fish here       
+ 
+
+-- Shops
+		JIDWAHN_SHOP_DIALOG = 7261; -- Would you care for some items to use on your travels?
\ No newline at end of file
Index: zones/Southern_San_dOria/npcs/Cletae.lua
===================================================================
--- zones/Southern_San_dOria/npcs/Cletae.lua	(revision 4026)
+++ zones/Southern_San_dOria/npcs/Cletae.lua	(working copy)
@@ -2,8 +2,7 @@
 -- Area: Southern San d'Oria
 -- NPC: Cletae
 -- Guild Merchant NPC: Leathercrafting Guild 
--- @zone 230
--- @pos -189 -8 14
+-- @pos -189.142 -8.800 14.449 230
 -----------------------------------
 package.loaded["scripts/zones/Southern_San_dOria/TextIDs"] = nil;
 -----------------------------------
@@ -34,7 +33,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if (player:sendGuild(524,3,18,4)) then
+	if (player:sendGuild(5292,3,18,4)) then
 		player:showText(npc,CLETAE_DIALOG);
 	end
 end; 
Index: zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua
===================================================================
--- zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua	(revision 4026)
+++ zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua	(working copy)
@@ -2,8 +2,7 @@
 -- Area: Southern San d'Oria
 -- NPC: Kueh Igunahmori
 -- Guild Merchant NPC: Leathercrafting Guild 
--- @zone 230
--- @pos -189 -8 14
+-- @pos -194.791 -8.800 13.130 230
 -----------------------------------
 package.loaded["scripts/zones/Southern_San_dOria/TextIDs"] = nil;
 -----------------------------------
@@ -25,7 +24,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if (player:sendGuild(5241,3,18,4)) then
+	if (player:sendGuild(529,3,18,4)) then
 		player:showText(npc,KUEH_IGUNAHMORI_DIALOG);
 	end
 end; 
Index: zones/Windurst_Walls/npcs/Scavnix.lua
===================================================================
--- zones/Windurst_Walls/npcs/Scavnix.lua	(revision 4026)
+++ zones/Windurst_Walls/npcs/Scavnix.lua	(working copy)
@@ -2,11 +2,13 @@
 -- Area: Windurst Walls
 -- NPC: Scavnix
 -- Standard merchant, though he acts like a guild merchant
+-- @pos 17.731 0.106 239.626 239
 -----------------------------------
+package.loaded["scripts/zones/Windurst_Walls/TextIDs"] = nil;
+-----------------------------------
 
-package.loaded["scripts/zones/Windurst_Walls/TextIDs"] = nil;
 require("scripts/globals/settings");
---require("scripts/globals/shop");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Walls/TextIDs");
 
 -----------------------------------
@@ -23,17 +25,6 @@
 function onTrigger(player,npc)
     if(player:sendGuild(60418,11,22,6)) then
         player:showText(npc,SCAVNIX_SHOP_DIALOG);
---        stock = {
---            0x01DA, 21000,   --Red Chip
---            0x01DB, 21000,   --Blue Chip
---            0x01DC, 21000    --Yellow Chip 
---            0x01DD, 21000,   --Green Chip
---            0x01DE, 21000,   --Clear Chip
---            0x01DE, 21000,   --Purple Chip
---            0x01E0, 21000,   --White Chip
---            0x01E1, 21000,   --Black Chip
---        }
---	showShop(player, STATIC, stock);
 	end
 end;
 
Index: zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua
===================================================================
--- zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua	(revision 4026)
+++ zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua	(working copy)
@@ -2,12 +2,13 @@
 -- Area: Windurst Waters
 -- NPC:  Chomo Jinjahl
 -- Guild Merchant NPC: Cooking Guild 
--- @zone 238
+-- @pos -105.094 -2.222 73.791 238
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Waters/TextIDs"] = nil;
 -----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Waters/TextIDs");
 
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if (player:sendGuild(525,5,20,7)) then
+	if (player:sendGuild(5302,5,20,7)) then
 		player:showText(npc,CHOMOJINJAHL_SHOP_DIALOG);
 	end
 end; 
Index: zones/Windurst_Waters/npcs/Kopopo.lua
===================================================================
--- zones/Windurst_Waters/npcs/Kopopo.lua	(revision 4026)
+++ zones/Windurst_Waters/npcs/Kopopo.lua	(working copy)
@@ -2,13 +2,13 @@
 -- Area: Windurst Waters
 -- NPC:  Kopopo
 -- Guild Merchant NPC: Cooking Guild 
--- @zone 238
--- @pos -103 -2 74
+-- @pos -103.935 -2.875 74.304 238
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Waters/TextIDs"] = nil;
 -----------------------------------
 
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Waters/TextIDs");
 
 -----------------------------------
@@ -23,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if (player:sendGuild(5251,5,20,7)) then
+	if (player:sendGuild(530,5,20,7)) then
 		player:showText(npc,KOPOPO_SHOP_DIALOG);
 	end
 end; 
Index: zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua
===================================================================
--- zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua	(revision 4026)
+++ zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua	(working copy)
@@ -2,12 +2,13 @@
 -- Area: Windurst Woods
 -- NPC: Kuzah Hpirohpon
 -- Guild Merchant NPC: Clothcrafting Guild 
--- @zone: 241
--- @pos: -80.068 -3.25 -127.686
+-- @pos -80.068 -3.25 -127.686 241
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Woods/TextIDs"] = nil;
 -----------------------------------
+
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Woods/TextIDs");
 
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(515,6,21,0)) then
+	if(player:sendGuild(5152,6,21,0)) then
 		player:showText(npc,KUZAH_HPIROHPON_DIALOG);
 	end
 end;
Index: zones/Windurst_Woods/npcs/Meriri.lua
===================================================================
--- zones/Windurst_Woods/npcs/Meriri.lua	(revision 4026)
+++ zones/Windurst_Woods/npcs/Meriri.lua	(working copy)
@@ -2,12 +2,13 @@
 -- Area: Windurst Woods
 -- NPC: Meriri
 -- Guild Merchant NPC: Clothcrafting Guild 
--- @zone: 241
--- @pos: -76.471 -3.55 -128.341
+-- @pos: -76.471 -3.55 -128.341 241
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Woods/TextIDs"] = nil;
 -----------------------------------
+
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Woods/TextIDs");
 
 -----------------------------------
Index: zones/Windurst_Woods/npcs/Retto-Marutto.lua
===================================================================
--- zones/Windurst_Woods/npcs/Retto-Marutto.lua	(revision 4026)
+++ zones/Windurst_Woods/npcs/Retto-Marutto.lua	(working copy)
@@ -2,13 +2,13 @@
 -- Area: Windurst Woods
 -- NPC: Retto-Marutto
 -- Guild Merchant NPC: Bonecrafting Guild 
--- @zone: 241
--- @pos: -6.142 -6.55 -132.639
---
+-- @pos -6.142 -6.55 -132.639 241
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Woods/TextIDs"] = nil;
 -----------------------------------
+
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Woods/TextIDs");
 
 -----------------------------------
@@ -23,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(514,6,21,0)) then
+	if(player:sendGuild(5142,8,23,3)) then
 		player:showText(npc,RETTO_MARUTTO_DIALOG);
 	end
 end;
Index: zones/Windurst_Woods/npcs/Shih_Tayuun.lua
===================================================================
--- zones/Windurst_Woods/npcs/Shih_Tayuun.lua	(revision 4026)
+++ zones/Windurst_Woods/npcs/Shih_Tayuun.lua	(working copy)
@@ -1,13 +1,14 @@
 -----------------------------------
 -- Area: Windurst Woods
 -- NPC: Shih Tayuun
--- Guild Merchant NPC: Clothcraft Guild 
--- @zone: 241
--- @pos: -3.064 -6.25 -131.374
+-- Guild Merchant NPC: Bonecrafting Guild 
+-- @pos -3.064 -6.25 -131.374 241
 -----------------------------------
 package.loaded["scripts/zones/Windurst_Woods/TextIDs"] = nil;
 -----------------------------------
+
 require("scripts/globals/settings");
+require("scripts/globals/shop");
 require("scripts/zones/Windurst_Woods/TextIDs");
 
 -----------------------------------
@@ -22,7 +23,7 @@
 -----------------------------------
 
 function onTrigger(player,npc)
-	if(player:sendGuild(514,6,21,0)) then
+	if(player:sendGuild(514,8,23,3)) then
 		player:showText(npc,SHIH_TAYUUN_DIALOG);
 	end
 end;