Index: scripts/zones/Port_Bastok/npcs/Bagnobrok.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Bagnobrok.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Bagnobrok.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Bagnobrok --- Only sells when Bastok controls Movalpolos +-- Area: Port Bastok +-- NPC: Bagnobrok +-- Only sells when Bastok controls Movalpolos +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,22 +22,21 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(MOVALPOLOS); -RegionOwner = GetRegionOwner(MOVALPOLOS); - -if (RegionOwner ~= BASTOK) then - player:showText(npc,BAGNOBROK_CLOSED_DIALOG); -else - player:showText(npc,BAGNOBROK_OPEN_DIALOG); - - stock = {0x0280,11, --Copper Ore - 0x1162,694, --Coral Fungus - 0x1117,4032, --Danceshroom - 0x0672,6500, --Kopparnickel Ore - 0x142d,736} --Movalpolos Water - -showShop(player,BASTOK,stock); -end + if (RegionOwner ~= BASTOK) then + player:showText(npc,BAGNOBROK_CLOSED_DIALOG); + else + player:showText(npc,BAGNOBROK_OPEN_DIALOG); + stock = { + 0x0280, 11, --Copper Ore + 0x1162, 694, --Coral Fungus + 0x1117, 4032, --Danceshroom + 0x0672, 6500, --Kopparnickel Ore + 0x142D, 736 --Movalpolos Water + } + showShop(player,BASTOK,stock); + end end; ----------------------------------- @@ -56,6 +56,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Belka.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Belka.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Belka.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Belka --- Only sells when Bastok controlls Derfland Region +-- Area: Port Bastok +-- NPC: Belka +-- Only sells when Bastok controlls Derfland Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,23 +22,23 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(DERFLAND); + if (RegionOwner ~= BASTOK) then + player:showText(npc,BELKA_CLOSED_DIALOG); + else + player:showText(npc,BELKA_OPEN_DIALOG); + stock = { + 0x1100, 128, --Derfland Pear + 0x0269, 142, --Ginger + 0x11C1, 62, --Gysahl Greens + 0x0584, 1656, --Olive Flower + 0x0279, 14, --Olive Oil + 0x03B7, 110 --Wijnruit + } + showShop(player,BASTOK,stock); -RegionOwner = GetRegionOwner(DERFLAND); + end -if (RegionOwner ~= BASTOK) then - player:showText(npc,BELKA_CLOSED_DIALOG); -else - player:showText(npc,BELKA_OPEN_DIALOG); - - stock = {0x1100,128, -- Derfland Pear - 0x0269,142, -- Ginger - 0x11c1,62, -- Gysahl Greens - 0x0584,1656, -- Olive Flower - 0x0279,14, -- Olive Oil - 0x03b7,110} -- Wijnruit - -showShop(player,BASTOK,stock); -end end; ----------------------------------- @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Blabbivix.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Blabbivix.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Blabbivix.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Blabbivix --- Standard merchant, though he acts like a guild merchant +-- Area: Port Bastok +-- NPC: Blabbivix +-- Standard merchant, though he acts like a guild merchant +-- Confirmed shop stock, August 2013 ----------------------------------- package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil; @@ -21,19 +22,20 @@ ----------------------------------- function onTrigger(player,npc) - if(player:sendGuild(60418,11,22,3)) then - player:showText(npc,BLABBIVIX_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 + 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; ----------------------------------- @@ -53,6 +55,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Denvihr.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Denvihr.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Denvihr.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Denvihr -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,23 +21,24 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,DENVIHR_SHOP_DIALOG); + player:showText(npc,DENVIHR_SHOP_DIALOG); -stock = {0x02bb,5688,1, --Oak Log - 0x0284,1800,1, --Mythril Ore - 0x0343,225,1, --Flax Flower + stock = { + 0x02BB, 5688,1, --Oak Log + 0x0284, 1800,1, --Mythril Ore + 0x0343, 225,1, --Flax Flower - 0x02BA,86,2, --Ash Log - 0x02B6,2543,2, --Chestnut Log - 0x0283,810,2, --Iron Ore - 0x0341,18,2, --Moko Grass - 0x11DA,50,2, --Bird Egg + 0x02BA, 86,2, --Ash Log + 0x02B6, 2543,2, --Chestnut Log + 0x0283, 810,2, --Iron Ore + 0x0341, 18,2, --Moko Grass + 0x11DA, 50,2, --Bird Egg - 0x0280,10,3, --Copper Ore - 0x0088,1800,3} --Kaiserin Cosmetics - -showNationShop(player, BASTOK, stock); + 0x0280, 10,3, --Copper Ore + 0x0088, 1800,3 --Kaiserin Cosmetics + } + showNationShop(player, BASTOK, stock); + end; ----------------------------------- @@ -56,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua (working copy) @@ -1,9 +1,10 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Dhen Tevryukoh --- Only sells when Bastok controlls Elshimo Uplands --- @zone 236 --- @pos 35 -2 2 +-- Area: Port Bastok +-- NPC: Dhen Tevryukoh +-- Only sells when Bastok controlls Elshimo Uplands +-- @zone 236 +-- @pos 35 -2 2 +-- Confirmed shop stock, August 2013 ----------------------------------- package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil; ----------------------------------- @@ -24,21 +25,20 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ELSHIMOUPLANDS); + if (RegionOwner ~= BASTOK) then + player:showText(npc,DHENTEVRYUKOH_CLOSED_DIALOG); + else + player:showText(npc,DHENTEVRYUKOH_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ELSHIMOUPLANDS); - -if (RegionOwner ~= BASTOK) then - player:showText(npc,DHENTEVRYUKOH_CLOSED_DIALOG); -else - player:showText(npc,DHENTEVRYUKOH_OPEN_DIALOG); - - stock = {0x0585,1656, --Cattleya - 0x0274,239, --Cinnamon - 0x1174,73, --Pamamas - 0x02d1,147} --Rattan Lumber - -showShop(player,BASTOK,stock); -end + stock = { + 0x0585, 1656, --Cattleya + 0x0274, 239, --Cinnamon + 0x1174, 73, --Pamamas + 0x02D1, 147 --Rattan Lumber + } + showShop(player,BASTOK,stock); + end end; ----------------------------------- @@ -58,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Evelyn.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Evelyn.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Evelyn.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Evelyn --- Only sells when Bastok controlls Gustaberg Region +-- Area: Port Bastok +-- NPC: Evelyn +-- Only sells when Bastok controlls Gustaberg Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,21 +22,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(GUSTABERG); + if (RegionOwner ~= BASTOK) then + player:showText(npc,EVELYN_CLOSED_DIALOG); + else + player:showText(npc,EVELYN_OPEN_DIALOG); -RegionOwner = GetRegionOwner(GUSTABERG); + stock = { + 0x0454, 703, --Sulfur + 0x026B, 43, --Popoto + 0x0263, 36, --Rye Flour + 0x1124, 40 --Eggplant + } + showShop(player,BASTOK,stock); -if (RegionOwner ~= BASTOK) then - player:showText(npc,EVELYN_CLOSED_DIALOG); -else - player:showText(npc,EVELYN_OPEN_DIALOG); - - stock = {0x0454,703, -- Sulfur - 0x026b,43, -- Popoto - 0x0263,36, -- Rye Flour - 0x1124,40} -- Eggplant - -showShop(player,BASTOK,stock); -end + end + end; ----------------------------------- @@ -55,6 +57,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Galvin.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Galvin.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Galvin.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Galvin -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,21 +21,21 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,GALVIN_SHOP_DIALOG); + player:showText(npc,GALVIN_SHOP_DIALOG); + stock = { + 0x1020, 4445,1, --Ether -stock = {0x1020,4445,1, -- Ether + 0x1037, 736,2, --Echo Drops + 0x1010, 837,2, --Potion + 0x43A6, 3,2, --Wooden Arrow - 0x1037,736,2, -- Echo Drops - 0x1010,837,2, -- Potion - 0x43A6,3,2, -- Wooden Arrow + 0x1036, 2387,3, --Eye Drops + 0x1034, 290,3, --Antidote + 0x43A8, 7,3, --Iron Arrow + 0x43B8, 5,3 --Crossbow Bolt + } + showNationShop(player, BASTOK, stock); - 0x1036,2387,3, -- Eye Drops - 0x1034,290,3, -- Antidote - 0x43A8,7,3, -- Iron Arrow - 0x43B8,5,3} -- Crossbow Bolt - -showNationShop(player, BASTOK, stock); end; ----------------------------------- @@ -54,6 +55,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Ilita.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Ilita.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Ilita.lua (working copy) @@ -1,8 +1,9 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Ilita --- Linkshell merchant --- @pos -142 -1 -25 236 +-- Area: Port Bastok +-- NPC: Ilita +-- Linkshell merchant +-- @pos -142 -1 -25 236 +-- Confirmed shop stock, August 2013 ----------------------------------- package.loaded["scripts/zones/Port_Bastok/TextIDs"] = nil; ----------------------------------- @@ -22,15 +23,14 @@ ----------------------------------- function onTrigger(player,npc) + player:showText(npc,ILITA_SHOP_DIALOG,513); -player:showText(npc,ILITA_SHOP_DIALOG,513); + stock = { + 0x0200, 8000, --Linkshell + 0x3F9D, 375 --Pendant Compass + } + showShop(player, STATIC, stock); -stock = -{ - 0x0200,8000, -- Linkshell - 0x3f9d,375 -- Pendant Compass -} -showShop(player, STATIC, stock); end; ----------------------------------- @@ -50,6 +50,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Melloa.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Melloa.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Melloa.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Melloa -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,24 +21,25 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,MELLOA_SHOP_DIALOG); + player:showText(npc,MELLOA_SHOP_DIALOG); -stock = {0x11EF,147,1, -- Pumpernickel - 0x1141,3036,1, -- Egg Soup - 0x115A,368,1, -- Pineapple Juice + stock = { + 0x11EF, 147,1, --Pumpernickel + 0x1141, 3036,1, --Egg Soup + 0x115A, 368,1, --Pineapple Juice - 0x1127,22,2, -- Bretzel - 0x11E2,143,2, -- Sausage - 0x1148,1012,2, -- Melon Juice - 0x1155,662,2, -- Roast Mutton + 0x1127, 22,2, --Bretzel + 0x11E2, 143,2, --Sausage + 0x1148, 1012,2, --Melon Juice + 0x1155, 662,2, --Roast Mutton - 0x1193,92,3, -- Iron Bread - 0x1154,294,3, -- Baked Popoto - 0x1167,184,3, -- Pebble Soup - 0x119D,10,3} -- Distilled Water - -showNationShop(player, BASTOK, stock); + 0x1193, 92,3, --Iron Bread + 0x1154, 294,3, --Baked Popoto + 0x1167, 184,3, --Pebble Soup + 0x119D, 10,3 --Distilled Water + } + showNationShop(player, BASTOK, stock); + end; ----------------------------------- @@ -57,6 +59,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Numa.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Numa.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Numa.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Numa -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,29 +21,29 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,NUMA_SHOP_DIALOG); + player:showText(npc,NUMA_SHOP_DIALOG); -stock = {0x30a9,5079,1, -- Cotton Hachimaki - 0x3129,7654,1, -- Cotton Dogi - 0x31a9,4212,1, -- Cotton Tekko - 0x3229,6133,1, -- Cotton Sitabaki - 0x32a9,3924,1, -- Cotton Kyahan - 0x3395,3825,1, -- Silver Obi + stock = { + 0x30A9, 5079,1, --Cotton Hachimaki + 0x3129, 7654,1, --Cotton Dogi + 0x31A9, 4212,1, --Cotton Tekko + 0x3229, 6133,1, --Cotton Sitabaki + 0x32A9, 3924,1, --Cotton Kyahan + 0x3395, 3825,1, --Silver Obi - 0x30a8,759,2, -- Hachimaki - 0x3128,1145,2, -- Kenpogi - 0x31a8,630,2, -- Tekko - 0x3228,915,2, -- Sitabaki - 0x32a8,584,2, -- Kyahan - 0x02c0,132,2, -- Bamboo Stick + 0x30A8, 759,2, --Hachimaki + 0x3128, 1145,2, --Kenpogi + 0x31A8, 630,2, --Tekko + 0x3228, 915,2, --Sitabaki + 0x32A8, 584,2, --Kyahan + 0x02C0, 132,2, --Bamboo Stick - 0x025d,180,3, -- Pickaxe - 0x16eb,13500,3, -- Toolbag (Ino) - 0x16ec,18000,3, -- Toolbag (Shika) - 0x16ed,18000,3} -- Toolbag (Cho) - -showNationShop(player, BASTOK, stock); + 0x025D, 180,3, --Pickaxe + 0x16EB, 13500,3, --Toolbag (Ino) + 0x16EC, 18000,3, --Toolbag (Shika) + 0x16ED, 18000,3 --Toolbag (Cho) + } + showNationShop(player, BASTOK, stock); end; ----------------------------------- @@ -62,6 +63,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Rosswald.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Rosswald.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Rosswald.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Rosswald --- Only sells when Bastok controlls Zulkheim Region +-- Area: Port Bastok +-- NPC: Rosswald +-- Only sells when Bastok controlls Zulkheim Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,24 +22,25 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ZULKHEIM); + if (RegionOwner ~= BASTOK) then + player:showText(npc,ROSSWALD_CLOSED_DIALOG); + else + player:showText(npc,ROSSWALD_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ZULKHEIM); + stock = { + 0x1114, 44, --Giant Sheep Meat + 0x026E, 44, --Dried Marjoram + 0x0262, 55, --San d'Orian Flour + 0x0263, 36, --Rye Flour + 0x0730, 1840, --Semolina + 0x110E, 22, --La Theine Cabbage + 0x111A, 55 --Selbina Milk + } + showShop(player,BASTOK,stock); -if (RegionOwner ~= BASTOK) then - player:showText(npc,ROSSWALD_CLOSED_DIALOG); -else - player:showText(npc,ROSSWALD_OPEN_DIALOG); - - stock = {0x1114,44, -- Giant Sheep Meat - 0x026e,44, -- Dried Marjoram - 0x0262,55, -- San d'Orian Flour - 0x0263,36, -- Rye Flour - 0x0730,1840, -- Semolina - 0x110e,22, -- La Theine Cabbage - 0x111a,55} -- Selbina Milk - -showShop(player,BASTOK,stock); -end + end + end; ----------------------------------- @@ -58,6 +60,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Sawyer.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Sawyer.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Sawyer.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Sawyer -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,25 +21,25 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,SAWYER_SHOP_DIALOG); + player:showText(npc,SAWYER_SHOP_DIALOG); -stock = {0x11EF,147,1, -- Pumpernicket - 0x1141,3036,1, -- Egg Soup - 0x115A,368,1, -- Pineapple Juice + stock = { + 0x11EF, 147,1, --Pumpernickel + 0x1141, 3036,1, --Egg Soup + 0x115A, 368,1, --Pineapple Juice - 0x1127,22,2, -- Bretzel - 0x11E2,143,2, -- Sausage - 0x1148,1012,2, -- Melon Juice - 0x1155,662,2, -- Roast Mutton + 0x1127, 22,2, --Bretzel + 0x11E2, 143,2, --Sausage + 0x1148, 1012,2, --Melon Juice + 0x1155, 662,2, --Roast Mutton - 0x1193,92,3, -- Iron Bread - 0x1154,294,3, -- Baker Popoto - 0x1167,184,3, -- Pebble Soup - 0x119D,10,3} -- Distilled Water + 0x1193, 92,3, --Iron Bread + 0x1154, 294,3, --Baked Popoto + 0x1167, 184,3, --Pebble Soup + 0x119D, 10,3 --Distilled Water + } + showNationShop(player, BASTOK, stock); - -showNationShop(player, BASTOK, stock); end; ----------------------------------- @@ -58,6 +59,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Valeriano.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Valeriano.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Valeriano.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Bastok -- NPC: Valeriano -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,22 +21,23 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,VALERIANO_SHOP_DIALOG); + player:showText(npc,VALERIANO_SHOP_DIALOG); -stock = {0x112a,10, -- Ginger Cookie - 0x43c1,43, -- Flute - 0x43c3,990, -- Piccolo - 0x1399,585, -- Scroll of Scop's Operetta - 0x139a,16920, -- Scroll of Puppet's Operetta - 0x1395,2916, -- Scroll of Fowl Aubade - 0x13a3,2059, -- Scroll of Advancing March - 0x13d0,90000, -- Scroll of Goddess's Hymnus - 0x13b9,27140, -- Scroll of Earth Carol II - 0x13bb,28520, -- Scroll of Water Carol II - 0x1384,123880} -- Scroll of Mage's Ballad III - -showShop(player, STATIC, stock); + stock = { + 0x112A, 10, --Ginger Cookie + 0x43C1, 43, --Flute + 0x43C3, 990, --Piccolo + 0x1399, 585, --Scroll of Scop's Operetta + 0x139A, 16920, --Scroll of Puppet's Operetta + 0x1395, 2916, --Scroll of Fowl Aubade + 0x13A3, 2059, --Scroll of Advancing March + 0x13D0, 90000, --Scroll of Goddess's Hymnus + 0x13B9, 27140, --Scroll of Earth Carol II + 0x13BB, 28520, --Scroll of Water Carol II + 0x1384,123880 --Scroll of Mage's Ballad III + } + showShop(player, STATIC, stock); + end; ----------------------------------- @@ -55,6 +57,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Vattian.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Vattian.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Vattian.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Vattian --- Only sells when Bastok controlls Kuzotz Region +-- Area: Port Bastok +-- NPC: Vattian +-- Only sells when Bastok controlls Kuzotz Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,20 +22,21 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(KUZOTZ); + if (RegionOwner ~= BASTOK) then + player:showText(npc,VATTIAN_CLOSED_DIALOG); + else + player:showText(npc,VATTIAN_OPEN_DIALOG); -RegionOwner = GetRegionOwner(KUZOTZ); + stock = { + 0x0394, 855, --Cactuar Needle + 0x113C, 299, --Thundermelon + 0x118B, 184 --Watermelon + } + showShop(player,BASTOK,stock); -if (RegionOwner ~= BASTOK) then - player:showText(npc,VATTIAN_CLOSED_DIALOG); -else - player:showText(npc,VATTIAN_OPEN_DIALOG); - - stock = {0x0394,855, -- Cactuar Needle - 0x113c,299, -- Thundermelon - 0x118b,184} -- Watermelon - -showShop(player,BASTOK,stock); -end + end + end; ----------------------------------- @@ -54,6 +56,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua =================================================================== --- scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua (revision 3948) +++ scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua (working copy) @@ -1,7 +1,8 @@ ----------------------------------- --- Area: Port Bastok --- NPC: Zoby Quhyo --- Only sells when Bastok controlls Elshimo Lowlands +-- Area: Port Bastok +-- NPC: Zoby Quhyo +-- Only sells when Bastok controlls Elshimo Lowlands +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,25 +22,26 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ELSHIMOLOWLANDS); + if (RegionOwner ~= BASTOK) then + player:showText(npc,ZOBYQUHYO_CLOSED_DIALOG); + else + player:showText(npc,ZOBYQUHYO_OPEN_DIALOG); + + stock = { + 0x0272, 234, --Black Pepper + 0x0264, 55, --Kazham Peppers + 0x1150, 55, --Kazham Pineapple + 0x0278, 110, --Kukuru Bean + 0x1126, 36, --Mithran Tomato + 0x0276, 88, --Ogre Pumpkin + 0x0583, 1656 --Phalaenopsis + } + showShop(player,BASTOK,stock); -RegionOwner = GetRegionOwner(ELSHIMOLOWLANDS); + end -if (RegionOwner ~= BASTOK) then - player:showText(npc,ZOBYQUHYO_CLOSED_DIALOG); -else - player:showText(npc,ZOBYQUHYO_OPEN_DIALOG); - - stock = {0x0264,55, -- Kazham Peppers - 0x1150,55, -- Kazham Pineapple - 0x1126,36, -- Mithran Tomato - 0x0272,234, -- Black Pepper - 0x0276,88, -- Ogre Pumpkin - 0x0278,110, -- Kukuru Bean - 0x0583,1656} -- Phalaenopsis - -showShop(player,BASTOK,stock); -end -end; +end; ----------------------------------- -- onEventUpdate @@ -58,6 +60,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Alizabe.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Alizabe.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Alizabe.lua (working copy) @@ -1,8 +1,9 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Alizabe --- Only sells when Windurst controls the Tavnazian Archipelago --- Only available to those with CoP Ch. 4.1 or higher +-- Area: Port Windurst +-- NPC: Alizabe +-- Only sells when Windurst controls the Tavnazian Archipelago +-- Only available to those with CoP Ch. 4.1 or higher +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,26 +23,26 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(TAVNAZIANARCH); + cop = 40; --player:getVar("chainsOfPromathiaMissions"); -RegionOwner = GetRegionOwner(TAVNAZIANARCH); -cop = 40; --player:getVar("chainsOfPromathiaMissions"); + if (cop >= 40) then + if (RegionOwner ~= WINDURST) then + player:showText(npc,ALIZABE_CLOSED_DIALOG); + else + player:showText(npc,ALIZABE_OPEN_DIALOG); -if (cop >= 40) then - if (RegionOwner ~= WINDURST) then - player:showText(npc,ALIZABE_CLOSED_DIALOG); - else - player:showText(npc,ALIZABE_OPEN_DIALOG); - - stock = {0x05f3,290, --Apple Mint - 0x142c,1945, --Ground Wasabi - 0x426d,99, --Lufaise Fly - 0x144b,233} --Misareaux Parsley - - showShop(player,WINDURST,stock); - end -else - player:showText(npc,ALIZABE_COP_NOT_COMPLETED); -end + stock = { + 0x05F3, 290, --Apple Mint + 0x142C, 1945, --Ground Wasabi + 0x426D, 99, --Lufaise Fly + 0x144B, 233 --Misareaux Parsley + } + showShop(player,WINDURST,stock); + end + else + player:showText(npc,ALIZABE_COP_NOT_COMPLETED); + end end; ----------------------------------- @@ -61,6 +62,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Aroro.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Aroro.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Aroro.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Aroro --- Standard Merchant NPC --- Working 100% +-- Area: Port Windurst +-- NPC: Aroro +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,30 +21,31 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,ARORO_SHOP_DIALOG); + player:showText(npc,ARORO_SHOP_DIALOG); -stock = {0x12fe,114,1, --Blind + stock = { + 0x12FE, 114,1, --Blind - 0x12dc,84,2, --Poison - 0x12e6,368,2, --Bio - 0x12fd,2300,2, --Sleep + 0x12DC, 84,2, --Poison + 0x12E6, 368,2, --Bio + 0x12FD, 2300,2, --Sleep - 0x129f,62,3, --Stone - 0x12a9,143,3, --Water - 0x129a,331,3, --Aero - 0x1290,855,3, --Fire - 0x1295,1619,3, --Blizzard - 0x12a4,3334,3, --Thunder - 0x12eb,4747,3, --Burn - 0x12ec,3770,3, --Frost - 0x12ed,2300,3, --Choke - 0x12ee,1867,3, --Rasp - 0x12ef,1393,3, --Shock - 0x12f0,6508,3} --Drown + 0x129D, 62,3, --Stone + 0x12A9, 143,3, --Water + 0x129A, 331,3, --Aero + 0x1290, 855,3, --Fire + 0x1295, 1619,3, --Blizzard + 0x12A4, 3334,3, --Thunder + 0x12EB, 4747,3, --Burn + 0x12EC, 3770,3, --Frost + 0x12ED, 2300,3, --Choke + 0x12EE, 1867,3, --Rasp + 0x12EF, 1393,3, --Shock + 0x12F0, 6508,3 --Drown + } + showNationShop(player, WINDURST, stock); -showNationShop(player, WINDURST, stock); -end; +end; ----------------------------------- -- onEventUpdate @@ -63,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Windurst -- NPC: Guruna-Maguruna -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,27 +21,28 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,GURUNAMAGURUNA_SHOP_DIALOG); + player:showText(npc,GURUNAMAGURUNA_SHOP_DIALOG); -stock = {0x3322,4201,1, --Beetle Gorget - 0x3139,2776,1, --Linen Robe - 0x31b9,1570,1, --Linen Cuffs + stock = { + 0x3322, 4201,1, --Beetle Gorget + 0x3139, 2776,1, --Linen Robe + 0x31B9, 1570,1, --Linen Cuffs - 0x3140,1260,2, --Tunic - 0x3131,12355,2, --Cotton Doublet - 0x3198,324,2, --Leather Gloves - 0x31c0,589,2, --Mitts - 0x31b1,6696,2, --Cotton Gloves + 0x3140, 1260,2, --Tunic + 0x3131, 12355,2, --Cotton Doublet + 0x3198, 324,2, --Leather Gloves + 0x31C0, 589,2, --Mitts + 0x31B1, 6696,2, --Cotton Gloves - 0x331d,972,3, --Hemp Gorget - 0x3130,2470,3, --Doublet - 0x3138,216,3, --Robe - 0x3118,604,3, --Leather Vest - 0x31b0,1363,3, --Gloves - 0x31b8,118,3} --Cuffs - -showNationShop(player, WINDURST, stock); + 0x331D, 972,3, --Hemp Gorget + 0x3130, 2470,3, --Doublet + 0x3138, 216,3, --Robe + 0x3118, 604,3, --Leather Vest + 0x31B0, 1363,3, --Gloves + 0x31B8, 118,3 --Cuffs + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -60,6 +62,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Windurst -- NPC: Hohbiba-Mubiba -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,27 +21,28 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,HOHBIBAMUBIBA_SHOP_DIALOG); + player:showText(npc,HOHBIBAMUBIBA_SHOP_DIALOG); -stock = {0x429b,1440,1, --Yew Wand - 0x42a3,91,1, --Bronze Rod - 0x42c2,3642,1, --Elm Staff - 0x42c9,18422,1, --Elm Pole + stock = { + 0x429B, 1440,1, --Yew Wand + 0x42A3, 91,1, --Bronze Rod + 0x42C2, 3642,1, --Elm Staff + 0x42C9, 18422,1, --Elm Pole - 0x429a,340,2, --Willow Wand - 0x4282,4945,2, --Bone Cudgel - 0x42c1,584,2, --Holly Staff - 0x42c8,4669,2, --Holly Pole + 0x429A, 340,2, --Willow Wand + 0x4282, 4945,2, --Bone Cudgel + 0x42C1, 584,2, --Holly Staff + 0x42C8, 4669,2, --Holly Pole - 0x4299,47,3, --Maple Wand - 0x4280,66,3, --Ash Club - 0x4281,1600,3, --Chestnut Club - 0x42c0,58,3, --Ash Staff - 0x42c7,386,3, --Ash Pole - 0x4040,143,3} --Bronze Dagger - -showNationShop(player, WINDURST, stock); + 0x4299, 47,3, --Maple Wand + 0x4280, 66,3, --Ash Club + 0x4281, 1600,3, --Chestnut Club + 0x42C0, 58,3, --Ash Staff + 0x42C7, 386,3, --Ash Pole + 0x4040, 143,3 --Bronze Dagger + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -60,6 +62,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua (working copy) @@ -1,8 +1,9 @@ ----------------------------------- -- Area: Port Bastok --- NPC: Ilita +-- NPC: Khel Pahlhama -- Linkshell merchant --- @pos -142 -1 -25 236 +-- @pos 21 -2 -20 240 +-- Confirmed shop stock, August 2013 ----------------------------------- package.loaded["scripts/zones/Port_Windurst/TextIDs"] = nil; ----------------------------------- @@ -22,15 +23,14 @@ ----------------------------------- function onTrigger(player,npc) + player:showText(npc,KHEL_PHLHAMA_SHOP_DIALOG,513); -player:showText(npc,KHEL_PHLHAMA_SHOP_DIALOG,513); + stock = { + 0x0200, 8000, --Linkshell + 0x3f9d, 375 --Pendant Compass + } + showShop(player, STATIC, stock); -stock = -{ - 0x0200,8000, -- Linkshell - 0x3f9d,375 -- Pendant Compass -} -showShop(player, STATIC, stock); end; ----------------------------------- @@ -50,6 +50,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Kucha Malkobhi --- Standard Merchant NPC --- Working 100% +-- Area: Port Windurst +-- NPC: Kucha Malkobhi +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,19 +21,19 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,KUCHAMALKOBHI_SHOP_DIALOG); + player:showText(npc,KUCHAMALKOBHI_SHOP_DIALOG); -stock = {0x315b,273, --Tarutaru Kaftan - 0x31d4,163, --Tarutaru Mitts - 0x3256,236, --Tarutaru Braccae - 0x32cf,163, --Tarutaru Clomps - 0x315c,273, --Mithran Separates - 0x31d5,163, --Mithran Gauntlets - 0x3257,236, --Mithran Loincloth - 0x32d0,163} --Mithran Gaiters - -showShop(player, STATIC, stock); + stock = { + 0x315b, 273, --Tarutaru Kaftan + 0x31d4, 163, --Tarutaru Mitts + 0x3256, 236, --Tarutaru Braccae + 0x32cf, 163, --Tarutaru Clomps + 0x315c, 273, --Mithran Separates + 0x31d5, 163, --Mithran Gauntlets + 0x3257, 236, --Mithran Loincloth + 0x32d0, 163 --Mithran Gaiters + } + showShop(player, STATIC, stock); end; ----------------------------------- @@ -53,6 +53,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Kumama.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Kumama.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Kumama.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Windurst -- NPC: Kumama -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,27 +21,27 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,KUMAMA_SHOP_DIALOG); + player:showText(npc,KUMAMA_SHOP_DIALOG); -stock = {0x3239,2268,1, --Linen Slops - 0x32b9,1462,1, --Holly Clogs - 0x3004,4482,1, --Mahogany Shield + stock = { + 0x3239, 2268,1, --Linen Slops + 0x32b9, 1462,1, --Holly Clogs + 0x3004, 4482,1, --Mahogany Shield - 0x3218,482,2, --Leather Trousers - 0x3231,9936,2, --Cotton Brais - 0x3298,309,2, --Leather Highboots - 0x32c0,544,2, --Solea - 0x32b1,6633,2, --Cotton Gaiters - 0x3002,556,2, --Maple Shield + 0x3218, 482,2, --Leather Trousers + 0x3231, 9936,2, --Cotton Brais + 0x3298, 309,2, --Leather Highboots + 0x32c0, 544,2, --Solea + 0x32b1, 6633,2, --Cotton Gaiters + 0x3002, 556,2, --Maple Shield - 0x3230,1899,3, --Brais - 0x3238,172,3, --Slops - 0x32b0,1269,3, --Gaiters - 0x32b8,111,3, --Ash Clogs - 0x3001,110,3} --Lauan Shield - -showNationShop(player, WINDURST, stock); + 0x3230, 1899,3, --Brais + 0x3238, 172,3, --Slops + 0x32b0, 1269,3, --Gaiters + 0x32b8, 111,3, --Ash Clogs + 0x3001, 110,3 --Lauan Shield + } + showNationShop(player, WINDURST, stock); end; ----------------------------------- @@ -60,6 +61,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Kususu.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Kususu.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Kususu.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Windurst -- NPC: Kususu -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,29 +21,30 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,KUSUSU_SHOP_DIALOG); - -stock = {0x1221,1165,1, --Diaga - 0x1236,7025,1, --Stoneskin - 0x1238,837,1, --Slow + player:showText(npc,KUSUSU_SHOP_DIALOG); - 0x1202,585,2, --Cure II - 0x121c,140,2, --Banish - 0x1226,1165,2, --Banishga - 0x1235,2097,2, --Blink + stock = { + 0x1221, 1165,1, --Diaga + 0x1236, 7025,1, --Stoneskin + 0x1238, 837,1, --Slow - 0x1201,61,3, --Cure - 0x1207,1363,3, --Curaga - 0x120e,180,3, --Poisona - 0x120f,324,3, --Paralyna - 0x1210,990,3, --Blindna - 0x1217,82,3, --Dia - 0x122b,219,3, --Protect - 0x1230,1584,3, --Shell - 0x1237,360,3} --Aquaveil - -showNationShop(player, WINDURST, stock); + 0x1202, 585,2, --Cure II + 0x121c, 140,2, --Banish + 0x1226, 1165,2, --Banishga + 0x1235, 2097,2, --Blink + + 0x1201, 61,3, --Cure + 0x1207, 1363,3, --Curaga + 0x120e, 180,3, --Poisona + 0x120f, 324,3, --Paralyna + 0x1210, 990,3, --Blindna + 0x1217, 82,3, --Dia + 0x122b, 219,3, --Protect + 0x1230, 1584,3, --Shell + 0x1237, 360,3 --Aquaveil + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -62,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Lebondur.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Lebondur.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Lebondur.lua (working copy) @@ -3,6 +3,7 @@ -- NPC: Lebondur -- Regional Marchant NPC -- Only sells when Windurst controls Vollbow. +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,21 +23,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(VOLLBOW); + if (RegionOwner ~= WINDURST) then + player:showText(npc,LEBONDUR_CLOSED_DIALOG); + else + player:showText(npc,LEBONDUR_OPEN_DIALOG); -RegionOwner = GetRegionOwner(VOLLBOW); + stock = { + 0x027C, 119, --Chamomile + 0x0360, 88, --Fish Scales + 0x03a8, 14, --Rock Salt + 0x0582, 1656 --Sweet William + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,LEBONDUR_CLOSED_DIALOG); -else - player:showText(npc,LEBONDUR_OPEN_DIALOG); + end - stock = {0x27c,119, --Chamomile - 0x360,88, --Fish Scales - 0x3a8,14, --Rock Salt - 0x582,1656} --Sweet William - -showShop(player,WINDURST,stock); -end end; ----------------------------------- @@ -56,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua (working copy) @@ -1,9 +1,9 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Posso Ruhbini --- Regional Marchant NPC --- Only sells when Windurst controlls Norvallen --- Working 100% +-- Area: Port Windurst +-- NPC: Posso Ruhbini +-- Regional Marchant NPC +-- Only sells when Windurst controlls Norvallen +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -23,21 +23,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(NORVALLEN); + if (RegionOwner ~= WINDURST) then + player:showText(npc,POSSORUHBINI_CLOSED_DIALOG); + else + player:showText(npc,POSSORUHBINI_OPEN_DIALOG); -RegionOwner = GetRegionOwner(NORVALLEN); + stock = { + 0x02B0, 18, --Arrowwood Log + 0x02BA, 87, --Ash Log + 0x026A, 25, --Blue Peas + 0x026D, 25 --Crying Mustard + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,POSSORUHBINI_CLOSED_DIALOG); -else - player:showText(npc,POSSORUHBINI_OPEN_DIALOG); + end - stock = {0x2b0,18, --Arrowwood Log - 0x2ba,87, --Ash Log - 0x26a,25, --Blue Peas - 0x26d,25} --Crying Mustard - -showShop(player,WINDURST,stock); -end end; ----------------------------------- @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Ryan.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Ryan.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Ryan.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Ryan --- Standard Merchant NPC --- Working 100% +-- Area: Port Windurst +-- NPC: Ryan +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,28 +21,29 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,RYAN_SHOP_DIALOG); + player:showText(npc,RYAN_SHOP_DIALOG); -stock = {0x4100,290, --Bronze Axe - 0x4097,246, --Bronze Sword - 0x43b8,5, --Crossbow Bolt - 0x3120,235, --Bronze Harness - 0x3121,2286, --Brass Harness - 0x31a0,128, --Bronze Mittens - 0x31a1,1255, --Brass Mittens - 0x3220,191, --Bronze Subligar - 0x3221,1840, --Brass Subligar - 0x32a0,117, --Bronze Leggings - 0x32a1,1140, --Brass Leggings - 0x3128,1145, --Kenpogi - 0x31a8,630, --Tekko - 0x3228,915, --Sitabaki - 0x32a8,584} --Kyahan - -showShop(player, WINDURST, stock); -end; + stock = { + 0x4100, 290, --Bronze Axe + 0x4097, 246, --Bronze Sword + 0x43B8, 5, --Crossbow Bolt + 0x3120, 235, --Bronze Harness + 0x3121, 2286, --Brass Harness + 0x31A0, 128, --Bronze Mittens + 0x31A1, 1255, --Brass Mittens + 0x3220, 191, --Bronze Subligar + 0x3221, 1840, --Brass Subligar + 0x32A0, 117, --Bronze Leggings + 0x32A1, 1140, --Brass Leggings + 0x3128, 1145, --Kenpogi + 0x31A8, 630, --Tekko + 0x3228, 915, --Sitabaki + 0x32A8, 584 --Kyahan + } + showShop(player, WINDURST, stock); +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -60,6 +61,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua (working copy) @@ -1,9 +1,9 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Sattsuh Ahkanpari --- Regional Marchant NPC --- Only sells when Windurst controlls Elshimo Uplands --- Working 100% +-- Area: Port Windurst +-- NPC: Sattsuh Ahkanpari +-- Regional Marchant NPC +-- Only sells when Windurst controlls Elshimo Uplands +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -23,21 +23,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ELSHIMOUPLANDS); + if (RegionOwner ~= WINDURST) then + player:showText(npc,SATTSUHAHKANPARI_CLOSED_DIALOG); + else + player:showText(npc,SATTSUHAHKANPARI_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ELSHIMOUPLANDS); + stock = { + 0x0585, 1656, --Cattleya + 0x0274, 239, --Cinnamon + 0x1174, 73, --Pamamas + 0x02d1, 147 --Rattan Lumber + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,SATTSUHAHKANPARI_CLOSED_DIALOG); -else - player:showText(npc,SATTSUHAHKANPARI_OPEN_DIALOG); + end - stock = {0x0585,1656, --Cattleya - 0x0274,239, --Cinnamon - 0x1174,73, --Pamamas - 0x02d1,147} --Rattan Lumber - -showShop(player,WINDURST,stock); -end end; ----------------------------------- @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Sheia Pohrichamaha --- Only sells when Windurst controlls Fauregandi Region --- Working 100% +-- Area: Port Windurst +-- NPC: Sheia Pohrichamaha +-- Only sells when Windurst controlls Fauregandi Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,20 +22,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(FAUREGANDI); -RegionOwner = GetRegionOwner(FAUREGANDI); + if (RegionOwner ~= WINDURST) then + player:showText(npc,SHEIAPOHRICHAMAHA_CLOSED_DIALOG); + else + player:showText(npc,SHEIAPOHRICHAMAHA_OPEN_DIALOG); -if (RegionOwner ~= WINDURST) then - player:showText(npc,SHEIAPOHRICHAMAHA_CLOSED_DIALOG); -else - player:showText(npc,SHEIAPOHRICHAMAHA_OPEN_DIALOG); - - stock = {0x11db,90, --Beaugreens - 0x110b,39, --Faerie Apple - 0x02b3,54} --Maple Log + stock = { + 0x11DB, 90, --Beaugreens + 0x110B, 39, --Faerie Apple + 0x02B3, 54 --Maple Log + } + showShop(player,WINDURST,stock); -showShop(player,WINDURST,stock); -end + end + end; ----------------------------------- @@ -55,6 +57,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua (working copy) @@ -2,6 +2,7 @@ -- Area: Port Windurst -- NPC: Taniko-Maniko -- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -20,29 +21,30 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,TANIKOMANIKO_SHOP_DIALOG); + player:showText(npc,TANIKOMANIKO_SHOP_DIALOG); -stock = {0x4181,2542,1, --Brass Zaghnal - 0x4302,7128,1, --Wrapped Bow - 0x43ab,162,1, --Ice Arrow - 0x43ac,162,1, --Lightning Arrow + stock = { + 0x4181, 2542,1, --Brass Zaghnal + 0x4302, 7128,1, --Wrapped Bow + 0x43AB, 162,1, --Ice Arrow + 0x43AC, 162,1, --Lightning Arrow - 0x4015,104,2, --Cat Baghnakhs - 0x4001,129,2, --Cesti - 0x4109,5864,2, --Bone Pick - 0x4301,482,2, --Self Bow - 0x43a6,3,2, --Wooden Arrow - 0x439c,54,2, --Hawkeye - 0x4380,1575,2, --Boomerang + 0x4015, 104,2, --Cat Baghnakhs + 0x4001, 129,2, --Cesti + 0x4109, 5864,2, --Bone Pick + 0x4301, 482,2, --Self Bow + 0x43A6, 3,2, --Wooden Arrow + 0x439C, 54,2, --Hawkeye + 0x4380, 1575,2, --Boomerang - 0x4102,4198,3, --Bone Axe - 0x4180,309,3, --Bronze Zaghnal - 0x41c0,97,3, --Harpoon - 0x4300,39,3, --Shortbow - 0x43a7,4,3} --Bone Arrow + 0x4102, 4198,3, --Bone Axe + 0x4180, 309,3, --Bronze Zaghnal + 0x41C0, 97,3, --Harpoon + 0x4300, 39,3, --Shortbow + 0x43A7, 4,3 --Bone Arrow + } + showNationShop(player, WINDURST, stock); -showNationShop(player, WINDURST, stock); end; ----------------------------------- @@ -62,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Uli Pehkowa --- Standard Merchant NPC --- Working 100% +-- Area: Port Windurst +-- NPC: Uli Pehkowa +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,24 +21,25 @@ ----------------------------------- function onTrigger(player,npc) + player:showText(npc,ULIPEHKOWA_SHOP_DIALOG); -player:showText(npc,ULIPEHKOWA_SHOP_DIALOG); - -stock = {0x0284,1840,1, --Mythril Ore - 0x0343,230,1, --Flax Flower - 0x02bb,5814,1, --Oak Log + stock = { + 0x0284, 1840,1, --Mythril Ore + 0x0343, 230,1, --Flax Flower + 0x02BB, 5814,1, --Oak Log - 0x02ba,87,2, --Ash Log - 0x02b6,2599,2, --Chestnut Log - 0x0280,11,2, --Copper Ore - 0x0283,828,2, --Iron Ore - 0x11da,51,2, --Bird egg + 0x02BA, 87,2, --Ash Log + 0x02B6, 2599,2, --Chestnut Log + 0x0280, 11,2, --Copper Ore + 0x0283, 828,2, --Iron Ore + 0x11DA, 51,2, --Bird egg - 0x0341,18,3, --Moko Grass - 0x0072,1840,3} --My First Magic Kit + 0x0341, 18,3, --Moko Grass + 0x0072, 1840,3 --My First Magic Kit + } + showNationShop(player, WINDURST, stock); -showNationShop(player, WINDURST, stock); -end; +end; ----------------------------------- -- onEventUpdate @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Port_Windurst/npcs/Zoreen.lua =================================================================== --- scripts/zones/Port_Windurst/npcs/Zoreen.lua (revision 3948) +++ scripts/zones/Port_Windurst/npcs/Zoreen.lua (working copy) @@ -1,9 +1,9 @@ ----------------------------------- --- Area: Port Windurst --- NPC: Zoreen --- Regional Marchant NPC --- Only sells when Windurst controls Valdeaunia --- Working 100% +-- Area: Port Windurst +-- NPC: Zoreen +-- Regional Marchant NPC +-- Only sells when Windurst controls Valdeaunia +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -23,19 +23,18 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(VALDEAUNIA); + if (RegionOwner ~= WINDURST) then + player:showText(npc,ZOREEN_CLOSED_DIALOG); + else + player:showText(npc,ZOREEN_OPEN_DIALOG); -RegionOwner = GetRegionOwner(VALDEAUNIA); - -if (RegionOwner ~= WINDURST) then - player:showText(npc,ZOREEN_CLOSED_DIALOG); -else - player:showText(npc,ZOREEN_OPEN_DIALOG); - - stock = {0x111e,29, --Frost Turnip - 0x027e,170} --Sage - -showShop(player,WINDURST,stock); -end + stock = { + 0x111E, 29, --Frost Turnip + 0x027e, 170 --Sage + } + showShop(player,WINDURST,stock); + end end; ----------------------------------- @@ -55,6 +54,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Walls/npcs/Scavnix.lua =================================================================== --- scripts/zones/Windurst_Walls/npcs/Scavnix.lua (revision 3948) +++ scripts/zones/Windurst_Walls/npcs/Scavnix.lua (working copy) @@ -1,7 +1,7 @@ ----------------------------------- --- Area: Windurst Walls --- NPC: Scavnix --- Standard merchant, though he acts like a guild merchant +-- Area: Windurst Walls +-- NPC: Scavnix +-- Standard merchant, though he acts like a guild merchant ----------------------------------- package.loaded["scripts/zones/Windurst_Walls/TextIDs"] = nil; @@ -21,21 +21,21 @@ ----------------------------------- function onTrigger(player,npc) -if(player:sendGuild(60418,11,22,6)) then - player:showText(npc,SCAVNIX_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 --- + 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; +end; ----------------------------------- -- onEventUpdate @@ -54,6 +54,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Ahyeekih --- Only sells when Windurst controls Kolshushu --- Working 100% +-- Area: Windurst Waters +-- NPC: Ahyeekih +-- Only sells when Windurst controls Kolshushu +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -24,22 +24,23 @@ ----------------------------------- function onTrigger(player,npc) - -RegionOwner = GetRegionOwner(KOLSHUSHU); - -if (RegionOwner ~= WINDURST) then + RegionOwner = GetRegionOwner(KOLSHUSHU); + if (RegionOwner ~= WINDURST) then player:showText(npc,AHYEEKIH_CLOSED_DIALOG); -else + else player:showText(npc,AHYEEKIH_OPEN_DIALOG); - stock = {0x1197,184, --Buburimu Grape - 0x0460,1620, --Casablanca - 0x1107,220, --Dhalmel Meat - 0x0266,72, --Mhaura Garlic - 0x115d,40} --Yagudo Cherry + stock = { + 0x1197, 184, --Buburimu Grape + 0x0460, 1620, --Casablanca + 0x1107, 220, --Dhalmel Meat + 0x0266, 72, --Mhaura Garlic + 0x115D, 40 --Yagudo Cherry + } + showShop(player,WINDURST,stock); -showShop(player,WINDURST,stock); -end + end + end; ----------------------------------- @@ -59,6 +60,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Baehu-Faehu --- Only sells when Windurst has control of Sarutabaruta --- Working 100% +-- Area: Windurst Waters +-- NPC: Baehu-Faehu +-- Only sells when Windurst has control of Sarutabaruta +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,24 +22,25 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(SARUTABARUTA); + if (RegionOwner ~= WINDURST) then + player:showText(npc,BAEHUFAEHU_CLOSED_DIALOG); + else + player:showText(npc,BAEHUFAEHU_OPEN_DIALOG); -RegionOwner = GetRegionOwner(SARUTABARUTA); + stock = { + 0x115C, 22, --Rarab Tail + 0x02B1, 33, --Lauan Log + 0x026B, 43, --Popoto + 0x1128, 29, --Saruta Orange + 0x027B, 18 --Windurstian Tea Leaves + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,BAEHUFAEHU_CLOSED_DIALOG); -else - player:showText(npc,BAEHUFAEHU_OPEN_DIALOG); - - stock = {0x115c,22, --Rarab Tail - 0x02b1,33, --Lauan Log - 0x026b,43, --Popoto - 0x1128,29, --Saruta Orange - 0x027b,18} --Windurstian Tea Leaves - -showShop(player,WINDURST,stock); -end -end; + end +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Ensasa.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Ensasa.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Ensasa.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Waters --- NPC: Ensasa +-- NPC: Ensasa -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -23,27 +23,28 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,ENSASA_SHOP_DIALOG); + player:showText(npc,ENSASA_SHOP_DIALOG); -stock = {0x0068,3881,1, --Tarutaru Folding Screen + stock = { + 0x0068, 3881,1, --Tarutaru Folding Screen - 0x43b8,5,2, --Crossbow Bolt - 0x43a6,3,2, --Wooden Arrow - 0x0070,456,2, --Yellow Jar + 0x43B8, 5,2, --Crossbow Bolt + 0x43A6, 3,2, --Wooden Arrow + 0x0070, 456,2, --Yellow Jar - 0x43a7,4,3, --Bone Arrow - 0x00da,920,3, --Earthen Flowerpot - 0x43f4,3,3, --Little Worm - 0x43f3,9,3, --Lugworm - 0x0762,576,3, --River Foliage - 0x13c9,283,3, --Earth Threnody - 0x13c6,644,3, --Fire Threnody - 0x0763,576,3, --Sea Foliage - 0x005c,905,3, --Tarutaru Stool - 0x006e,4744,3} --White Jar - -showNationShop(player, WINDURST, stock); + 0x43A7, 4,3, --Bone Arrow + 0x00DA, 920,3, --Earthen Flowerpot + 0x43F4, 3,3, --Little Worm + 0x43F3, 9,3, --Lugworm + 0x0762, 576,3, --River Foliage + 0x13C9, 283,3, --Earth Threnody + 0x13C6, 644,3, --Fire Threnody + 0x0763, 576,3, --Sea Foliage + 0x005C, 905,3, --Tarutaru Stool + 0x006E, 4744,3 --White Jar + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -63,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Fomina.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Fomina.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Fomina.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Fomina --- Only sells when Windurst controlls Elshimo Lowlands --- Working 100% +-- Area: Windurst Waters +-- NPC: Fomina +-- Only sells when Windurst controlls Elshimo Lowlands +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,25 +22,26 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ELSHIMOLOWLANDS); + if (RegionOwner ~= WINDURST) then + player:showText(npc,FOMINA_CLOSED_DIALOG); + else + player:showText(npc,FOMINA_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ELSHIMOLOWLANDS); + stock = { + 0x0264, 55, --Kazham Peppers + 0x1150, 55, --Kazham Pineapple + 0x1126, 36, --Mithran Tomato + 0x0272, 234, --Black Pepper + 0x0276, 88, --Ogre Pumpkin + 0x0278, 110, --Kukuru Bean + 0x0583, 1656 --Phalaenopsis + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,FOMINA_CLOSED_DIALOG); -else - player:showText(npc,FOMINA_OPEN_DIALOG); - - stock = {0x0264,55, --Kazham Peppers - 0x1150,55, --Kazham Pineapple - 0x1126,36, --Mithran Tomato - 0x0272,234, --Black Pepper - 0x0276,88, --Ogre Pumpkin - 0x0278,110, --Kukuru Bean - 0x0583,1656} --Phalaenopsis + end -showShop(player,WINDURST,stock); -end -end; +end; ----------------------------------- -- onEventUpdate @@ -59,6 +60,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Waters --- NPC: Hilkomu-Makimu +-- NPC: Hilkomu-Makimu -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,30 +21,30 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,HIKOMUMAKIMU_SHOP_DIALOG); + player:showText(npc,HIKOMUMAKIMU_SHOP_DIALOG); -stock = {0x12dd,23184,1, --Scroll of Poison II - 0x12e7,12880,1, --Scroll of Bio II - 0x12e1,4747,1, --Scroll of Poisonga + stock = { + 0x12DD, 23184,1, --Scroll of Poison II + 0x12E7, 12880,1, --Scroll of Bio II + 0x12E1, 4747,1, --Scroll of Poisonga - 0x12bd,1191,2, --Scroll of Stonega - 0x12c7,2143,2, --Scroll of Waterga - 0x12b8,4239,2, --Scroll of Aeroga - 0x12ae,7181,2, --Scroll of Firaga - 0x12b3,10948,2, --Scroll of Blizzaga - 0x12c2,15456,2, --Scroll of Thundaga - 0x12fb,8280,2, --Scroll of Shock Spikes + 0x12BD, 1191,2, --Scroll of Stonega + 0x12C7, 2143,2, --Scroll of Waterga + 0x12B8, 4239,2, --Scroll of Aeroga + 0x12AE, 7181,2, --Scroll of Firaga + 0x12B3, 10948,2, --Scroll of Blizzaga + 0x12C2, 15456,2, --Scroll of Thundaga + 0x12FB, 8280,2, --Scroll of Shock Spikes - 0x12a0,5814,3, --Scroll of Stone II - 0x12aa,8100,3, --Scroll of Water II - 0x129b,12236,3, --Scroll of Aero II - 0x1291,16928,3, --Scroll of Fire II - 0x1296,22356,3, --Scroll of Blizzard II - 0x12a5,28520,3} --Scroll of Thunder II - -showNationShop(player, WINDURST, stock); -end; + 0x12A0, 5814,3, --Scroll of Stone II + 0x12AA, 8100,3, --Scroll of Water II + 0x129B, 12236,3, --Scroll of Aero II + 0x1291, 16928,3, --Scroll of Fire II + 0x1296, 22356,3, --Scroll of Blizzard II + 0x12A5, 28520,3 --Scroll of Thunder II + } + showNationShop(player, WINDURST, stock); +end; ----------------------------------- -- onEventUpdate @@ -63,6 +63,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Jourille.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Jourille.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Jourille.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Jourille --- Only sells when Windurst controlls Ronfaure Region --- Working 100% +-- Area: Windurst Waters +-- NPC: Jourille +-- Only sells when Windurst controlls Ronfaure Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,23 +22,24 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(RONFAURE); + if (RegionOwner ~= WINDURST) then + player:showText(npc,JOURILLE_CLOSED_DIALOG); + else + player:showText(npc,JOURILLE_OPEN_DIALOG); -RegionOwner = GetRegionOwner(RONFAURE); + stock = { + 0x027F, 110, --Chestnut + 0x1125, 29, --San d'Orian Carrot + 0x0262, 55, --San d'Orian Flour + 0x114F, 69, --San d'Orian Grape + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,JOURILLE_CLOSED_DIALOG); -else - player:showText(npc,JOURILLE_OPEN_DIALOG); - - stock = {0x1125,29, --San d'Orian Carrot - 0x114f,69, --San d'Orian Grape - 0x027f,110, --Chestnut - 0x0262,55} --San d'Orian Flour - -showShop(player,WINDURST,stock); -end -end; + end +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -56,6 +57,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Maqu Molpih --- Only sells when Windurst controlls Aragoneu Region --- Working 100% +-- Area: Windurst Waters +-- NPC: Maqu Molpih +-- Only sells when Windurst controlls Aragoneu Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -24,22 +24,23 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ARAGONEU); + if (RegionOwner ~= WINDURST) then + player:showText(npc,MAQUMOLPIH_CLOSED_DIALOG); + else + player:showText(npc,MAQUMOLPIH_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ARAGONEU); + stock = { + 0x0277, 36, --Horo Flour + 0x0275, 44, --Millioncorn + 0x113F, 114, --Roasted Corn + 0x1199, 92, --Sunflower Seeds + 0x0349, 36 --Yagudo Feather + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,MAQUMOLPIH_CLOSED_DIALOG); -else - player:showText(npc,MAQUMOLPIH_OPEN_DIALOG); - - stock = {0x0277,36, --Horo Flour - 0x0275,44, --Millioncorn - 0x113f,114, --Roasted Corn - 0x1199,92, --Sunflower Seeds - 0x0349,36} --Yagudo Feather - -showShop(player,WINDURST,stock); -end + end + end; ----------------------------------- Index: scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Waters --- NPC: Ness Rugetomal +-- NPC: Ness Rugetomal -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -23,24 +23,25 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,NESSRUGETOMALL_SHOP_DIALOG); + player:showText(npc,NESSRUGETOMALL_SHOP_DIALOG); -stock = {0x112a,10,1, --Ginger Cookie - 0x1137,727,1, --Carp Sushi - 0x1149,323,1, --Tomato Juice - 0x116b,1656,1, --Nebimonite Bake + stock = { + 0x112A, 10,1, --Ginger Cookie + 0x1137, 727,1, --Carp Sushi + 0x1149, 323,1, --Tomato Juice + 0x116B, 1656,1, --Nebimonite Bake - 0x112d,14,2, --Cinna-cookie - 0x1146,184,2, --Orange Juice - 0x1168,2070,2, --Boiled Crab + 0x112D, 14,2, --Cinna-cookie + 0x1146, 184,2, --Orange Juice + 0x1168, 2070,2, --Boiled Crab - 0x119e,21,3, --Acorn Cookie - 0x1118,108,3, --Meat Jerky - 0x119d,10,3, --Distilled Water - 0x11ba,846} --Roast Pipira - -showNationShop(player, WINDURST, stock); + 0x119E, 21,3, --Acorn Cookie + 0x1118, 108,3, --Meat Jerky + 0x119D, 10,3, --Distilled Water + 0x11BA, 846,3 --Roast Pipira + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -60,6 +61,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Waters --- NPC: Orez-Ebrez +-- NPC: Orez-Ebrez -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,31 +21,32 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,OREZEBREZ_SHOP_DIALOG); + player:showText(npc,OREZEBREZ_SHOP_DIALOG); -stock = {0x30b2,20000,1, --Red Cap - 0x30aa,8972,1, --Soil Hachimaki - 0x30a7,7026,1, --Beetle Mask + stock = { + 0x30B2, 20000,1, --Red Cap + 0x30AA, 8972,1, --Soil Hachimaki + 0x30A7, 7026,1, --Beetle Mask - 0x30b8,144,2, --Circlet - 0x30b1,8024,2, --Cotton Headgear - 0x3098,396,2, --Leather Bandana - 0x30b9,1863,2, --Poet's Circlet - 0x30d3,14400,2, --Flax Headband - 0x30a9,3272,2, --Cotton Hachimaki - 0x30a6,3520,2, --Bone Mask - 0x30ba,10924,2, --Wool Hat + 0x30B8, 144,2, --Circlet + 0x30B1, 8024,2, --Cotton Headgear + 0x3098, 396,2, --Leather Bandana + 0x30B9, 1863,2, --Poet's Circlet + 0x30D3, 14400,2, --Flax Headband + 0x30A9, 3272,2, --Cotton Hachimaki + 0x30A6, 3520,2, --Bone Mask + 0x30BA, 10924,2, --Wool Hat - 0x30b0,1742,3, --Headgear - 0x30a8,552,3, --Hachimaki - 0x30d2,1800,3, --Cotton Headband - 0x30a0,151,3, --Bronze Cap - 0x30a1,1471,3} --Brass Cap - -showNationShop(player, WINDURST, stock); -end; + 0x30B0, 1742,3, --Headgear + 0x30A8, 552,3, --Hachimaki + 0x30D2, 1800,3, --Cotton Headband + 0x30A0, 151,3, --Bronze Cap + 0x30A1, 1471,3 --Brass Cap + } + showNationShop(player, WINDURST, stock); +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -63,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Otete.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Otete.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Otete.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst_Waters --- NPC: Otete --- Only sells when Windurst controlls Li'Telor Region --- Working 100% +-- Area: Windurst_Waters +-- NPC: Otete +-- Only sells when Windurst controlls Li'Telor Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,21 +22,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(LITELOR); + if (RegionOwner ~= WINDURST) then + player:showText(npc,OTETE_CLOSED_DIALOG); + else + player:showText(npc,OTETE_OPEN_DIALOG); -RegionOwner = GetRegionOwner(LITELOR); + stock = { + 0x026F, 119, --Bay Leaves + 0x103A, 6440 --Holy Water + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,OTETE_CLOSED_DIALOG); -else - player:showText(npc,OTETE_OPEN_DIALOG); - - stock = {0x026f,119, --Bay Leaves - 0x103a,6440} --Holy Water - -showShop(player,WINDURST,stock); -end -end; + end +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -54,6 +55,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Prestapiq.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Prestapiq.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Prestapiq.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Prestapiq --- Only sells when Windurst controls Movalpolos --- Working 100% +-- Area: Windurst Waters +-- NPC: Prestapiq +-- Only sells when Windurst controls Movalpolos +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,23 +22,24 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(MOVALPOLOS); + if (RegionOwner ~= WINDURST) then + player:showText(npc,PRESTAPIQ_CLOSED_DIALOG); + else + player:showText(npc,PRESTAPIQ_OPEN_DIALOG); -RegionOwner = GetRegionOwner(MOVALPOLOS); + stock = { + 0x0280, 11, --Copper Ore + 0x1162, 694, --Coral Fungus + 0x1117, 4032, --Danceshroom + 0x0672, 6500, --Kopparnickel Ore + 0x142D, 736 --Movalpolos Water + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,PRESTAPIQ_CLOSED_DIALOG); -else - player:showText(npc,PRESTAPIQ_OPEN_DIALOG); - - stock = {0x0280,11, --Copper Ore - 0x1162,694, --Coral Fungus - 0x1117,4032, --Danceshroom - 0x0672,6500, --Kopparnickel Ore - 0x142d,736} --Movalpolos Water + end -showShop(player,WINDURST,stock); -end -end; +end; ----------------------------------- -- onEventUpdate @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Waters --- NPC: Shohrun-Tuhrun +-- NPC: Shohrun-Tuhrun -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,31 +21,32 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,SHOHRUNTUHRUN_SHOP_DIALOG); + player:showText(npc,SHOHRUNTUHRUN_SHOP_DIALOG); -stock = {0x1239,18000,1, --Haste + stock = { + 0x1239, 18000,1, --Haste - 0x120c,5178,2, --Scroll of Raise - 0x1218,10080,2, --Scroll of Dia II - 0x121d,8100,2, --Scroll of Banish II - 0x122c,6366,2, --Scroll of Protect II - 0x1231,15840,2, --Scroll of Shell II - 0x1264,4644,2, --Scroll of Enfire - 0x1265,3688,2, --Scroll of Enblizzard - 0x1266,2250,2, --Scroll of Enaero - 0x1267,1827,2, --Scroll of Enstone - 0x1268,1363,2, --Scroll of Enthunder - 0x1269,6366,2, --Scroll of Enwater + 0x120C, 5178,2, --Scroll of Raise + 0x1218, 10080,2, --Scroll of Dia II + 0x121D, 8100,2, --Scroll of Banish II + 0x122C, 6366,2, --Scroll of Protect II + 0x1231, 15840,2, --Scroll of Shell II + 0x1264, 4644,2, --Scroll of Enfire + 0x1265, 3688,2, --Scroll of Enblizzard + 0x1266, 2250,2, --Scroll of Enaero + 0x1267, 1827,2, --Scroll of Enstone + 0x1268, 1363,2, --Scroll of Enthunder + 0x1269, 6366,2, --Scroll of Enwater - 0x1203,3261,3, --Scroll of Cure III - 0x122e,78200,3, --Scroll of Protect IV - 0x1280,74520,3, --Scroll of Protectra IV - 0x1304,64400,3} --Scroll of Dispel - -showNationShop(player, WINDURST, stock); -end; + 0x1203, 3261,3, --Scroll of Cure III + 0x122E, 78200,3, --Scroll of Protect IV + 0x1280, 74520,3, --Scroll of Protectra IV + 0x1304, 64400,3 --Scroll of Dispel + } + showNationShop(player, WINDURST, stock); +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -63,6 +64,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Taajiji.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Taajiji.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Taajiji.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Taajiji --- Standard Merchant NPC --- Working 100% +-- Area: Windurst Waters +-- NPC: Taajiji +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,30 +21,31 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,TAAJIJI_SHOP_DIALOG); + player:showText(npc,TAAJIJI_SHOP_DIALOG); -stock = {0x113b,756,1, --Dhalmel Pie - 0x1152,5050,1, --Mushroom Risotto - 0x11ca,12762,1, --Shallops Tropicale - 0x1129,984,1, --Orange Kuchen + stock = { + 0x113B, 756,1, --Dhalmel Pie + 0x1152, 5050,1, --Mushroom Risotto + 0x11CA, 12762,1, --Shallops Tropicale + 0x1129, 984,1, --Orange Kuchen - 0x119a,5216,2, --Mutton Tortilla - 0x1158,6064,2, --Whitefish Stew - 0x11dc,1669,2, --Beaugreen Sautee - 0x1146,184,2, --Orange Juice - 0x1156,1324,2, --Dhalmel Steak + 0x119A, 5216,2, --Mutton Tortilla + 0x1158, 6064,2, --Whitefish Stew + 0x11DC, 1669,2, --Beaugreen Sautee + 0x1146, 184,2, --Orange Juice + 0x1156, 1324,2, --Dhalmel Steak - 0x1138,128,3, --Tortilla - 0x118c,552,3, --Puls - 0x1151,2387,3, --Dhalmel Stew - 0x119d,10,3, --Distilled Water - 0x118d,184,3, --Windurstian Tea - 0x11cb,1711,3} --Windurst Salad - -showNationShop(player, WINDURST, stock); -end; + 0x1138, 128,3, --Tortilla + 0x118C, 552,3, --Puls + 0x1151, 2387,3, --Dhalmel Stew + 0x119D, 10,3, --Distilled Water + 0x118D, 184,3, --Windurstian Tea + 0x11CB, 1711,3 --Windurst Salad + } + showNationShop(player, WINDURST, stock); +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -62,6 +63,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua =================================================================== --- scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua (revision 3948) +++ scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Waters --- NPC: Upih Khachla --- Standard Merchant NPC --- Working 100% +-- Area: Windurst Waters +-- NPC: Upih Khachla +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -24,40 +24,40 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,UPIHKHACHLA_SHOP_DIALOG); + player:showText(npc,UPIHKHACHLA_SHOP_DIALOG); -stock = {0x43a1,1107,1, --Grenade - 0x1010,837,1, --Potion - 0x3b7,108,1, --Wijnruit + stock = { + 0x43A1, 1107,1, --Grenade + 0x1010, 837,1, --Potion + 0x03B7, 108,1, --Wijnruit - 0x27c,119,2, --Chamomile - 0x1037,736,2, --Echo Drops - 0x1020,4445,2, --Ether + 0x027C, 119,2, --Chamomile + 0x1037, 736,2, --Echo Drops + 0x1020, 4445,2, --Ether - 0x1034,290,3, --Antidote - 0x764,3960,3, --Desalinator - 0x26e,44,3, --Dried Marjoram - 0x1036,2387,3, --Eye Drops - 0x25d,180,3, --Pickaxe - 0x765,3960,3, --Salinator - 0x3fc,276,3, --Sickle - 0x4d9,354,3} --Twinkle Powder - -rank = getNationRank(WINDURST); + 0x1034, 290,3, --Antidote + 0x0764, 3960,3, --Desalinator + 0x026E, 44,3, --Dried Marjoram + 0x1036, 2387,3, --Eye Drops + 0x025D, 180,3, --Pickaxe + 0x0765, 3960,3, --Salinator + 0x03FC, 276,3, --Sickle + 0x04D9, 354,3 --Twinkle Powder + } - if (rank ~= 1) then - table.insert(stock,0x03fe); --Thief's Tools - table.insert(stock,3643); - table.insert(stock,3); - end - if (rank == 3) then - table.insert(stock,0x03ff); --Living Key - table.insert(stock,5520); - table.insert(stock,3); - end - -showNationShop(player, WINDURST, stock); + rank = getNationRank(WINDURST); + if (rank ~= 1) then + table.insert(stock,0x03fe); --Thief's Tools + table.insert(stock,3643); + table.insert(stock,3); + end + if (rank == 3) then + table.insert(stock,0x03ff); --Living Key + table.insert(stock,5520); + table.insert(stock,3); + end + showNationShop(player, WINDURST, stock); + end; ----------------------------------- Index: scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst_Woods --- NPC: Bin Stejihna --- Only sells when Windurst controlls Zulkheim Region --- Working 100% +-- Area: Windurst_Woods +-- NPC: Bin Stejihna +-- Only sells when Windurst controlls Zulkheim Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,24 +22,32 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(ZULKHEIM); + if (RegionOwner ~= WINDURST) then + player:showText(npc,BIN_STEJIHNA_CLOSED_DIALOG); + else + player:showText(npc,BIN_STEJIHNA_OPEN_DIALOG); -RegionOwner = GetRegionOwner(ZULKHEIM); + rank = getNationRank(BASTOK); + if (rank ~= 3) then + table.insert(stock,0x0730); --Semolina + table.insert(stock,1840); + end -if (RegionOwner ~= WINDURST) then - player:showText(npc,BIN_STEJIHNA_CLOSED_DIALOG); -else - player:showText(npc,BIN_STEJIHNA_OPEN_DIALOG); - - stock = {0x1114,44, --Giant Sheep Meat - 0x026e,44, --Dried Marjoram - 0x0262,55, --San d'Orian Flour - 0x0263,36, --Rye Flour - 0x0730,1840, --Semolina - 0x110e,22, --La Theine Cabbage - 0x111a,55} --Selbina Milk - -showShop(player,WINDURST,stock); -end + stock = { + 0x0730, 1840, --Semolina + 0x1114, 44, --Giant Sheep Meat + 0x026E, 44, --Dried Marjoram + 0x0262, 55, --San d'Orian Flour + 0x0263, 36, --Rye Flour + 0x110E, 22, --La Theine Cabbage + 0x111A, 55 --Selbina Milk + } + + showShop(player,WINDURST,stock); + + end + end; ----------------------------------- @@ -59,6 +67,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Manyny.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Manyny.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Manyny.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Woods --- NPC: Manyny +-- NPC: Manyny -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,18 +21,18 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,MANYNY_SHOP_DIALOG); + player:showText(npc,MANYNY_SHOP_DIALOG); -stock = {0x13a8,3112, --Sinewy Etude - 0x13a9,2784, --Dextrous Etude - 0x13aa,2184, --Vivacious Etude - 0x13ab,1892, --Quick Etude - 0x13ac,1550, --Learned Etude - 0x13ad,1252, --Spirited Etude - 0x13ae,990} --Enchanting Etude - -showShop(player, STATIC, stock); + stock = { + 0x13A8, 3112, --Sinewy Etude + 0x13A9, 2784, --Dextrous Etude + 0x13AA, 2184, --Vivacious Etude + 0x13AB, 1892, --Quick Etude + 0x13AC, 1550, --Learned Etude + 0x13AD, 1252, --Spirited Etude + 0x13AE, 990 --Enchanting Etude + } + showShop(player, STATIC, stock); end; ----------------------------------- @@ -52,6 +52,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst_Woods --- NPC: Millerovieunet --- Only sells when Windurst controlls Qufim Region --- Working 100% +-- Area: Windurst_Woods +-- NPC: Millerovieunet +-- Only sells when Windurst controlls Qufim Region +-- Confirmed shop stock, August 2013 ----------------------------------- package.loaded["scripts/zones/Windurst_Woods/TextIDs"] = nil; ----------------------------------- @@ -25,17 +25,18 @@ ----------------------------------- function onTrigger(player,npc) + if(GetRegionOwner(QUFIMISLAND) ~= WINDURST) then + player:showText(npc,MILLEROVIEUNET_CLOSED_DIALOG); + else + player:showText(npc,MILLEROVIEUNET_OPEN_DIALOG); - if(GetRegionOwner(QUFIMISLAND) ~= WINDURST) then - player:showText(npc,MILLEROVIEUNET_CLOSED_DIALOG); - else - player:showText(npc,MILLEROVIEUNET_OPEN_DIALOG); - - stock = {0x03ba,4121} --Magic Pot Shard - - showShop(player,WINDURST,stock); - end + stock = { + 0x03BA, 4032 --Magic Pot Shard + } + showShop(player,WINDURST,stock); + end + end; ----------------------------------- @@ -55,4 +56,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - Index: scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Woods --- NPC: Mono Nchaa +-- NPC: Mono Nchaa -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,18 +21,19 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,MONONCHAA_SHOP_DIALOG); + player:showText(npc,MONONCHAA_SHOP_DIALOG); -stock = {0x43a6,3,2, --Wooden Arrow - 0x439c,55,2, --Hawkeye - 0x4340,165,2, --Light Crossbow + stock = { + 0x43A6, 3,2, --Wooden Arrow + 0x439C, 55,2, --Hawkeye + 0x4340, 165,2, --Light Crossbow - 0x43a7,4,3, --Bone Arrow - 0x43b8,5,3, --Crossbow Bolt - 0x1391,2649,3} --Scroll of Hunter's Prelude - -showNationShop(player, WINDURST, stock); + 0x43A7, 4,3, --Bone Arrow + 0x43B8, 5,3, --Crossbow Bolt + 0x1391, 2649,3 --Scroll of Hunter's Prelude + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -52,6 +53,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst_Woods --- NPC: Nhobi Zalkia --- Only sells when Windurst controlls Kuzotz Region --- Working 100% +-- Area: Windurst_Woods +-- NPC: Nhobi Zalkia +-- Only sells when Windurst controlls Kuzotz Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -24,20 +24,21 @@ ----------------------------------- function onTrigger(player,npc) - -RegionOwner = GetRegionOwner(KUZOTZ); - -if (RegionOwner ~= WINDURST) then + RegionOwner = GetRegionOwner(KUZOTZ); + if (RegionOwner ~= WINDURST) then player:showText(npc,NHOBI_ZALKIA_CLOSED_DIALOG); -else + else player:showText(npc,NHOBI_ZALKIA_OPEN_DIALOG); - stock = {0x0394,855, --Cactuar Needle - 0x113c,299, --Thundermelon - 0x118b,184} --Watermelon + stock = { + 0x0394, 855, --Cactuar Needle + 0x113C, 299, --Thundermelon + 0x118B, 184 --Watermelon + } + showShop(player,WINDURST,stock); -showShop(player,WINDURST,stock); -end + end + end; ----------------------------------- @@ -57,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Woods --- NPC: Nya Labiccio --- Only sells when Windurst controlls Gustaberg Region --- Working 100% +-- Area: Windurst Woods +-- NPC: Nya Labiccio +-- Only sells when Windurst controlls Gustaberg Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -22,21 +22,22 @@ ----------------------------------- function onTrigger(player,npc) + RegionOwner = GetRegionOwner(GUSTABERG); + if (RegionOwner ~= WINDURST) then + player:showText(npc,NYALABICCIO_CLOSED_DIALOG); + else + player:showText(npc,NYALABICCIO_OPEN_DIALOG); -RegionOwner = GetRegionOwner(GUSTABERG); + stock = { + 0x0454, 703, --Sulfur + 0x026B, 43, --Popoto + 0x0263, 36, --Rye Flour + 0x1124, 40 --Eggplant + } + showShop(player,WINDURST,stock); -if (RegionOwner ~= WINDURST) then - player:showText(npc,NYALABICCIO_CLOSED_DIALOG); -else - player:showText(npc,NYALABICCIO_OPEN_DIALOG); - - stock = {0x0454,703, --Sulfur - 0x026b,43, --Popoto - 0x0263,36, --Rye Flour - 0x1124,40} --Eggplant + end -showShop(player,WINDURST,stock); -end end; ----------------------------------- @@ -56,6 +57,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Quesse.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Quesse.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Quesse.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- -- Area: Windurst Woods --- NPC: Quesse +-- NPC: Quesse -- Standard Merchant NPC --- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,24 +21,25 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,QUESSE_SHOP_DIALOG); + player:showText(npc,QUESSE_SHOP_DIALOG); -stock = {0x034D,1150,1, --Black Chocobo Feather + stock = { + 0x034D, 1150,1, --Black Chocobo Feather - 0x439B,9,2, --Dart + 0x439B, 9,2, --Dart - 0x11C1,62,3, --Gysahl Greens - 0x0348,7,3, --Chocobo Feather - 0x4278,11,3, --Pet Food Alpha Biscuit - 0x4279,82,3, --Pet Food Beta Biscuit - 0x45C4,82,3, --Carrot Broth - 0x45C6,695,3, --Bug Broth - 0x45C8,126,3, --Herbal Broth - 0x45CA,695,3, --Carrion Broth - 0x13D1,50784,3} --Scroll of Chocobo Mazurka - -showNationShop(player, WINDURST, stock); + 0x11C1, 62,3, --Gysahl Greens + 0x0348, 7,3, --Chocobo Feather + 0x4278, 11,3, --Pet Food Alpha Biscuit + 0x4279, 82,3, --Pet Food Beta Biscuit + 0x45C4, 82,3, --Carrot Broth + 0x45C6, 695,3, --Bug Broth + 0x45C8, 126,3, --Herbal Broth + 0x45CA, 695,3, --Carrion Broth + 0x13D1, 50784,3 --Scroll of Chocobo Mazurka + } + showNationShop(player, WINDURST, stock); + end; ----------------------------------- @@ -58,6 +59,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Woods --- NPC: Taraihi-Perunhi --- Only sells when Windurst controlls Derfland Region --- Working 100% +-- Area: Windurst Woods +-- NPC: Taraihi-Perunhi +-- Only sells when Windurst controlls Derfland Region +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/harvest_festivals") @@ -24,23 +24,24 @@ ----------------------------------- function onTrigger(player,npc) - -RegionOwner = GetRegionOwner(DERFLAND); - -if (RegionOwner ~= WINDURST) then + RegionOwner = GetRegionOwner(DERFLAND); + if (RegionOwner ~= WINDURST) then player:showText(npc,TARAIHIPERUNHI_CLOSED_DIALOG); -else + else player:showText(npc,TARAIHIPERUNHI_OPEN_DIALOG); - - stock = {0x1100,128, --Derfland Pear - 0x0269,142, --Ginger - 0x11c1,62, --Gysahl Greens - 0x0584,1656, --Olive Flower - 0x0279,14, --Olive Oil - 0x03b7,110} --Wijnruit -showShop(player,WINDURST,stock); -end + stock = { + 0x1100, 128, --Derfland Pear + 0x0269, 142, --Ginger + 0x11C1, 62, --Gysahl Greens + 0x0584, 1656, --Olive Flower + 0x0279, 14, --Olive Oil + 0x03B7, 110 --Wijnruit + } + showShop(player,WINDURST,stock); + + end + end; ----------------------------------- @@ -60,5 +61,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - Index: scripts/zones/Windurst_Woods/npcs/Valeriano.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Valeriano.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Valeriano.lua (working copy) @@ -1,8 +1,9 @@ ----------------------------------- -- Area: Windurst_Woods --- NPC: Valeriano +-- NPC: Valeriano -- Standard Merchant NPC -- Working 100% +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,22 +22,23 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,VALERIANO_SHOP_DIALOG); + player:showText(npc,VALERIANO_SHOP_DIALOG); -stock = {0x112a,10, --Ginger Cookie - 0x43c1,43, --Flute - 0x43c3,990, --Piccolo - 0x1399,585, --Scroll of Scop's Operetta - 0x139a,16920, --Scroll of Puppet's Operetta - 0x1395,2916, --Scroll of Fowl Aubade - 0x13a3,2059, --Scroll of Advancing March - 0x13d0,90000, --Scroll of Goddess's Hymnus - 0x13b9,27140, --Scroll of Earth Carol II - 0x13bb,28520, --Scroll of Water Carol II - 0x1384,123880} --Scroll of Mage's Ballad III - -showShop(player, WINDURST, stock); + stock = { + 0x112A, 10, --Ginger Cookie + 0x43C1, 43, --Flute + 0x43C3, 990, --Piccolo + 0x1399, 585, --Scroll of Scop's Operetta + 0x139A, 16920, --Scroll of Puppet's Operetta + 0x1395, 2916, --Scroll of Fowl Aubade + 0x13A3, 2059, --Scroll of Advancing March + 0x13D0, 90000, --Scroll of Goddess's Hymnus + 0x13B9, 27140, --Scroll of Earth Carol II + 0x13BB, 28520, --Scroll of Water Carol II + 0x1384,123880 --Scroll of Mage's Ballad III + } + showShop(player, WINDURST, stock); + end; ----------------------------------- @@ -56,6 +58,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - - Index: scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua =================================================================== --- scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua (revision 3948) +++ scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua (working copy) @@ -1,8 +1,8 @@ ----------------------------------- --- Area: Windurst Woods --- NPC: Wije Tiren --- Standard Merchant NPC --- Working 100% +-- Area: Windurst Woods +-- NPC: Wije Tiren +-- Standard Merchant NPC +-- Confirmed shop stock, August 2013 ----------------------------------- require("scripts/globals/shop"); @@ -21,21 +21,22 @@ ----------------------------------- function onTrigger(player,npc) - -player:showText(npc,WIJETIREN_SHOP_DIALOG); + player:showText(npc,WIJETIREN_SHOP_DIALOG); -stock = {0x1034,290, --Antidote - 0x119d,10, --Distilled Water - 0x1037,728, --Echo Drops - 0x1020,4445, --Ether - 0x1036,2387, --Eye Drops - 0x1010,837, --Potion - 0x1396,98, --Scroll of Herb Pastoral - 0x0b30,9200} --Federation Waystone - -showShop(player, WINDURST, stock); -end; + stock = { + 0x1034, 290, --Antidote + 0x119d, 10, --Distilled Water + 0x1037, 728, --Echo Drops + 0x1020, 4445, --Ether + 0x1036, 2387, --Eye Drops + 0x1010, 837, --Potion + 0x1396, 98, --Scroll of Herb Pastoral + 0x0b30, 9200 --Federation Waystone + } + showShop(player, WINDURST, stock); +end; + ----------------------------------- -- onEventUpdate ----------------------------------- @@ -53,6 +54,3 @@ --printf("CSID: %u",csid); --printf("RESULT: %u",option); end; - - -