From 2a5c95b2c6c2b0e4696a95be82d6e73af973b2fd Mon Sep 17 00:00:00 2001 From: Hatberg <46464306+Hatberg@users.noreply.github.com> Date: Fri, 3 Apr 2026 09:31:06 +0200 Subject: [PATCH] Replace Magic Numbers in Tavnazia, Nashmau, Shadowreign shops --- scripts/enum/item.lua | 55 +++++++ .../Bastok_Markets_[S]/npcs/Blingbrix.lua | 12 +- .../zones/Bastok_Markets_[S]/npcs/Silke.lua | 10 +- .../Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua | 10 +- .../Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua | 10 +- .../Mog_Garden/npcs/Green_Thumb_Moogle.lua | 18 +-- scripts/zones/Nashmau/npcs/Chichiroon.lua | 26 ++-- scripts/zones/Nashmau/npcs/Jajaroon.lua | 36 +++-- scripts/zones/Nashmau/npcs/Mamaroon.lua | 28 ++-- scripts/zones/Nashmau/npcs/Pipiroon.lua | 12 +- scripts/zones/Nashmau/npcs/Poporoon.lua | 12 +- scripts/zones/Nashmau/npcs/Wata_Khamazom.lua | 26 ++-- scripts/zones/Nashmau/npcs/Yoyoroon.lua | 142 +++++++++--------- .../Southern_San_dOria_[S]/npcs/Geltpix.lua | 12 +- .../Tavnazian_Safehold/npcs/Caiphimonride.lua | 28 ++-- .../Tavnazian_Safehold/npcs/Komalata.lua | 40 ++--- .../Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua | 38 ++--- .../Tavnazian_Safehold/npcs/Melleupaux.lua | 28 ++-- .../zones/Tavnazian_Safehold/npcs/Migran.lua | 30 ++-- .../Tavnazian_Safehold/npcs/Misseulieu.lua | 30 ++-- .../Tavnazian_Safehold/npcs/Nilerouche.lua | 42 +++--- .../npcs/Layton.lua | 36 +++-- .../npcs/Ezura-Romazura.lua | 24 ++- .../Windurst_Waters_[S]/npcs/Pelftrix.lua | 12 +- 24 files changed, 375 insertions(+), 342 deletions(-) diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index a05a7ebde45..0888f3c0fee 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -1573,6 +1573,14 @@ xi.item = CHOCOBO_EGG_A_BIT_WARM = 2317, CHOCOBO_EGG_A_LITTLE_WARM = 2318, CHOCOBO_EGG_SOMEWHAT_WARM = 2319, + ATTUNER = 2322, + TACTICAL_PROCESSOR = 2323, + DRUM_MAGAZINE = 2324, + EQUALIZER = 2325, + TARGET_MARKER = 2326, + MANA_CHANNELER = 2327, + ERASER = 2328, + SMOKE_SCREEN = 2329, YOICHIS_SASH = 2330, BLUE_MAGES_TESTIMONY = 2331, CORSAIRS_TESTIMONY = 2332, @@ -1605,6 +1613,10 @@ xi.item = CHUNK_OF_DIORITE = 2388, CRA_RACING_FORM = 2402, FLOCON_DE_MER = 2408, + FLAME_HOLDER = 2409, + ICE_MAKER = 2410, + REPLICATOR = 2411, + HAMMERMILL = 2412, CHUNK_OF_AHT_URHGAN_BRASS = 2417, AHT_URHGAN_BRASS_INGOT = 2418, WIVRE_HORN = 2426, @@ -2414,6 +2426,9 @@ xi.item = ROCKFIN_TOOTH = 3979, BZTAVIAN_STINGER = 3980, BZTAVIAN_WING = 3981, + GOLDEN_SEED_POUCH = 3984, + MONARCH_BEETLE_SALIVA = 3985, + CHESTNUT_TREE_SAP = 3986, WAKTZA_ROSTRUM = 4012, WAKTZA_CREST = 4013, YGGDREANT_BOLE = 4014, @@ -2937,10 +2952,12 @@ xi.item = SCROLL_OF_FIRE_II = 4753, SCROLL_OF_FIRE_III = 4754, SCROLL_OF_FIRE_IV = 4755, + SCROLL_OF_FIRE_V = 4756, SCROLL_OF_BLIZZARD = 4757, SCROLL_OF_BLIZZARD_II = 4758, SCROLL_OF_BLIZZARD_III = 4759, SCROLL_OF_BLIZZARD_IV = 4760, + SCROLL_OF_BLIZZARD_V = 4761, SCROLL_OF_AERO = 4762, SCROLL_OF_AERO_II = 4763, SCROLL_OF_AERO_III = 4764, @@ -3030,6 +3047,8 @@ xi.item = SCROLL_OF_BLIND_II = 4884, SCROLL_OF_DREAD_SPIKES = 4885, SCROLL_OF_ABSORB_ACC = 4886, + SCROLL_OF_FIRAJA = 4890, + SCROLL_OF_AEROJA = 4892, SCROLL_OF_STONEJA = 4893, SCROLL_OF_WATERJA = 4895, FIRE_SPIRIT_PACT = 4896, @@ -3040,7 +3059,9 @@ xi.item = LIGHT_SPIRIT_PACT = 4902, DARK_SPIRIT_PACT = 4903, SCROLL_OF_DISTRACT = 4912, + SCROLL_OF_DISTRACT_II = 4913, SCROLL_OF_FRAZZLE = 4914, + SCROLL_OF_FRAZZLE_II = 4915, SCROLL_OF_KATON_ICHI = 4928, SCROLL_OF_KATON_SAN = 4930, SCROLL_OF_HYOTON_ICHI = 4931, @@ -3611,8 +3632,26 @@ xi.item = CELADON_YGGRETE_SHARD_III = 6013, CELADON_YGGRETE_SHARD_IV = 6014, CELADON_YGGRETE_SHARD_V = 6015, + PYROHELIX_SCHEMA = 6041, + HYDROHELIX_SCHEMA = 6042, + IONOHELIX_SCHEMA = 6043, + CRYOHELIX_SCHEMA = 6044, + GEOHELIX_SCHEMA = 6045, + ANEMOHELIX_SCHEMA = 6046, + LUMINOHELIX_SCHEMA = 6047, + NOCTOHELIX_SCHEMA = 6048, + FIRESTORM_SCHEMA = 6049, + RAINSTORM_SCHEMA = 6050, + THUNDERSTORM_SCHEMA = 6051, + HAILSTORM_SCHEMA = 6052, + SANDSTORM_SCHEMA = 6053, + WINDSTORM_SCHEMA = 6054, + AURORASTORM_SCHEMA = 6055, + VOIDSTORM_SCHEMA = 6056, KLIMAFORM_SCHEMA = 6058, ANIMUS_AUGEO_SCHEMA = 6059, + ANIMUS_MINUO_SCHEMA = 6060, + ADLOQUIUM_SCHEMA = 6061, SLICE_OF_GABBRATH_MEAT = 6068, PLATE_OF_INDI_POISON = 6074, PLATE_OF_INDI_FRAILTY = 6092, @@ -3949,9 +3988,23 @@ xi.item = EUDAEMON_SHIELD = 8970, SPECIAL_GOBBIEDIAL_KEY = 8973, DENSE_CLUSTER = 9010, + STROBE_II = 9032, + TENSION_SPRING_III = 9033, + LOUDSPEAKER_III = 9034, + SCOPE_II = 9036, + ACCELERATOR_III = 9037, + ARMOR_PLATE_III = 9039, + STABILIZER_III = 9040, + MANA_JAMMER_III = 9042, + STEALTH_SCREEN_II = 9043, REFRACTIVE_CRYSTAL = 9049, MELLIDOPT_WING = 9050, + INHIBITOR_II = 9065, + AMPLIFIER = 9066, + REPEATER = 9067, BARRIER_MODULE = 9068, + RESISTER = 9070, + ARCANIC_CELL = 9072, CLUMP_OF_BEE_POLLEN = 9082, MANDRAGORA_DEWDROP = 9083, ESCHALIXIR_P2 = 9086, @@ -4031,6 +4084,8 @@ xi.item = MOG_KUPON_A_EMI = 9226, MOG_KUPON_A_SYW = 9227, MOG_KUPON_A_ASYW = 9228, + SPEEDLOADER = 9229, + SPEEDLOADER_II = 9230, AMBUSCADE_VOUCHER_HEAD = 9235, AMBUSCADE_VOUCHER_BODY = 9236, AMBUSCADE_VOUCHER_HANDS = 9237, diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua index 748d2dbcecb..0b216a58113 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua @@ -2,21 +2,19 @@ -- Area: Bastok Markets (S) -- NPC: Blingbrix ----------------------------------- -local ID = zones[xi.zone.BASTOK_MARKETS_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4116, 4500, }, --Hi-Potion - { 4132, 28000, }, --Hi-Ether - { 605, 200, }, --Pickaxe - { 1020, 300, }, --Sickle + { xi.item.HI_POTION, 4500 }, + { xi.item.HI_ETHER, 28000 }, + { xi.item.PICKAXE, 200 }, + { xi.item.SICKLE, 300 }, } - player:showText(npc, ID.text.BLINGBRIX_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.BASTOK_MARKETS_S].text.BLINGBRIX_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua index df537794ff4..8b7f32797bc 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua @@ -2,20 +2,18 @@ -- Area: Bastok Markets (S) -- NPC: Silke ----------------------------------- -local ID = zones[xi.zone.BASTOK_MARKETS_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 6059, 29925, }, -- Animus Augeo Schema - { 6060, 29925, }, -- Animus Minuo Schema - { 6061, 36300, }, -- Adloquim Schema + { xi.item.ANIMUS_AUGEO_SCHEMA, 29925 }, + { xi.item.ANIMUS_MINUO_SCHEMA, 29925 }, + { xi.item.ADLOQUIUM_SCHEMA, 36300 }, } - player:showText(npc, ID.text.SILKE_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.BASTOK_MARKETS_S].text.SILKE_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua b/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua index 9de69a9b5a7..c99ef72f7e8 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua @@ -3,20 +3,18 @@ -- NPC: Pohka Chichiyowahl -- !pos -415 -2 -430 4 ----------------------------------- -local ID = zones[xi.zone.BIBIKI_BAY] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 17388, 1238, 3, }, -- Fastwater F. Rod - { 17382, 11845, 3, }, -- S.H. Fishing Rod - { 4148, 290, 3, }, -- Antidote + { xi.item.FASTWATER_FISHING_ROD, 1238, 3 }, + { xi.item.SINGLE_HOOK_FISHING_ROD, 11845, 3 }, + { xi.item.ANTIDOTE, 290, 3 }, } - player:showText(npc, ID.text.POHKA_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.BIBIKI_BAY].text.POHKA_SHOP_DIALOG) xi.shop.nation(player, stock, xi.nation.WINDURST) end diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua index b1bb7deb9f8..402f6c1597f 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua @@ -2,20 +2,18 @@ -- Area: Fort Karugo-Narugo -- NPC: Spondulix ----------------------------------- -local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4116, 4500, }, -- Hi-Potion - { 4132, 28000, }, -- Hi-Ether - { 2563, 3035, }, -- Karugo Clay + { xi.item.HI_POTION, 4500 }, + { xi.item.HI_ETHER, 28000 }, + { xi.item.LUMP_OF_KARUGO_NARUGO_CLAY, 3035 }, } - player:showText(npc, ID.text.SPONDULIX_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.FORT_KARUGO_NARUGO_S].text.SPONDULIX_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua b/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua index efb53b831d1..c4e096b31bd 100644 --- a/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua +++ b/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua @@ -33,15 +33,15 @@ entity.onEventFinish = function(player, csid, option, npc) elseif csid == 1016 and option == 0xFFE00FF then -- Buy/Sell Things local stock = { - { 573, 280, }, -- Vegetable Seeds - { 574, 320, }, -- Fruit Seeds - { 575, 280, }, -- Grain Seeds - { 572, 280, }, -- Herb Seeds - { 1236, 1685, }, -- Cactus Stems - { 2235, 320, }, -- Wildgrass Seeds - { 3986, 1111, }, -- Chestnut Tree Sap (11th Anniversary Campaign) - { 3985, 1111, }, -- Monarch Beetle Saliva (11th Anniversary Campaign) - { 3984, 1111, }, -- Golden Seed Pouch (11th Anniversary Campaign) + { xi.item.BAG_OF_VEGETABLE_SEEDS, 280 }, + { xi.item.BAG_OF_FRUIT_SEEDS, 320 }, + { xi.item.BAG_OF_GRAIN_SEEDS, 280 }, + { xi.item.BAG_OF_HERB_SEEDS, 280 }, + { xi.item.BAG_OF_CACTUS_STEMS, 1685 }, + { xi.item.BAG_OF_WILDGRASS_SEEDS, 320 }, + { xi.item.CHESTNUT_TREE_SAP, 1111 }, -- (11th Anniversary Campaign) + { xi.item.MONARCH_BEETLE_SALIVA, 1111 }, -- (11th Anniversary Campaign) + { xi.item.GOLDEN_SEED_POUCH, 1111 }, -- (11th Anniversary Campaign) } xi.shop.general(player, stock) diff --git a/scripts/zones/Nashmau/npcs/Chichiroon.lua b/scripts/zones/Nashmau/npcs/Chichiroon.lua index eb723711b96..4059c04d228 100644 --- a/scripts/zones/Nashmau/npcs/Chichiroon.lua +++ b/scripts/zones/Nashmau/npcs/Chichiroon.lua @@ -2,28 +2,26 @@ -- Area: Nashmau -- NPC: Chichiroon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 5497, 99224, }, -- Bolter's Die - { 5498, 85500, }, -- Caster's Die - { 5499, 97350, }, -- Courser's Die - { 5500, 100650, }, -- Blitzer's Die - { 5501, 109440, }, -- Tactician's Die - { 5502, 116568, }, -- Allies' Die - { 5503, 96250, }, -- Miser's Die - { 5504, 95800, }, -- Companion's Die - { 5505, 123744, }, -- Avenger's Die - { 6368, 69288, }, -- Geomancer Die - { 6369, 73920, }, -- Rune Fencer Die + { xi.item.BOLTERS_DIE, 99224 }, + { xi.item.CASTERS_DIE, 85500 }, + { xi.item.COURSERS_DIE, 97350 }, + { xi.item.BLITZERS_DIE, 100650 }, + { xi.item.TACTICIANS_DIE, 109440 }, + { xi.item.ALLIES_DIE, 116568 }, + { xi.item.MISERS_DIE, 96250 }, + { xi.item.COMPANIONS_DIE, 95800 }, + { xi.item.AVENGERS_DIE, 123744 }, + { xi.item.GEOMANCER_DIE, 69288 }, + { xi.item.RUNE_FENCER_DIE, 73920 }, } - player:showText(npc, ID.text.CHICHIROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.CHICHIROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Jajaroon.lua b/scripts/zones/Nashmau/npcs/Jajaroon.lua index 7a9a9d820f9..2bfd83d9c19 100644 --- a/scripts/zones/Nashmau/npcs/Jajaroon.lua +++ b/scripts/zones/Nashmau/npcs/Jajaroon.lua @@ -2,33 +2,31 @@ -- Area: Nashmau -- NPC: Jajaroon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 2176, 48, }, -- Fire Card - { 2177, 48, }, -- Ice Card - { 2178, 48, }, -- Wind Card - { 2179, 48, }, -- Earth Card - { 2180, 48, }, -- Thunder Card - { 2181, 48, }, -- Water Card - { 2182, 48, }, -- Light Card - { 2183, 48, }, -- Dark Card - { 5870, 10000, }, -- Trump Card Case - { 5488, 35200, }, -- Samurai Die - { 5489, 600, }, -- Ninja Die - { 5490, 9216, }, -- Dragoon Die - { 5491, 40000, }, -- Summoner Die - { 5492, 3525, }, -- Blue Mage Die - { 5493, 316, }, -- Corsair Die - { 5494, 82500, }, -- Puppetmaster Die + { xi.item.FIRE_CARD, 48 }, + { xi.item.ICE_CARD, 48 }, + { xi.item.WIND_CARD, 48 }, + { xi.item.EARTH_CARD, 48 }, + { xi.item.THUNDER_CARD, 48 }, + { xi.item.WATER_CARD, 48 }, + { xi.item.LIGHT_CARD, 48 }, + { xi.item.DARK_CARD, 48 }, + { xi.item.TRUMP_CARD_CASE, 10000 }, + { xi.item.SAMURAI_DIE, 35200 }, + { xi.item.NINJA_DIE, 600 }, + { xi.item.DRAGOON_DIE, 9216 }, + { xi.item.SUMMONER_DIE, 40000 }, + { xi.item.BLUE_MAGE_DIE, 3525 }, + { xi.item.CORSAIR_DIE, 316 }, + { xi.item.PUPPETMASTER_DIE, 82500 }, } - player:showText(npc, ID.text.JAJAROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.JAJAROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Mamaroon.lua b/scripts/zones/Nashmau/npcs/Mamaroon.lua index f77ec3e9c0c..654c3b0197d 100644 --- a/scripts/zones/Nashmau/npcs/Mamaroon.lua +++ b/scripts/zones/Nashmau/npcs/Mamaroon.lua @@ -2,29 +2,27 @@ -- Area: Nashmau -- NPC: Mamaroon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4860, 27000, }, -- Scroll of Stun - { 4708, 5160, }, -- Scroll of Enfire - { 4709, 4098, }, -- Scroll of Enblizzard - { 4710, 2500, }, -- Scroll of Enaero - { 4711, 2030, }, -- Scroll of Entone - { 4712, 1515, }, -- Scroll of Enthunder - { 4713, 7074, }, -- Scroll of Enwater - { 4859, 9000, }, -- Scroll of Shock Spikes - { 2502, 29950, }, -- White Puppet Turban - { 2501, 29950, }, -- Black Puppet Turban - { 4706, 100800, }, -- Scroll of Enlight - { 4707, 100800, }, -- Scroll of Endark + { xi.item.SCROLL_OF_STUN, 27000 }, + { xi.item.SCROLL_OF_ENFIRE, 5160 }, + { xi.item.SCROLL_OF_ENBLIZZARD, 4098 }, + { xi.item.SCROLL_OF_ENAERO, 2500 }, + { xi.item.SCROLL_OF_ENSTONE, 2030 }, + { xi.item.SCROLL_OF_ENTHUNDER, 1515 }, + { xi.item.SCROLL_OF_ENWATER, 7074 }, + { xi.item.SCROLL_OF_SHOCK_SPIKES, 9000 }, + { xi.item.WHITE_PUPPET_TURBAN, 29950 }, + { xi.item.BLACK_PUPPET_TURBAN, 29950 }, + { xi.item.SCROLL_OF_ENLIGHT, 100800 }, + { xi.item.SCROLL_OF_ENDARK, 100800 }, } - player:showText(npc, ID.text.MAMAROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.MAMAROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Pipiroon.lua b/scripts/zones/Nashmau/npcs/Pipiroon.lua index 04b1dc75912..342cc72f349 100644 --- a/scripts/zones/Nashmau/npcs/Pipiroon.lua +++ b/scripts/zones/Nashmau/npcs/Pipiroon.lua @@ -2,21 +2,19 @@ -- Area: Nashmau -- NPC: Pipiroon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 17313, 1204, }, -- Grenade - { 17315, 6000, }, -- Riot Grenade - { 928, 515, }, -- Bomb Ash - { 2873, 10000, }, -- Nashmau Waystone + { xi.item.GRENADE, 1204 }, + { xi.item.RIOT_GRENADE, 6000 }, + { xi.item.PINCH_OF_BOMB_ASH, 515 }, + { xi.item.NASHMAU_WAYSTONE, 10000 }, } - player:showText(npc, ID.text.PIPIROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.PIPIROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Poporoon.lua b/scripts/zones/Nashmau/npcs/Poporoon.lua index 3e9512eb18b..faf2c8f0d52 100644 --- a/scripts/zones/Nashmau/npcs/Poporoon.lua +++ b/scripts/zones/Nashmau/npcs/Poporoon.lua @@ -2,21 +2,19 @@ -- Area: Nashmau -- NPC: Poporoon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 12952, 336, }, -- Leather Highboots - { 12953, 3438, }, -- Lizard Ledelsens - { 12954, 11172, }, -- Studded Boots - { 12955, 20532, }, -- Cuir Highboots + { xi.item.LEATHER_HIGHBOOTS, 336 }, + { xi.item.LIZARD_LEDELSENS, 3438 }, + { xi.item.STUDDED_BOOTS, 11172 }, + { xi.item.CUIR_HIGHBOOTS, 20532 }, } - player:showText(npc, ID.text.POPOROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.POPOROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua b/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua index 562d79ca9b4..39db19500ce 100644 --- a/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua +++ b/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua @@ -2,28 +2,26 @@ -- Area: Nashmau -- NPC: Wata Khamazom ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 17152, 44, }, -- Shortbow - { 17153, 536, }, -- Self Bow - { 17154, 7920, }, -- Wrapped Bow - { 17160, 492, }, -- Longbow - { 17162, 21812, }, -- Great Bow - { 17318, 4, }, -- Wooden Arrow - { 17320, 8, }, -- Iron Arrow - { 17321, 18, }, -- Silver Arrow - { 17322, 140, }, -- Fire Arrow - { 17336, 6, }, -- Crossbow Bolt - { 18258, 248, }, -- Throwing Tomahawk + { xi.item.SHORTBOW, 44 }, + { xi.item.SELF_BOW, 536 }, + { xi.item.WRAPPED_BOW, 7920 }, + { xi.item.LONGBOW, 492 }, + { xi.item.GREAT_BOW, 21812 }, + { xi.item.WOODEN_ARROW, 4 }, + { xi.item.IRON_ARROW, 8 }, + { xi.item.SILVER_ARROW, 18 }, + { xi.item.FIRE_ARROW, 140 }, + { xi.item.CROSSBOW_BOLT, 6 }, + { xi.item.THROWING_TOMAHAWK, 248 }, } - player:showText(npc, ID.text.WATAKHAMAZOM_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.WATAKHAMAZOM_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Nashmau/npcs/Yoyoroon.lua b/scripts/zones/Nashmau/npcs/Yoyoroon.lua index ac9810c58aa..3eeefdd5114 100644 --- a/scripts/zones/Nashmau/npcs/Yoyoroon.lua +++ b/scripts/zones/Nashmau/npcs/Yoyoroon.lua @@ -2,86 +2,84 @@ -- Area: Nashmau -- NPC: Yoyoroon ----------------------------------- -local ID = zones[xi.zone.NASHMAU] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 2239, 4940, }, -- Tension Spring - { 2243, 4940, }, -- Loudspeaker - { 2246, 4940, }, -- Accelerator - { 2251, 4940, }, -- Armor Plate - { 2254, 4940, }, -- Stabilizer - { 2258, 4940, }, -- Mana Jammer - { 2262, 4940, }, -- Auto-Repair Kit - { 2266, 4940, }, -- Mana Tank - { 2240, 9925, }, -- Inhibitor - { 9229, 9925, }, -- Speedloader - { 2242, 9925, }, -- Mana Booster - { 2247, 9925, }, -- Scope - { 2250, 9925, }, -- Shock Absorber - { 2255, 9925, }, -- Volt Gun - { 2260, 9925, }, -- Stealth Screen - { 2264, 9925, }, -- Damage Gauge - { 2268, 9925, }, -- Mana Conserver - { 2238, 19890, }, -- Strobe - { 2409, 19890, }, -- Flame Holder - { 2410, 19890, }, -- Ice Maker - { 2248, 19890, }, -- Pattern Reader - { 2411, 19890, }, -- Replicator - { 2252, 19890, }, -- Analyzer - { 2256, 19890, }, -- Heat Seeker - { 2259, 19890, }, -- Heatsink - { 2263, 19890, }, -- Flashbulb - { 2267, 19890, }, -- Mana Converter - { 2241, 29640, }, -- Tension Spring II - { 2244, 29640, }, -- Scanner - { 2245, 29640, }, -- Loudspeaker II - { 2249, 29640, }, -- Accelerator II - { 2253, 29640, }, -- Armor Plate II - { 2257, 29640, }, -- Stabilizer II - { 2261, 29640, }, -- Mana Jammer II - { 2412, 41496, }, -- Hammermill - { 9068, 41496, }, -- Barrier Module - { 9070, 41496, }, -- Resister - { 2265, 41496, }, -- Auto-Repair Kit II - { 9072, 41496, }, -- Arcanic Cell - { 2269, 41496, }, -- Mana Tank II - { 9032, 53352, }, -- Strobe II - { 9033, 65208, }, -- Tension Spring III - { 9034, 65208, }, -- Loudspeaker III - { 9066, 65208, }, -- Amplifier - { 9037, 65208, }, -- Accelerator III - { 9036, 65208, }, -- Scope II - { 9039, 65208, }, -- Armor Plate III - { 9040, 65208, }, -- Stabilizer III - { 9042, 65208, }, -- Mana Jammer III - { 9065, 82992, }, -- Inhibitor II - { 9230, 82992, }, -- Speedloader II - { 9067, 82992, }, -- Repeater - { 9043, 82992, }, -- Stealth Screen II - { 2322, 118560, }, -- Attuner - { 3307, 118560, }, -- Heat Capacitor - { 2323, 118560, }, -- Tactical Processor - { 3308, 118560, }, -- Power Cooler - { 2324, 118560, }, -- Drum Magazine - { 3309, 118560, }, -- Barrage Turbine - { 2325, 118560, }, -- Equalizer - { 3310, 118560, }, -- Barrier Module II - { 2326, 118560, }, -- Target Marker - { 3311, 118560, }, -- Galvanizer - { 2327, 118560, }, -- Mana Channeler - { 3312, 118560, }, -- Percolator - { 2328, 118560, }, -- Eraser - { 3313, 118560, }, -- Vivi-Valve - { 2329, 118560, }, -- Smoke Screen - { 3314, 118560, }, -- Disruptor + { xi.item.TENSION_SPRING, 4940 }, + { xi.item.LOUDSPEAKER, 4940 }, + { xi.item.ACCELERATOR, 4940 }, + { xi.item.ARMOR_PLATE, 4940 }, + { xi.item.STABILIZER, 4940 }, + { xi.item.MANA_JAMMER, 4940 }, + { xi.item.AUTO_REPAIR_KIT, 4940 }, + { xi.item.MANA_TANK, 4940 }, + { xi.item.INHIBITOR, 9925 }, + { xi.item.SPEEDLOADER, 9925 }, + { xi.item.MANA_BOOSTER, 9925 }, + { xi.item.SCOPE, 9925 }, + { xi.item.SHOCK_ABSORBER, 9925 }, + { xi.item.VOLT_GUN, 9925 }, + { xi.item.STEALTH_SCREEN, 9925 }, + { xi.item.DAMAGE_GAUGE, 9925 }, + { xi.item.MANA_CONSERVER, 9925 }, + { xi.item.STROBE, 19890 }, + { xi.item.FLAME_HOLDER, 19890 }, + { xi.item.ICE_MAKER, 19890 }, + { xi.item.PATTERN_READER, 19890 }, + { xi.item.REPLICATOR, 19890 }, + { xi.item.ANALYZER, 19890 }, + { xi.item.HEAT_SEEKER, 19890 }, + { xi.item.HEATSINK, 19890 }, + { xi.item.FLASHBULB, 19890 }, + { xi.item.MANA_CONVERTER, 19890 }, + { xi.item.TENSION_SPRING_II, 29640 }, + { xi.item.SCANNER, 29640 }, + { xi.item.LOUDSPEAKER_II, 29640 }, + { xi.item.ACCELERATOR_II, 29640 }, + { xi.item.ARMOR_PLATE_II, 29640 }, + { xi.item.STABILIZER_II, 29640 }, + { xi.item.MANA_JAMMER_II, 29640 }, + { xi.item.HAMMERMILL, 41496 }, + { xi.item.BARRIER_MODULE, 41496 }, + { xi.item.RESISTER, 41496 }, + { xi.item.AUTO_REPAIR_KIT_II, 41496 }, + { xi.item.ARCANIC_CELL, 41496 }, + { xi.item.MANA_TANK_II, 41496 }, + { xi.item.STROBE_II, 53352 }, + { xi.item.TENSION_SPRING_III, 65208 }, + { xi.item.LOUDSPEAKER_III, 65208 }, + { xi.item.AMPLIFIER, 65208 }, + { xi.item.ACCELERATOR_III, 65208 }, + { xi.item.SCOPE_II, 65208 }, + { xi.item.ARMOR_PLATE_III, 65208 }, + { xi.item.STABILIZER_III, 65208 }, + { xi.item.MANA_JAMMER_III, 65208 }, + { xi.item.INHIBITOR_II, 82992 }, + { xi.item.SPEEDLOADER_II, 82992 }, + { xi.item.REPEATER, 82992 }, + { xi.item.STEALTH_SCREEN_II, 82992 }, + { xi.item.ATTUNER, 118560 }, + { xi.item.HEAT_CAPACITOR, 118560 }, + { xi.item.TACTICAL_PROCESSOR, 118560 }, + { xi.item.POWER_COOLER, 118560 }, + { xi.item.DRUM_MAGAZINE, 118560 }, + { xi.item.BARRAGE_TURBINE, 118560 }, + { xi.item.EQUALIZER, 118560 }, + { xi.item.BARRIER_MODULE_II, 118560 }, + { xi.item.TARGET_MARKER, 118560 }, + { xi.item.GALVANIZER, 118560 }, + { xi.item.MANA_CHANNELER, 118560 }, + { xi.item.PERCOLATOR, 118560 }, + { xi.item.ERASER, 118560 }, + { xi.item.VIVI_VALVE, 118560 }, + { xi.item.SMOKE_SCREEN, 118560 }, + { xi.item.DISRUPTOR, 118560 }, } - player:showText(npc, ID.text.YOYOROON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.NASHMAU].text.YOYOROON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua index 6fe0602c8b4..dca20431eb9 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua @@ -3,21 +3,19 @@ -- NPC: Geltpix -- !pos 154 -2 103 80 ----------------------------------- -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4116, 4500, }, -- Hi-Potion - { 4132, 28000, }, -- Hi-Ether - { 1021, 500, }, -- Hatchet - { 2554, 100, }, -- Asphodel + { xi.item.HI_POTION, 4500 }, + { xi.item.HI_ETHER, 28000 }, + { xi.item.HATCHET, 500 }, + { xi.item.ASPHODEL, 100 }, } - player:showText(npc, ID.text.DONT_HURT_GELTPIX) + player:showText(npc, zones[xi.zone.SOUTHERN_SAN_DORIA_S].text.DONT_HURT_GELTPIX) xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua b/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua index 9be4cdfae1f..244b13d2884 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua @@ -2,31 +2,31 @@ -- Area: Tavnazian Safehold -- NPC: Caiphimonride ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 16450, 2030, }, -- Dagger - { 16566, 9216, }, -- Longsword - { 17335, 4, }, -- Rusty Bolt - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 16450, 2030, }, -- Dagger - { 16566, 9216, }, -- Longsword - { 17335, 4, }, -- Rusty Bolt - { 18375, 37296, }, -- Falx - { 18214, 20762, }, -- Voulge + { xi.item.DAGGER, 2030 }, + { xi.item.LONGSWORD, 9216 }, + { xi.item.RUSTY_BOLT, 4 }, + { xi.item.FALX, 37296 }, + { xi.item.VOULGE, 20762 }, + } + else + stock = + { + { xi.item.DAGGER, 2030 }, + { xi.item.LONGSWORD, 9216 }, + { xi.item.RUSTY_BOLT, 4 }, } end - player:showText(npc, ID.text.CAIPHIMONRIDE_SHOP_DIALOG) -- 10908 with only 3 items available, may change + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.CAIPHIMONRIDE_SHOP_DIALOG) -- 10908 with only 3 items available, may change xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua b/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua index ef7cd314881..c5babfb9ebe 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua @@ -2,37 +2,37 @@ -- Area: Tavnazian Safehold -- NPC: Komalata ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 4376, 120, }, -- Meat Jerky - { 936, 16, }, -- Rock Salt - { 611, 40, }, -- Rye Flour - { 4509, 12, }, -- Distilled Water - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 625, 88, }, -- Apple Vinegar - { 4364, 120, }, -- Black Bread - { 4376, 120, }, -- Meat Jerky - { 936, 16, }, -- Rock Salt - { 611, 40, }, -- Rye Flour - { 610, 60, }, -- San d'Orian Flour - { 4389, 32, }, -- San d'Orian Carrot - { 629, 48, }, -- Millioncorn - { 1523, 316, }, -- Apple Mint - { 4509, 12, }, -- Distilled Water + { xi.item.BOTTLE_OF_APPLE_VINEGAR, 88 }, + { xi.item.LOAF_OF_BLACK_BREAD, 120 }, + { xi.item.STRIP_OF_MEAT_JERKY, 120 }, + { xi.item.CHUNK_OF_ROCK_SALT, 16 }, + { xi.item.BAG_OF_RYE_FLOUR, 40 }, + { xi.item.BAG_OF_SAN_DORIAN_FLOUR, 60 }, + { xi.item.SAN_DORIAN_CARROT, 32 }, + { xi.item.EAR_OF_MILLIONCORN, 48 }, + { xi.item.SPRIG_OF_APPLE_MINT, 316 }, + { xi.item.FLASK_OF_DISTILLED_WATER, 12 }, + } + else + stock = + { + { xi.item.STRIP_OF_MEAT_JERKY, 120 }, + { xi.item.CHUNK_OF_ROCK_SALT, 16 }, + { xi.item.BAG_OF_RYE_FLOUR, 40 }, + { xi.item.FLASK_OF_DISTILLED_WATER, 12 }, } end - player:showText(npc, ID.text.KOMALATA_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.KOMALATA_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua b/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua index 19c058b1a67..efab67f15e5 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua @@ -8,28 +8,30 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 17005, 108, }, -- Lufaise Fly - { 17383, 2640, }, -- Clothespole - { 688, 20, }, -- Arrowwood Log - { 690, 7800, }, -- Elm Log - { 2871, 10000, }, -- Safehold Waystone - { 4913, 175827, }, -- Scroll of Distract II - { 4915, 217000, }, -- Scroll of Frazzle II - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 17005, 108, }, -- Lufaise Fly - { 17383, 2640, }, -- Clothespole - { 688, 20, }, -- Arrowwood Log - { 690, 7800, }, -- Elm Log - { 4638, 66000, }, -- Banish III - { 2871, 10000, }, -- Safehold Waystone - { 4913, 175827, }, -- Scroll of Distract II - { 4915, 217000, }, -- Scroll of Frazzle II + { xi.item.LUFAISE_FLY, 108 }, + { xi.item.CLOTHESPOLE, 2640 }, + { xi.item.ARROWWOOD_LOG, 20 }, + { xi.item.ELM_LOG, 7800 }, + { xi.item.SCROLL_OF_BANISH_III, 66000 }, + { xi.item.SAFEHOLD_WAYSTONE, 10000 }, + { xi.item.SCROLL_OF_DISTRACT_II, 175827 }, + { xi.item.SCROLL_OF_FRAZZLE_II, 217000 }, + } + else + stock = + { + { xi.item.LUFAISE_FLY, 108 }, + { xi.item.CLOTHESPOLE, 2640 }, + { xi.item.ARROWWOOD_LOG, 20 }, + { xi.item.ELM_LOG, 7800 }, + { xi.item.SAFEHOLD_WAYSTONE, 10000 }, + { xi.item.SCROLL_OF_DISTRACT_II, 175827 }, + { xi.item.SCROLL_OF_FRAZZLE_II, 217000 }, } end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua b/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua index 36bcc84f466..b079e647ef8 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua @@ -2,25 +2,31 @@ -- Area: Tavnazian Safehold -- NPC: Melleupaux ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 16450, 2030, }, -- Dagger - { 16566, 9216, }, -- Longsword - { 17335, 4, }, -- Rusty Bolt - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then - table.insert(stock, { 18375, 37296, }) -- Falx - table.insert(stock, { 18214, 20762, }) -- Voulge + stock = + { + { xi.item.DAGGER, 2030 }, + { xi.item.LONGSWORD, 9216 }, + { xi.item.RUSTY_BOLT, 4 }, + { xi.item.FALX, 37296 }, + { xi.item.VOULGE, 20762 }, + } + else + stock = + { + { xi.item.DAGGER, 2030 }, + { xi.item.LONGSWORD, 9216 }, + { xi.item.RUSTY_BOLT, 4 }, + } end - player:showText(npc, ID.text.MELLEUPAUX_SHOP_DIALOG) -- 10910 without ch4 complete, may change + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.MELLEUPAUX_SHOP_DIALOG) -- 10910 without ch4 complete, may change xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua b/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua index c198263d8e6..03315cb8c9b 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua @@ -2,32 +2,32 @@ -- Area: Tavnasian Safehold -- NPC: Migran ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 12577, 2485, }, -- Brass Harness - { 12985, 1625, }, -- Holly Clogs - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 14317, 101055, }, -- Barone Cosciales - { 15305, 630255, }, -- Barone Gambieras - { 14848, 181905, }, -- Barone Manopolas - { 12577, 2485, }, -- Brass Harness - { 12985, 1625, }, -- Holly Clogs - { 15389, 8000000, }, -- Vir Subligar - { 15390, 8000000, }, -- Femina Subligar + { xi.item.BARONE_COSCIALES, 101055 }, + { xi.item.BARONE_GAMBIERAS, 630255 }, + { xi.item.BARONE_MANOPOLAS, 181905 }, + { xi.item.BRASS_HARNESS, 2485 }, + { xi.item.HOLLY_CLOGS, 1625 }, + { xi.item.VIR_SUBLIGAR, 8000000 }, + { xi.item.FEMINA_SUBLIGAR, 8000000 }, + } + else + stock = + { + { xi.item.BRASS_HARNESS, 2485 }, + { xi.item.HOLLY_CLOGS, 1625 }, } end - player:showText(npc, ID.text.MIGRAN_SHOP_DIALOG) -- 10914 with 2 items available, may change + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.MIGRAN_SHOP_DIALOG) -- 10914 with 2 items available, may change xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua b/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua index 41e56575386..83901dfc64d 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua @@ -2,32 +2,32 @@ -- Area: Tavnazian Safehold -- NPC: Misseulieu ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 12577, 2485, }, -- Brass Harness - { 12985, 1625, }, -- Holly Clogs - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 14317, 101055, }, -- Barone Cosciales - { 15305, 630255, }, -- Barone Gambieras - { 14848, 181905, }, -- Barone Manopolas - { 12577, 2485, }, -- Brass Harness - { 12985, 1625, }, -- Holly Clogs - { 15389, 8000000, }, -- Vir Subligar - { 15390, 8000000, }, -- Femina Subligar + { xi.item.BARONE_COSCIALES, 101055 }, + { xi.item.BARONE_GAMBIERAS, 630255 }, + { xi.item.BARONE_MANOPOLAS, 181905 }, + { xi.item.BRASS_HARNESS, 2485 }, + { xi.item.HOLLY_CLOGS, 1625 }, + { xi.item.VIR_SUBLIGAR, 8000000 }, + { xi.item.FEMINA_SUBLIGAR, 8000000 }, + } + else + stock = + { + { xi.item.BRASS_HARNESS, 2485 }, + { xi.item.HOLLY_CLOGS, 1625 }, } end - player:showText(npc, ID.text.MISSEULIEU_SHOP_DIALOG) -- 10912 at least with 2 items available + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.MISSEULIEU_SHOP_DIALOG) -- 10912 at least with 2 items available xi.shop.general(player, stock) end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua b/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua index 07516822756..dbadbcb7e5a 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua @@ -2,38 +2,38 @@ -- Area: Tavnazian Safehold -- NPC: Nilerouche ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) - local stock = - { - { 17005, 108, }, -- Lufaise Fly - { 17383, 2640, }, -- Clothespole - { 688, 20, }, -- Arrowwood Log - { 690, 7800, }, -- Elm Log - { 2871, 10000, }, -- Safehold Waystone - { 4913, 175827, }, -- Scroll of Distract II - { 4915, 217000, }, -- Scroll of Frazzle II - } + local stock = {} if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.SHELTERING_DOUBT then stock = { - { 17005, 108, }, -- Lufaise Fly - { 17383, 2640, }, -- Clothespole - { 688, 20, }, -- Arrowwood Log - { 690, 7800, }, -- Elm Log - { 4638, 66000, }, -- Banish III - { 2871, 10000, }, -- Safehold Waystone - { 4913, 175827, }, -- Scroll of Distract II - { 4915, 217000, }, -- Scroll of Frazzle II + { xi.item.LUFAISE_FLY, 108 }, + { xi.item.CLOTHESPOLE, 2640 }, + { xi.item.ARROWWOOD_LOG, 20 }, + { xi.item.ELM_LOG, 7800 }, + { xi.item.SCROLL_OF_BANISH_III, 66000 }, + { xi.item.SAFEHOLD_WAYSTONE, 10000 }, + { xi.item.SCROLL_OF_DISTRACT_II, 175827 }, + { xi.item.SCROLL_OF_FRAZZLE_II, 217000 }, + } + else + stock = + { + { xi.item.LUFAISE_FLY, 108 }, + { xi.item.CLOTHESPOLE, 2640 }, + { xi.item.ARROWWOOD_LOG, 20 }, + { xi.item.ELM_LOG, 7800 }, + { xi.item.SAFEHOLD_WAYSTONE, 10000 }, + { xi.item.SCROLL_OF_DISTRACT_II, 175827 }, + { xi.item.SCROLL_OF_FRAZZLE_II, 217000 }, } end - player:showText(npc, ID.text.NILEROUCHE_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.TAVNAZIAN_SAFEHOLD].text.NILEROUCHE_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua index 1d14422aa02..17c1f32e33f 100644 --- a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua +++ b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua @@ -4,33 +4,31 @@ -- Note: Available during Campaign battles -- !pos 382.679 -39.999 3.541 175 ----------------------------------- -local ID = zones[xi.zone.THE_ELDIEME_NECROPOLIS_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 6049, 8060, }, -- Firestorm Schema - { 6050, 6318, }, -- Rainstorm Schema - { 6051, 9100, }, -- Thunderstorm Schema - { 6052, 8580, }, -- Hailstorm Schema - { 6053, 5200, }, -- Sandstorm Schema - { 6054, 6786, }, -- Windstorm Schema - { 6055, 11440, }, -- Aurorastorm Schema - { 6056, 10725, }, -- Voidstorm Schema - { 6041, 7714, }, -- Pyrohelix Schema - { 6042, 6786, }, -- Hydrohelix Schema - { 6043, 8625, }, -- Ionohelix Schema - { 6044, 7896, }, -- Cryohelix Schema - { 6045, 6591, }, -- Geohelix Schema - { 6046, 6981, }, -- Anemohelix Schema - { 6047, 8940, }, -- Luminohelix Schema - { 6048, 8790, }, -- Noctohelix Schema + { xi.item.FIRESTORM_SCHEMA, 8060 }, + { xi.item.RAINSTORM_SCHEMA, 6318 }, + { xi.item.THUNDERSTORM_SCHEMA, 9100 }, + { xi.item.HAILSTORM_SCHEMA, 8580 }, + { xi.item.SANDSTORM_SCHEMA, 5200 }, + { xi.item.WINDSTORM_SCHEMA, 6786 }, + { xi.item.AURORASTORM_SCHEMA, 11440 }, + { xi.item.VOIDSTORM_SCHEMA, 10725 }, + { xi.item.PYROHELIX_SCHEMA, 7714 }, + { xi.item.HYDROHELIX_SCHEMA, 6786 }, + { xi.item.IONOHELIX_SCHEMA, 8625 }, + { xi.item.CRYOHELIX_SCHEMA, 7896 }, + { xi.item.GEOHELIX_SCHEMA, 6591 }, + { xi.item.ANEMOHELIX_SCHEMA, 6981 }, + { xi.item.LUMINOHELIX_SCHEMA, 8940 }, + { xi.item.NOCTOHELIX_SCHEMA, 8790 }, } - player:showText(npc, ID.text.LAYTON_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.THE_ELDIEME_NECROPOLIS_S].text.LAYTON_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua index 80ec6c2e31c..aff00117be2 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua @@ -2,27 +2,25 @@ -- Area: Windurst Waters [S] -- NPC: Ezura-Romazura ----------------------------------- -local ID = zones[xi.zone.WINDURST_WATERS_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4771, 123750, }, -- Scroll of Stone V - { 4781, 133110, }, -- Scroll of Water V - { 4766, 144875, }, -- Scroll of Aero V - { 4756, 162500, }, -- Scroll of Fire V - { 4761, 186375, }, -- Scroll of Blizzard V - { 4893, 168150, }, -- Scroll of Stoneja - { 4895, 176700, }, -- Scroll of Waterja - { 4890, 193800, }, -- Scroll of Firaja - { 4892, 185240, }, -- Scroll of Aeroja - { 4863, 126000, }, -- Scroll of Break + { xi.item.SCROLL_OF_STONE_V, 123750 }, + { xi.item.SCROLL_OF_WATER_V, 133110 }, + { xi.item.SCROLL_OF_AERO_V, 144875 }, + { xi.item.SCROLL_OF_FIRE_V, 162500 }, + { xi.item.SCROLL_OF_BLIZZARD_V, 186375 }, + { xi.item.SCROLL_OF_STONEJA, 168150 }, + { xi.item.SCROLL_OF_WATERJA, 176700 }, + { xi.item.SCROLL_OF_FIRAJA, 193800 }, + { xi.item.SCROLL_OF_AEROJA, 185240 }, + { xi.item.SCROLL_OF_BREAK, 126000 }, } - player:showText(npc, ID.text.EZURAROMAZURA_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.WINDURST_WATERS_S].text.EZURAROMAZURA_SHOP_DIALOG) xi.shop.general(player, stock) end diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua index 40dbc0bcc14..694595fd22a 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua @@ -2,21 +2,19 @@ -- Area: Windurst Waters (S) -- NPC: Pelftrix ----------------------------------- -local ID = zones[xi.zone.WINDURST_WATERS_S] ------------------------------------ ---@type TNpcEntity local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4116, 4500, }, -- Hi-Potion - { 4132, 28000, }, -- Hi-Ether - { 1020, 300, }, -- Sickle - { 1021, 500, }, -- Hatchet + { xi.item.HI_POTION, 4500 }, + { xi.item.HI_ETHER, 28000 }, + { xi.item.SICKLE, 300 }, + { xi.item.HATCHET, 500 }, } - player:showText(npc, ID.text.PELFTRIX_SHOP_DIALOG) + player:showText(npc, zones[xi.zone.WINDURST_WATERS_S].text.PELFTRIX_SHOP_DIALOG) xi.shop.general(player, stock) end