From ff879b88a58d60493f04f0e8c53db06a21976fe7 Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Tue, 20 May 2025 13:29:51 +0200 Subject: [PATCH 1/2] Shop Audit: Mhaura --- scripts/enum/item.lua | 6 ++++ scripts/zones/Mhaura/npcs/Graine.lua | 34 ++++++++++----------- scripts/zones/Mhaura/npcs/Mololo.lua | 4 +-- scripts/zones/Mhaura/npcs/Pikini-Mikini.lua | 26 ++++++++-------- scripts/zones/Mhaura/npcs/Runito-Monito.lua | 28 ++++++++--------- scripts/zones/Mhaura/npcs/Tya_Padolih.lua | 24 +++++++-------- 6 files changed, 59 insertions(+), 63 deletions(-) diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index 84d8e15da45..0ca05ef1ce3 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -1670,6 +1670,7 @@ xi.item = REPUBLIC_WAYSTONE = 2863, DUCHY_WAYSTONE = 2865, SELBINA_WAYSTONE = 2866, + MHAURA_WAYSTONE = 2867, RABAO_WAYSTONE = 2868, EYE_OF_VERTHANDI = 2881, MILDEWY_INGOT = 2886, @@ -2584,6 +2585,7 @@ xi.item = SCROLL_OF_RECALL_JUGNER = 4687, SCROLL_OF_RECALL_PASHH = 4688, SCROLL_OF_RECALL_MERIPH = 4689, + SCROLL_OF_BARAMNESIA = 4690, SCROLL_OF_BARAMNESRA = 4691, SCROLL_OF_BARSLEEPRA = 4694, SCROLL_OF_BARPOISONRA = 4695, @@ -2608,6 +2610,7 @@ xi.item = SCROLL_OF_REPRISAL = 4715, SCROLL_OF_REGEN = 4716, SCROLL_OF_REFRESH = 4717, + SCROLL_OF_REGEN_II = 4718, SCROLL_OF_REGEN_III = 4719, SCROLL_OF_FLASH = 4720, SCROLL_OF_REPOSE = 4721, @@ -2732,6 +2735,8 @@ xi.item = THUNDER_SPIRIT_PACT = 4900, LIGHT_SPIRIT_PACT = 4902, DARK_SPIRIT_PACT = 4903, + SCROLL_OF_DISTRACT = 4912, + SCROLL_OF_FRAZZLE = 4914, SCROLL_OF_KATON_ICHI = 4928, SCROLL_OF_HYOTON_ICHI = 4931, SCROLL_OF_HUTON_ICHI = 4934, @@ -2890,6 +2895,7 @@ xi.item = CHUNK_OF_SHUMEYO_SALT = 5267, CCB_POLYMER = 5268, OLD_BULLET_BOX = 5284, + DISH_OF_SALSA = 5299, TOOLBAG_UCHITAKE = 5308, TOOLBAG_TSURARA = 5309, TOOLBAG_KAWAHORI_OGI = 5310, diff --git a/scripts/zones/Mhaura/npcs/Graine.lua b/scripts/zones/Mhaura/npcs/Graine.lua index d1015e9873c..92ed6ece502 100644 --- a/scripts/zones/Mhaura/npcs/Graine.lua +++ b/scripts/zones/Mhaura/npcs/Graine.lua @@ -2,32 +2,30 @@ -- Area: Mhaura -- NPC: Graine ----------------------------------- -local ID = zones[xi.zone.MHAURA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 12440, 457, }, -- Leather Bandana - { 12448, 174, }, -- Bronze Cap - { 12449, 1700, }, -- Brass Cap - { 12568, 698, }, -- Leather Vest - { 12576, 235, }, -- Bronze Harness - { 12577, 2286, }, -- Brass Harness - { 12696, 374, }, -- Leather Gloves - { 12704, 128, }, -- Bronze Mittens - { 12705, 1255, }, -- Brass Mittens - { 12824, 557, }, -- Leather Trousesrs - { 12832, 191, }, -- Bronze Subligar - { 12833, 1840, }, -- Brass Subligar - { 12952, 349, }, -- Leather Highboots - { 12960, 117, }, -- Bronze Leggings - { 12961, 1140, }, -- Brass Leggings + { xi.item.LEATHER_BANDANA, 432 }, + { xi.item.BRONZE_CAP, 174 }, + { xi.item.BRASS_CAP, 1700 }, + { xi.item.LEATHER_VEST, 669 }, + { xi.item.BRONZE_HARNESS, 266 }, + { xi.item.BRASS_HARNESS, 2584 }, + { xi.item.LEATHER_GLOVES, 374 }, + { xi.item.BRONZE_MITTENS, 145 }, + { xi.item.BRASS_MITTENS, 1419 }, + { xi.item.LEATHER_TROUSERS, 557 }, + { xi.item.BRONZE_SUBLIGAR, 216 }, + { xi.item.BRASS_SUBLIGAR, 2080 }, + { xi.item.LEATHER_HIGHBOOTS, 349 }, + { xi.item.BRONZE_LEGGINGS, 133 }, + { xi.item.BRASS_LEGGINGS, 1289 }, } - player:showText(npc, ID.text.GRAINE_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.MHAURA].text.GRAINE_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Mhaura/npcs/Mololo.lua b/scripts/zones/Mhaura/npcs/Mololo.lua index bcd648e53cb..7ca5fa62a01 100644 --- a/scripts/zones/Mhaura/npcs/Mololo.lua +++ b/scripts/zones/Mhaura/npcs/Mololo.lua @@ -4,15 +4,13 @@ -- Guild Merchant NPC: Blacksmithing Guild -- !pos -64.278 -16.624 34.120 249 ----------------------------------- -local ID = zones[xi.zone.MHAURA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.SMITHING xi.shop.generalGuild(player, xi.shop.generalGuildStock[guildSkillId], guildSkillId) - player:showText(npc, ID.text.SMITHING_GUILD) + player:showText(npc, zones[xi.zone.MHAURA].text.SMITHING_GUILD) end return entity diff --git a/scripts/zones/Mhaura/npcs/Pikini-Mikini.lua b/scripts/zones/Mhaura/npcs/Pikini-Mikini.lua index dfbcc35f919..46313f01cd1 100644 --- a/scripts/zones/Mhaura/npcs/Pikini-Mikini.lua +++ b/scripts/zones/Mhaura/npcs/Pikini-Mikini.lua @@ -3,28 +3,26 @@ -- NPC: Pikini-Mikini -- !pos -48 -4 30 249 ----------------------------------- -local ID = zones[xi.zone.MHAURA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4150, 2335, }, -- Eye Drops - { 4148, 284, }, -- Antidote - { 4151, 720, }, -- Echo Drops - { 4112, 819, }, -- Potion - { 4509, 10, }, -- Distilled Water - { 917, 1821, }, -- Parchment - { 17395, 9, }, -- Lugworm - { 1021, 450, }, -- Hatchet - { 4376, 108, }, -- Meat Jerky - { 5299, 133, }, -- Salsa - { 2867, 9000, }, -- Mhaura Waystone + { xi.item.FLASK_OF_EYE_DROPS, 2698 }, + { xi.item.ANTIDOTE, 328 }, + { xi.item.FLASK_OF_ECHO_DROPS, 832 }, + { xi.item.POTION, 946 }, + { xi.item.FLASK_OF_DISTILLED_WATER, 12 }, + { xi.item.SHEET_OF_PARCHMENT, 2059 }, + { xi.item.LUGWORM, 12 }, + { xi.item.HATCHET, 520 }, + { xi.item.STRIP_OF_MEAT_JERKY, 124 }, + { xi.item.DISH_OF_SALSA, 153 }, + { xi.item.MHAURA_WAYSTONE, 10400 }, } - player:showText(npc, ID.text.PIKINIMIKINI_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.MHAURA].text.PIKINIMIKINI_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Mhaura/npcs/Runito-Monito.lua b/scripts/zones/Mhaura/npcs/Runito-Monito.lua index a0ddfa0ca36..ce2a5426f62 100644 --- a/scripts/zones/Mhaura/npcs/Runito-Monito.lua +++ b/scripts/zones/Mhaura/npcs/Runito-Monito.lua @@ -2,29 +2,27 @@ -- Area: Mhaura -- NPC: Runito-Monito ----------------------------------- -local ID = zones[xi.zone.MHAURA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 16405, 106, }, -- Cat Bagnakhs - { 16407, 1554, }, -- Brass Bagnakhs - { 16449, 855, }, -- Brass Dagger - { 17059, 92, }, -- Bronze Rod - { 17081, 634, }, -- Brass Rod - { 16531, 3601, }, -- Brass Xiphos - { 16583, 2502, }, -- Claymore - { 16704, 618, }, -- Butterfly Axe - { 17307, 9, }, -- Dart - { 17318, 3, }, -- Wooden Arrow - { 17319, 4, }, -- Bone Arrow - { 17336, 5, }, -- Crossbow Bolts + { xi.item.CAT_BAGHNAKHS, 120 }, + { xi.item.BRASS_BAGHNAKHS, 1757 }, + { xi.item.BRASS_DAGGER, 967 }, + { xi.item.BRONZE_ROD, 104 }, + { xi.item.BRASS_ROD, 717 }, + { xi.item.BRASS_XIPHOS, 4071 }, + { xi.item.CLAYMORE, 2828 }, + { xi.item.BUTTERFLY_AXE, 698 }, + { xi.item.DART, 10 }, + { xi.item.WOODEN_ARROW, 4 }, + { xi.item.BONE_ARROW, 5 }, + { xi.item.CROSSBOW_BOLT, 6 }, } - player:showText(npc, ID.text.RUNITOMONITO_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.MHAURA].text.RUNITOMONITO_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Mhaura/npcs/Tya_Padolih.lua b/scripts/zones/Mhaura/npcs/Tya_Padolih.lua index 936eabdce0f..d269d3a2f8c 100644 --- a/scripts/zones/Mhaura/npcs/Tya_Padolih.lua +++ b/scripts/zones/Mhaura/npcs/Tya_Padolih.lua @@ -3,27 +3,25 @@ -- NPC: Tya Padolih -- !pos -48 -4 30 249 ----------------------------------- -local ID = zones[xi.zone.MHAURA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4716, 4147, }, -- Scroll of Regen - { 4718, 7516, }, -- Scroll of Regen II - { 4881, 10752, }, -- Scroll of Sleepga - { 4690, 29030, }, -- Scroll of Baramnesia - { 4691, 29030, }, -- Scroll of Baramnesra - { 4744, 5523, }, -- Scroll of Invisible - { 4745, 2400, }, -- Scroll of Sneak - { 4746, 1243, }, -- Scroll of Deodorize - { 4912, 18032, }, -- Scroll of Distract - { 4914, 25038, }, -- Scroll of Frazzle + { xi.item.SCROLL_OF_REGEN, 4492 }, + { xi.item.SCROLL_OF_REGEN_II, 8143 }, + { xi.item.SCROLL_OF_SLEEPGA, 11648 }, + { xi.item.SCROLL_OF_BARAMNESIA, 31449 }, + { xi.item.SCROLL_OF_BARAMNESRA, 31449 }, + { xi.item.SCROLL_OF_INVISIBLE, 5984 }, + { xi.item.SCROLL_OF_SNEAK, 2600 }, + { xi.item.SCROLL_OF_DEODORIZE, 1346 }, + { xi.item.SCROLL_OF_DISTRACT, 20384 }, + { xi.item.SCROLL_OF_FRAZZLE, 28304 }, } - player:showText(npc, ID.text.TYAPADOLIH_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.MHAURA].text.TYAPADOLIH_SHOP_DIALOG) xi.shop.general(player, stock) end From 1e981c39959f41b54919c24881b589a84e7a175b Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Tue, 20 May 2025 21:04:08 +0200 Subject: [PATCH 2/2] Shop Audit: Misc regional vendors Gustaberg, Kuzotz, Movalpolos, Zulkheim --- scripts/enum/item.lua | 3 ++ scripts/zones/Port_Bastok/npcs/Bagnobrok.lua | 16 +++++----- scripts/zones/Port_Bastok/npcs/Evelyn.lua | 6 ++-- scripts/zones/Port_Bastok/npcs/Rosswald.lua | 20 ++++++------ scripts/zones/Port_Bastok/npcs/Vattian.lua | 12 +++---- scripts/zones/Port_San_dOria/npcs/Patolle.lua | 16 +++++----- .../zones/Port_San_dOria/npcs/Vendavoq.lua | 18 +++++------ .../Southern_San_dOria/npcs/Apairemant.lua | 18 +++++------ .../Southern_San_dOria/npcs/Phamelise.lua | 24 +++++++------- .../Southern_San_dOria/npcs/Valeriano.lua | 4 +-- .../zones/Windurst_Waters/npcs/Prestapiq.lua | 24 ++++++-------- .../Windurst_Woods/npcs/Bin_Stejihna.lua | 31 +++++++------------ .../Windurst_Woods/npcs/Nhobi_Zalkia.lua | 21 +++++-------- .../Windurst_Woods/npcs/Nya_Labiccio.lua | 22 ++++++------- 14 files changed, 103 insertions(+), 132 deletions(-) diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index 0ca05ef1ce3..0a2315c1038 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -447,6 +447,7 @@ xi.item = LUMP_OF_BEESWAX = 913, VIAL_OF_MERCURY = 914, JAR_OF_TOAD_OIL = 915, + CACTUAR_NEEDLE = 916, SHEET_OF_PARCHMENT = 917, SPRIG_OF_MISTLETOE = 918, CLUMP_OF_BOYAHDA_MOSS = 919, @@ -2778,6 +2779,7 @@ xi.item = SCROLL_OF_VALOR_MINUET_IV = 5005, SCROLL_OF_VALOR_MINUET_V = 5006, SCROLL_OF_SWORD_MADRIGAL = 5007, + SCROLL_OF_HUNTERS_PRELUDE = 5009, SCROLL_OF_SHEEPFOE_MAMBO = 5011, SCROLL_OF_FOWL_AUBADE = 5013, SCROLL_OF_SCOPS_OPERETTA = 5017, @@ -2870,6 +2872,7 @@ xi.item = SLICE_OF_BUFFALO_MEAT = 5152, TAVNAZIAN_LIVER = 5154, JAR_OF_GROUND_WASABI = 5164, + BOTTLE_OF_MOVALPOLOS_WATER = 5165, COEURL_SUB = 5166, PLATE_OF_BREAM_SUSHI = 5176, PLATE_OF_DORADO_SUSHI = 5178, diff --git a/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua b/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua index 75a592b941b..ec2c83153c0 100644 --- a/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua +++ b/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua @@ -7,20 +7,20 @@ local entity = {} entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.MOVALPOLOS) ~= xi.nation.BASTOK then - player:showText(npc, zones[xi.zone.PORT_BASTOK].text.BAGNOBROK_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.MOVALPOLOS) == xi.nation.BASTOK then local stock = { - { 640, 11 }, -- Copper Ore - { 4450, 694 }, -- Coral Fungus - { 4375, 4032 }, -- Danceshroom - { 1650, 6500 }, -- Kopparnickel Ore - { 5165, 736 }, -- Movalpolos Water + { xi.item.BOTTLE_OF_MOVALPOLOS_WATER, 840 }, + { xi.item.CHUNK_OF_COPPER_ORE, 12 }, + { xi.item.DANCESHROOM, 4704 }, + { xi.item.CORAL_FUNGUS, 792 }, + { xi.item.CHUNK_OF_KOPPARNICKEL_ORE, 840 }, } player:showText(npc, zones[xi.zone.PORT_BASTOK].text.BAGNOBROK_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.BASTOK) + else + player:showText(npc, zones[xi.zone.PORT_BASTOK].text.BAGNOBROK_CLOSED_DIALOG) end end diff --git a/scripts/zones/Port_Bastok/npcs/Evelyn.lua b/scripts/zones/Port_Bastok/npcs/Evelyn.lua index 888eb7cd89f..7e34b1c6892 100644 --- a/scripts/zones/Port_Bastok/npcs/Evelyn.lua +++ b/scripts/zones/Port_Bastok/npcs/Evelyn.lua @@ -7,9 +7,7 @@ local entity = {} entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.GUSTABERG) ~= xi.nation.BASTOK then - player:showText(npc, zones[xi.zone.PORT_BASTOK].text.EVELYN_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.GUSTABERG) == xi.nation.BASTOK then local stock = { { xi.item.PINCH_OF_SULFUR, 803 }, @@ -20,6 +18,8 @@ entity.onTrigger = function(player, npc) player:showText(npc, zones[xi.zone.PORT_BASTOK].text.EVELYN_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.BASTOK) + else + player:showText(npc, zones[xi.zone.PORT_BASTOK].text.EVELYN_CLOSED_DIALOG) end end diff --git a/scripts/zones/Port_Bastok/npcs/Rosswald.lua b/scripts/zones/Port_Bastok/npcs/Rosswald.lua index 0b9c90f86f5..3d19f45fb02 100644 --- a/scripts/zones/Port_Bastok/npcs/Rosswald.lua +++ b/scripts/zones/Port_Bastok/npcs/Rosswald.lua @@ -7,22 +7,22 @@ local entity = {} entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.ZULKHEIM) ~= xi.nation.BASTOK then - player:showText(npc, zones[xi.zone.PORT_BASTOK].text.ROSSWALD_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.ZULKHEIM) == xi.nation.BASTOK then local stock = { - { xi.item.SLICE_OF_GIANT_SHEEP_MEAT, 49 }, - { xi.item.PINCH_OF_DRIED_MARJORAM, 49 }, - { xi.item.BAG_OF_SAN_DORIAN_FLOUR, 62 }, - { xi.item.BAG_OF_RYE_FLOUR, 41 }, - { xi.item.BAG_OF_SEMOLINA, 2080 }, - { xi.item.LA_THEINE_CABBAGE, 24 }, - { xi.item.JUG_OF_SELBINA_MILK, 62 }, + { xi.item.SLICE_OF_GIANT_SHEEP_MEAT, 50 }, + { xi.item.PINCH_OF_DRIED_MARJORAM, 50 }, + { xi.item.BAG_OF_SAN_DORIAN_FLOUR, 63 }, + { xi.item.BAG_OF_RYE_FLOUR, 42 }, + { xi.item.BAG_OF_SEMOLINA, 2100 }, + { xi.item.LA_THEINE_CABBAGE, 25 }, + { xi.item.JUG_OF_SELBINA_MILK, 63 }, } player:showText(npc, zones[xi.zone.PORT_BASTOK].text.ROSSWALD_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.BASTOK) + else + player:showText(npc, zones[xi.zone.PORT_BASTOK].text.ROSSWALD_CLOSED_DIALOG) end end diff --git a/scripts/zones/Port_Bastok/npcs/Vattian.lua b/scripts/zones/Port_Bastok/npcs/Vattian.lua index de0dc804e6f..48a8b56e349 100644 --- a/scripts/zones/Port_Bastok/npcs/Vattian.lua +++ b/scripts/zones/Port_Bastok/npcs/Vattian.lua @@ -7,18 +7,18 @@ local entity = {} entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.KUZOTZ) ~= xi.nation.BASTOK then - player:showText(npc, zones[xi.zone.PORT_BASTOK].text.VATTIAN_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.KUZOTZ) == xi.nation.BASTOK then local stock = { - { 916, 855 }, -- Cactuar Needle - { 4412, 299 }, -- Thundermelon - { 4491, 184 }, -- Watermelon + { xi.item.THUNDERMELON, 341 }, + { xi.item.CACTUAR_NEEDLE, 976 }, + { xi.item.WATERMELON, 210 }, } player:showText(npc, zones[xi.zone.PORT_BASTOK].text.VATTIAN_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.BASTOK) + else + player:showText(npc, zones[xi.zone.PORT_BASTOK].text.VATTIAN_CLOSED_DIALOG) end end diff --git a/scripts/zones/Port_San_dOria/npcs/Patolle.lua b/scripts/zones/Port_San_dOria/npcs/Patolle.lua index 54899fd2168..51e4a2b2419 100644 --- a/scripts/zones/Port_San_dOria/npcs/Patolle.lua +++ b/scripts/zones/Port_San_dOria/npcs/Patolle.lua @@ -3,24 +3,22 @@ -- NPC: Patolle -- Kuzotz Regional Merchant ----------------------------------- -local ID = zones[xi.zone.PORT_SAN_DORIA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.KUZOTZ) ~= xi.nation.SANDORIA then - player:showText(npc, ID.text.PATOLLE_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.KUZOTZ) == xi.nation.SANDORIA then local stock = { - { 916, 855, }, -- Cactuar Needle - { 4412, 299, }, -- Thundermelon - { 4491, 184, }, -- Watermelon + { xi.item.THUNDERMELON, 341 }, + { xi.item.CACTUAR_NEEDLE, 976 }, + { xi.item.WATERMELON, 210 }, } - player:showText(npc, ID.text.PATOLLE_OPEN_DIALOG) + player:showText(npc, zones[xi.zone.PORT_SAN_DORIA].text.PATOLLE_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.SANDORIA) + else + player:showText(npc, zones[xi.zone.PORT_SAN_DORIA].text.PATOLLE_CLOSED_DIALOG) end end diff --git a/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua b/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua index b8e91587d5d..3b5ec14de38 100644 --- a/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua +++ b/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua @@ -3,26 +3,24 @@ -- NPC: Vendavoq -- Movalpolos Regional Merchant ----------------------------------- -local ID = zones[xi.zone.PORT_SAN_DORIA] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.MOVALPOLOS) ~= xi.nation.SANDORIA then - player:showText(npc, ID.text.VENDAVOQ_CLOSED_DIALOG) - else local stock = { - { 640, 11, }, -- Copper Ore - { 4450, 694, }, -- Coral Fungus - { 4375, 4032, }, -- Danceshroom - { 1650, 6500, }, -- Kopparnickel Ore - { 5165, 736, }, -- Movalpolos Water + { xi.item.BOTTLE_OF_MOVALPOLOS_WATER, 840 }, + { xi.item.CHUNK_OF_COPPER_ORE, 12 }, + { xi.item.DANCESHROOM, 4704 }, + { xi.item.CORAL_FUNGUS, 792 }, + { xi.item.CHUNK_OF_KOPPARNICKEL_ORE, 840 }, } - player:showText(npc, ID.text.VENDAVOQ_OPEN_DIALOG) + player:showText(npc, zones[xi.zone.PORT_SAN_DORIA].text.VENDAVOQ_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.SANDORIA) + else + player:showText(npc, zones[xi.zone.PORT_SAN_DORIA].text.VENDAVOQ_CLOSED_DIALOG) end end diff --git a/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua b/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua index af1908642aa..f8abac5b591 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua @@ -4,8 +4,6 @@ -- Gustaberg Regional Merchant -- !pos 72 2 0 230 ----------------------------------- -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ---@type TNpcEntity local entity = {} @@ -14,19 +12,19 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.GUSTABERG) ~= xi.nation.SANDORIA then - player:showText(npc, ID.text.APAIREMANT_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.GUSTABERG) == xi.nation.SANDORIA then local stock = { - { 1108, 703, }, -- Sulfur - { 619, 43, }, -- Popoto - { 611, 36, }, -- Rye Flour - { 4388, 40, }, -- Eggplant + { xi.item.PINCH_OF_SULFUR, 803 }, + { xi.item.POPOTO, 50 }, + { xi.item.BAG_OF_RYE_FLOUR, 42 }, + { xi.item.EGGPLANT, 46 }, } - player:showText(npc, ID.text.APAIREMANT_OPEN_DIALOG) + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA].text.APAIREMANT_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.SANDORIA) + else + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA].text.APAIREMANT_CLOSED_DIALOG) end end diff --git a/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua b/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua index 4fec1b6a1a9..5c8e62519de 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua @@ -3,8 +3,6 @@ -- NPC: Phamelise -- Zulkheim Regional Merchant ----------------------------------- -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ---@type TNpcEntity local entity = {} @@ -13,22 +11,22 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - if GetRegionOwner(xi.region.ZULKHEIM) ~= xi.nation.SANDORIA then - player:showText(npc, ID.text.PHAMELISE_CLOSED_DIALOG) - else + if GetRegionOwner(xi.region.ZULKHEIM) == xi.nation.SANDORIA then local stock = { - { 4372, 44, }, -- Giant Sheep Meat - { 622, 44, }, -- Dried Marjoram - { 610, 55, }, -- San d'Orian Flour - { 611, 36, }, -- Rye Flour - { 1840, 1840, }, -- Semolina - { 4366, 22, }, -- La Theine Cabbage - { 4378, 55, }, -- Selbina Milk + { xi.item.SLICE_OF_GIANT_SHEEP_MEAT, 50 }, + { xi.item.PINCH_OF_DRIED_MARJORAM, 50 }, + { xi.item.BAG_OF_SAN_DORIAN_FLOUR, 63 }, + { xi.item.BAG_OF_RYE_FLOUR, 42 }, + { xi.item.BAG_OF_SEMOLINA, 2100 }, + { xi.item.LA_THEINE_CABBAGE, 25 }, + { xi.item.JUG_OF_SELBINA_MILK, 63 }, } - player:showText(npc, ID.text.PHAMELISE_OPEN_DIALOG) + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA].text.PHAMELISE_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.SANDORIA) + else + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA].text.PHAMELISE_CLOSED_DIALOG) end end diff --git a/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua b/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua index 1beb267adef..1a048a909e5 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua @@ -2,8 +2,6 @@ -- Area: Southern_San_dOria -- NPC: Valeriano ----------------------------------- -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ---@type TNpcEntity local entity = {} @@ -25,7 +23,7 @@ entity.onTrigger = function(player, npc) { xi.item.SCROLL_OF_MAGES_BALLAD_III, 140039, }, } - player:showText(npc, ID.text.VALERIANO_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA].text.VALERIANO_SHOP_DIALOG) xi.shop.general(player, stock, xi.fameArea.SANDORIA) end diff --git a/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua b/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua index c7d93d4eda1..21625134bac 100644 --- a/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua +++ b/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua @@ -4,28 +4,24 @@ -- Only sells when Windurst controls Movalpolos -- Confirmed shop stock, August 2013 ----------------------------------- -local ID = zones[xi.zone.WINDURST_WATERS] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local regionOwner = GetRegionOwner(xi.region.MOVALPOLOS) - - if regionOwner ~= xi.nation.WINDURST then - player:showText(npc, ID.text.PRESTAPIQ_CLOSED_DIALOG) - else - player:showText(npc, ID.text.PRESTAPIQ_OPEN_DIALOG) - + if GetRegionOwner(xi.region.MOVALPOLOS) == xi.nation.WINDURST then local stock = { - { 640, 11, }, --Copper Ore - { 4450, 694, }, --Coral Fungus - { 4375, 4032, }, --Danceshroom - { 1650, 6500, }, --Kopparnickel Ore - { 5165, 736, }, --Movalpolos Water + { xi.item.BOTTLE_OF_MOVALPOLOS_WATER, 840 }, + { xi.item.CHUNK_OF_COPPER_ORE, 12 }, + { xi.item.DANCESHROOM, 4704 }, + { xi.item.CORAL_FUNGUS, 792 }, + { xi.item.CHUNK_OF_KOPPARNICKEL_ORE, 840 }, } + + player:showText(npc, zones[xi.zone.WINDURST_WATERS].text.PRESTAPIQ_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.WINDURST) + else + player:showText(npc, zones[xi.zone.WINDURST_WATERS].text.PRESTAPIQ_CLOSED_DIALOG) end end diff --git a/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua b/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua index 935c38e7497..55d46b03baa 100644 --- a/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua +++ b/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua @@ -4,35 +4,26 @@ -- Only sells when Windurst controlls Zulkheim Region -- Confirmed shop stock, August 2013 ----------------------------------- -local ID = zones[xi.zone.WINDURST_WOODS] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local regionOwner = GetRegionOwner(xi.region.ZULKHEIM) - - if regionOwner ~= xi.nation.WINDURST then - player:showText(npc, ID.text.BIN_STEJIHNA_CLOSED_DIALOG) - else - player:showText(npc, ID.text.BIN_STEJIHNA_OPEN_DIALOG) - + if GetRegionOwner(xi.region.ZULKHEIM) == xi.nation.WINDURST then local stock = { - { 4372, 44, }, -- Giant Sheep Meat - { 622, 44, }, -- Dried Marjoram - { 610, 55, }, -- San d'Orian Flour - { 611, 36, }, -- Rye Flour - { 4366, 22, }, -- La Theine Cabbage - { 4378, 55, }, -- Selbina Milk + { xi.item.SLICE_OF_GIANT_SHEEP_MEAT, 50 }, + { xi.item.PINCH_OF_DRIED_MARJORAM, 50 }, + { xi.item.BAG_OF_SAN_DORIAN_FLOUR, 63 }, + { xi.item.BAG_OF_RYE_FLOUR, 42 }, + { xi.item.BAG_OF_SEMOLINA, 2100 }, + { xi.item.LA_THEINE_CABBAGE, 25 }, + { xi.item.JUG_OF_SELBINA_MILK, 63 }, } - local rank = GetNationRank(xi.nation.WINDURST) - if rank ~= 3 then - table.insert(stock, { 1840, 1840, }) --Semolina - end - + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.BIN_STEJIHNA_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.WINDURST) + else + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.BIN_STEJIHNA_CLOSED_DIALOG) end end diff --git a/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua b/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua index f5a17be0b68..67f0976b80c 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua @@ -2,9 +2,6 @@ -- Area: Windurst_Woods -- NPC: Nhobi Zalkia -- Only sells when Windurst controlls Kuzotz Region --- Confirmed shop stock, August 2013 ------------------------------------ -local ID = zones[xi.zone.WINDURST_WOODS] ----------------------------------- ---@type TNpcEntity local entity = {} @@ -14,20 +11,18 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - local regionOwner = GetRegionOwner(xi.region.KUZOTZ) - - if regionOwner ~= xi.nation.WINDURST then - player:showText(npc, ID.text.NHOBI_ZALKIA_CLOSED_DIALOG) - else - player:showText(npc, ID.text.NHOBI_ZALKIA_OPEN_DIALOG) - + if GetRegionOwner(xi.region.KUZOTZ) == xi.nation.WINDURST then local stock = { - { 916, 855, }, -- Cactuar Needle - { 4412, 299, }, -- Thundermelon - { 4491, 184, }, -- Watermelon + { xi.item.THUNDERMELON, 341 }, + { xi.item.CACTUAR_NEEDLE, 976 }, + { xi.item.WATERMELON, 210 }, } + + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.NHOBI_ZALKIA_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.WINDURST) + else + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.NHOBI_ZALKIA_CLOSED_DIALOG) end end diff --git a/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua b/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua index 9af5fa5668c..d44b0406e9b 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua @@ -4,27 +4,23 @@ -- Only sells when Windurst controlls Gustaberg Region -- Confirmed shop stock, August 2013 ----------------------------------- -local ID = zones[xi.zone.WINDURST_WOODS] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local regionOwner = GetRegionOwner(xi.region.GUSTABERG) - - if regionOwner ~= xi.nation.WINDURST then - player:showText(npc, ID.text.NYALABICCIO_CLOSED_DIALOG) - else - player:showText(npc, ID.text.NYALABICCIO_OPEN_DIALOG) - + if GetRegionOwner(xi.region.GUSTABERG) == xi.nation.WINDURST then local stock = { - { 1108, 703, }, -- Sulfur - { 619, 43, }, -- Popoto - { 611, 36, }, -- Rye Flour - { 4388, 40, }, -- Eggplant + { xi.item.PINCH_OF_SULFUR, 803 }, + { xi.item.POPOTO, 50 }, + { xi.item.BAG_OF_RYE_FLOUR, 42 }, + { xi.item.EGGPLANT, 46 }, } + + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.NYALABICCIO_OPEN_DIALOG) xi.shop.general(player, stock, xi.fameArea.WINDURST) + else + player:showText(npc, zones[xi.zone.WINDURST_WOODS].text.NYALABICCIO_CLOSED_DIALOG) end end