From 27d9d96ac96539e6c7a9ca1a6aebad0ddf08cf85 Mon Sep 17 00:00:00 2001 From: Hatberg <46464306+Hatberg@users.noreply.github.com> Date: Thu, 2 Apr 2026 19:14:47 +0200 Subject: [PATCH] Replace magic numbers in TOAU shops --- scripts/enum/item.lua | 1 + .../Aht_Urhgan_Whitegate/npcs/Bajahb.lua | 10 +++--- .../zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua | 10 +++--- .../Aht_Urhgan_Whitegate/npcs/Fayeewah.lua | 4 +-- .../Aht_Urhgan_Whitegate/npcs/Gavrie.lua | 22 ++++++------ .../Aht_Urhgan_Whitegate/npcs/Hagakoff.lua | 34 +++++++++---------- .../npcs/Khaf_Jhifanm.lua | 12 +++---- .../npcs/Kulh_Amariyo.lua | 10 +++--- .../Aht_Urhgan_Whitegate/npcs/Malfud.lua | 12 +++---- .../Aht_Urhgan_Whitegate/npcs/Mazween.lua | 32 ++++++++--------- .../Aht_Urhgan_Whitegate/npcs/Mulnith.lua | 6 ++-- .../Aht_Urhgan_Whitegate/npcs/Rubahah.lua | 8 ++--- .../Aht_Urhgan_Whitegate/npcs/Saluhwa.lua | 10 +++--- .../Aht_Urhgan_Whitegate/npcs/Yafaaf.lua | 4 +-- scripts/zones/Al_Zahbi/npcs/Allard.lua | 10 +++--- scripts/zones/Al_Zahbi/npcs/Chayaya.lua | 34 +++++++++---------- .../zones/Al_Zahbi/npcs/Kahah_Hobichai.lua | 12 +++---- scripts/zones/Al_Zahbi/npcs/Zafif.lua | 32 ++++++++--------- scripts/zones/Selbina/npcs/Melyon.lua | 8 ++--- scripts/zones/Selbina/npcs/Romeo.lua | 10 +++--- 20 files changed, 141 insertions(+), 140 deletions(-) diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index 033756ab5ab..6666ed57ba1 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -7220,6 +7220,7 @@ xi.item = METAL_KNUCKLES = 16392, KOENIGS_KNUCKLES = 16396, KATARS = 16399, + DARKSTEEL_KATARS = 16400, JAMADHARS = 16401, CAT_BAGHNAKHS = 16405, BAGHNAKHS = 16406, diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua index 33ce8cfca2e..6c36163fa1d 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua @@ -10,11 +10,11 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 12424, 10260, }, -- Iron Mask - { 12552, 15840, }, -- Chainmail - { 12680, 8460, }, -- Chain Mittens - { 12808, 12600, }, -- Chain Hose - { 12936, 7740, }, -- Greaves + { xi.item.IRON_MASK, 10260, }, + { xi.item.CHAINMAIL, 15840, }, + { xi.item.CHAIN_MITTENS, 8460, }, + { xi.item.CHAIN_HOSE, 12600, }, + { xi.item.GREAVES, 7740, }, } player:showText(npc, ID.text.BAJAHB_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua index e3fa556d293..f92fda846ea 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua @@ -10,11 +10,11 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 17395, 9, }, -- Lugworm - { 17396, 3, }, -- Little worm - { 17016, 11, }, -- Pet Food Alpha Biscuit - { 17017, 82, }, -- Pet Food Beta Biscuit - { 17862, 98, }, -- Jug of Bug Broth + { xi.item.LUGWORM, 9, }, + { xi.item.LITTLE_WORM, 3, }, + { xi.item.PET_FOOD_ALPHA_BISCUIT, 11, }, + { xi.item.PET_FOOD_BETA_BISCUIT, 82, }, + { xi.item.JUG_OF_BUG_BROTH, 98, }, } player:showText(npc, ID.text.DWAGO_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua index 4fc5f434ba8..cab44aff196 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua @@ -10,8 +10,8 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 5570, 68, }, -- Cup of Chai - { 5572, 2075, }, -- Irmik Helvasi + { xi.item.CUP_OF_CHAI, 68, }, + { xi.item.IRMIK_HELVASI, 2075, }, } player:showText(npc, ID.text.FAYEEWAH_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua index c4d8fd38933..6e6a2811c0d 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua @@ -10,17 +10,17 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4150, 2595, }, -- Eye Drops - { 4148, 316, }, -- Antidote - { 4151, 800, }, -- Echo Drops - { 4112, 910, }, -- Potion - { 4128, 4832, }, -- Ether - { 4155, 3360, }, -- Remedy - { 4509, 12, }, -- Distilled Water - { 18731, 50, }, -- Automaton Oil - { 18732, 250, }, -- Automaton Oil +1 - { 18733, 500, }, -- Automaton Oil +2 - { 19185, 1000, }, -- Automaton Oil +3 + { xi.item.FLASK_OF_EYE_DROPS, 2595, }, + { xi.item.ANTIDOTE, 316, }, + { xi.item.FLASK_OF_ECHO_DROPS, 800, }, + { xi.item.POTION, 910, }, + { xi.item.ETHER, 4832, }, + { xi.item.REMEDY, 3360, }, + { xi.item.FLASK_OF_DISTILLED_WATER, 12, }, + { xi.item.CAN_OF_AUTOMATON_OIL, 50, }, + { xi.item.CAN_OF_AUTOMATON_OIL_P1, 250, }, + { xi.item.CAN_OF_AUTOMATON_OIL_P2, 500, }, + { xi.item.CAN_OF_AUTOMATON_OIL_P3, 1000, }, } player:showText(npc, ID.text.GAVRIE_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua index 7deeb83663a..637b49e7000 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua @@ -12,23 +12,23 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 16399, 15448, }, -- Katars (Requires Astral Candescence) - { 16400, 67760, }, -- Darksteel Katars - { 16419, 45760, }, -- Patas (Requires Astral Candescence) - { 16448, 156, }, -- Bronze Dagger - { 16450, 2030, }, -- Dagger - { 16551, 776, }, -- Sapara - { 16552, 4525, }, -- Scimitar - { 16553, 38800, }, -- Tulwar (Requires Astral Candescence) - { 16657, 6600, }, -- Tabar - { 16658, 124305, }, -- Darksteel Tabar (Requires Astral Candescence) - { 16704, 672, }, -- Butterfly Axe - { 16705, 4550, }, -- Greataxe (Requires Astral Candescence) - { 16768, 344, }, -- Bronze Zaghnal - { 16770, 12540, }, -- Zaghnal (Requires Astral Candescence) - { 17024, 72, }, -- Ash Club - { 17025, 1740, }, -- Chestnut Club (Requires Astral Candescence) - { 18259, 238, }, -- Angon + { xi.item.KATARS, 15448, }, -- (Requires Astral Candescence) + { xi.item.DARKSTEEL_KATARS, 67760, }, + { xi.item.PATAS, 45760, }, -- (Requires Astral Candescence) + { xi.item.BRONZE_DAGGER, 156, }, + { xi.item.DAGGER, 2030, }, + { xi.item.SAPARA, 776, }, + { xi.item.SCIMITAR, 4525, }, + { xi.item.TULWAR, 38800, }, -- (Requires Astral Candescence) + { xi.item.TABAR, 6600, }, + { xi.item.DARKSTEEL_TABAR, 124305, }, -- (Requires Astral Candescence) + { xi.item.BUTTERFLY_AXE, 672, }, + { xi.item.GREATAXE, 4550, }, -- (Requires Astral Candescence) + { xi.item.BRONZE_ZAGHNAL, 344, }, + { xi.item.ZAGHNAL, 12540, }, -- (Requires Astral Candescence) + { xi.item.ASH_CLUB, 72, }, + { xi.item.CHESTNUT_CLUB, 1740, }, -- (Requires Astral Candescence) + { xi.item.ANGON, 238, }, } player:showText(npc, ID.text.HAGAKOFF_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua index 7b54e73ce31..0b15f1ed5be 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua @@ -10,12 +10,12 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 5567, 200, }, -- Dried Date - { 5576, 800, }, -- Ayran - { 5590, 3750, }, -- Balik Sandvici - { 2235, 320, }, -- Wildgrass Seeds - { 5075, 4400, }, -- Scroll of Raptor Mazurka - { 2872, 10000, }, -- Empire Waystone + { xi.item.DRIED_DATE, 200, }, + { xi.item.FLASK_OF_AYRAN, 800, }, + { xi.item.BALIK_SANDVICI, 3750, }, + { xi.item.BAG_OF_WILDGRASS_SEEDS, 320, }, + { xi.item.SCROLL_OF_RAPTOR_MAZURKA, 4400, }, + { xi.item.EMPIRE_WAYSTONE, 10000, }, } player:showText(npc, ID.text.KHAFJHIFANM_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua index 52e827384aa..51a4b9c1ef8 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua @@ -12,11 +12,11 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4472, 38, }, -- Crayfish - { 5458, 1200, }, -- Yilanbaligi (Requires Astral Candescence) - { 5459, 1800, }, -- Sazanbaligu (Requires Astral Candescence) - { 5460, 4650, }, -- Kayabaligi (Requires Astral Candescence) - { 5461, 130, }, -- Alabaligi (Requires Astral Candescence) + { xi.item.CRAYFISH_1, 38, }, + { xi.item.YILANBALIGI, 1200, }, -- (Requires Astral Candescence) + { xi.item.SAZANBALIGI, 1800, }, -- (Requires Astral Candescence) + { xi.item.KAYABALIGI, 4650, }, -- (Requires Astral Candescence) + { xi.item.ALABALIGI, 130, }, -- (Requires Astral Candescence) } player:showText(npc, ID.text.KULHAMARIYO_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua index 160342a6bef..3214bd8a9e3 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua @@ -10,12 +10,12 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 936, 16, }, -- Rock Salt - { 626, 255, }, -- Black Pepper - { 633, 16, }, -- Olive Oil - { 4388, 44, }, -- Eggplant - { 4390, 40, }, -- Mithran Tomato - { 2213, 12, }, -- Pine Nuts + { xi.item.CHUNK_OF_ROCK_SALT, 16, }, + { xi.item.PINCH_OF_BLACK_PEPPER, 255, }, + { xi.item.FLASK_OF_OLIVE_OIL, 16, }, + { xi.item.EGGPLANT, 44, }, + { xi.item.MITHRAN_TOMATO, 40, }, + { xi.item.HANDFUL_OF_PINE_NUTS, 12, }, } player:showText(npc, ID.text.MALFUD_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua index bdc3ef9918d..ffb8793d9b8 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua @@ -10,22 +10,22 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4881, 11200, }, -- Scroll of Sleepga - { 4867, 18720, }, -- Scroll of Sleep II - { 4829, 25200, }, -- Poison II - { 4839, 14000, }, -- Bio II - { 4833, 5160, }, -- Poisonga - { 4769, 19932, }, -- Stone III - { 4779, 22682, }, -- Water III - { 4764, 27744, }, -- Aero III - { 4754, 33306, }, -- Fire III - { 4759, 39368, }, -- Blizzard III - { 4774, 45930, }, -- Thunder III - { 4883, 27000, }, -- Absorb-TP - { 4854, 30780, }, -- Drain II - { 4885, 70560, }, -- Dread Spikes - { 4886, 44000, }, -- Absorb-ACC - { 4856, 79800, }, -- Aspir II + { xi.item.SCROLL_OF_SLEEPGA, 11200, }, + { xi.item.SCROLL_OF_SLEEP_II, 18720, }, + { xi.item.SCROLL_OF_POISON_II, 25200, }, + { xi.item.SCROLL_OF_BIO_II, 14000, }, + { xi.item.SCROLL_OF_POISONGA, 5160, }, + { xi.item.SCROLL_OF_STONE_III, 19932, }, + { xi.item.SCROLL_OF_WATER_III, 22682, }, + { xi.item.SCROLL_OF_AERO_III, 27744, }, + { xi.item.SCROLL_OF_FIRE_III, 33306, }, + { xi.item.SCROLL_OF_BLIZZARD_III, 39368, }, + { xi.item.SCROLL_OF_THUNDER_III, 45930, }, + { xi.item.SCROLL_OF_ABSORB_TP, 27000, }, + { xi.item.SCROLL_OF_DRAIN_II, 30780, }, + { xi.item.SCROLL_OF_DREAD_SPIKES, 70560, }, + { xi.item.SCROLL_OF_ABSORB_ACC, 44000, }, + { xi.item.SCROLL_OF_ASPIR_II, 79800, }, } player:showText(npc, ID.text.MAZWEEN_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua index 161ad8725ad..253ae688a7d 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua @@ -12,9 +12,9 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4410, 344, }, -- Roast Mushroom - { 5598, 2000, }, -- Sis Kebabi (Requires Astral Candescence) - { 5600, 3000, }, -- Balik Sis (Requires Astral Candescence) + { xi.item.ROAST_MUSHROOM, 344, }, + { xi.item.SIS_KEBABI, 2000, }, -- (Requires Astral Candescence) + { xi.item.BALIK_SIS, 3000, }, -- (Requires Astral Candescence) } player:showText(npc, ID.text.MULNITH_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua index a3ad501dcf7..b64eb1b9a65 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua @@ -12,10 +12,10 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 629, 48, }, -- Millioncorn - { 2237, 60, }, -- Imperial Flour (Requires Astral Candescence) - { 2214, 68, }, -- Imperial Rice (Requires Astral Candescence) - { 2271, 316, }, -- Coffee Beans (Requires Astral Candescence) + { xi.item.EAR_OF_MILLIONCORN, 48, }, + { xi.item.BAG_OF_IMPERIAL_FLOUR, 60, }, -- (Requires Astral Candescence) + { xi.item.BAG_OF_IMPERIAL_RICE, 68, }, -- (Requires Astral Candescence) + { xi.item.BAG_OF_COFFEE_BEANS, 316, }, -- (Requires Astral Candescence) } player:showText(npc, ID.text.RUBAHAH_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua index 16748866a94..e198e5b17d4 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua @@ -12,11 +12,11 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 12290, 605, }, -- Mapple Shield (Requires Astral Candescence) - { 12291, 1815, }, -- Elm Shield (Requires Astral Candescence) - { 12292, 4980, }, -- Mahogany Shield (Requires Astral Candescence) - { 12293, 15600, }, -- Oak Shield (Requires Astral Candescence) - { 12295, 64791, }, -- Round Shield (Requires Astral Candescence) + { xi.item.MAPLE_SHIELD, 605, }, -- (Requires Astral Candescence) + { xi.item.ELM_SHIELD, 1815, }, -- (Requires Astral Candescence) + { xi.item.MAHOGANY_SHIELD, 4980, }, -- (Requires Astral Candescence) + { xi.item.OAK_SHIELD, 15600, }, -- (Requires Astral Candescence) + { xi.item.ROUND_SHIELD, 64791, }, -- (Requires Astral Candescence) } player:showText(npc, ID.text.SALUHWA_SHOP_DIALOG) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua index 76b412f4907..9706ed021d7 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua @@ -11,8 +11,8 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 5577, 1500, }, -- Sutlac - { 5592, 450, }, -- Imperial Coffee + { xi.item.BOWL_OF_SUTLAC, 1500, }, + { xi.item.CUP_OF_IMPERIAL_COFFEE, 450, }, } player:showText(npc, ID.text.YAFAAF_SHOP_DIALOG) diff --git a/scripts/zones/Al_Zahbi/npcs/Allard.lua b/scripts/zones/Al_Zahbi/npcs/Allard.lua index 171d59d742c..de9103111f3 100644 --- a/scripts/zones/Al_Zahbi/npcs/Allard.lua +++ b/scripts/zones/Al_Zahbi/npcs/Allard.lua @@ -10,11 +10,11 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 12466, 20000, }, --Red Cap - { 12594, 32500, }, --Gambison - { 12722, 16900, }, --Bracers - { 12850, 24500, }, --Hose - { 12978, 16000, }, --Socks + { xi.item.RED_CAP, 20000, }, + { xi.item.GAMBISON, 32500, }, + { xi.item.BRACERS, 16900, }, + { xi.item.HOSE, 24500, }, + { xi.item.SOCKS, 16000, }, } player:showText(npc, ID.text.ALLARD_SHOP_DIALOG) diff --git a/scripts/zones/Al_Zahbi/npcs/Chayaya.lua b/scripts/zones/Al_Zahbi/npcs/Chayaya.lua index 544a4d830d8..c8623ec8449 100644 --- a/scripts/zones/Al_Zahbi/npcs/Chayaya.lua +++ b/scripts/zones/Al_Zahbi/npcs/Chayaya.lua @@ -10,23 +10,23 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 17307, 10, }, -- Dart - { 17308, 60, }, -- Hawkeye - { 17313, 1204, }, -- Grenade - { 17320, 8, }, -- Iron Arrow - { 5477, 68000, }, -- Warrior Die - { 5478, 22400, }, -- Monk Die - { 5479, 5000, }, -- White Mage Die - { 5480, 108000, }, -- Black Mage Die - { 5481, 62000, }, -- Red Mage Die - { 5482, 50400, }, -- Thief Die - { 5483, 90750, }, -- Paladin Die - { 5484, 2205, }, -- Dark Knight Die - { 5485, 26600, }, -- Beastmaster Die - { 5486, 12780, }, -- Bard Die - { 5487, 1300, }, -- Ranger Die - { 5495, 63375, }, -- Dancer Die - { 5496, 68250, }, -- Scholar Die + { xi.item.DART, 10, }, + { xi.item.HAWKEYE, 60, }, + { xi.item.GRENADE, 1204, }, + { xi.item.IRON_ARROW, 8, }, + { xi.item.WARRIOR_DIE, 68000, }, + { xi.item.MONK_DIE, 22400, }, + { xi.item.WHITE_MAGE_DIE, 5000, }, + { xi.item.BLACK_MAGE_DIE, 108000, }, + { xi.item.RED_MAGE_DIE, 62000, }, + { xi.item.THIEF_DIE, 50400, }, + { xi.item.PALADIN_DIE, 90750, }, + { xi.item.DARK_KNIGHT_DIE, 2205, }, + { xi.item.BEASTMASTER_DIE, 26600, }, + { xi.item.BARD_DIE, 12780, }, + { xi.item.RANGER_DIE, 1300, }, + { xi.item.DANCER_DIE, 63375, }, + { xi.item.SCHOLAR_DIE, 68250, }, } player:showText(npc, ID.text.CHAYAYA_SHOP_DIALOG) diff --git a/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua b/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua index c89cf849ce5..deac97a030b 100644 --- a/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua +++ b/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua @@ -12,12 +12,12 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 90, 200, }, -- Rusty Bucket - { 605, 200, }, -- Pickaxe (Requires Astral Candescence) - { 1020, 300, }, -- Sickle (Requires Astral Candescence) - { 1021, 500, }, -- Hatchet (Requires Astral Candescence) - { 16465, 164, }, -- Bronze Knife - { 16466, 2425, }, -- Knife + { xi.item.RUSTY_BUCKET, 200, }, + { xi.item.PICKAXE, 200, }, -- (Requires Astral Candescence) + { xi.item.SICKLE, 300, }, -- (Requires Astral Candescence) + { xi.item.HATCHET, 500, }, -- (Requires Astral Candescence) + { xi.item.BRONZE_KNIFE, 164, }, + { xi.item.KNIFE, 2425, }, } player:showText(npc, ID.text.KAHAHHOBICHAI_SHOP_DIALOG) diff --git a/scripts/zones/Al_Zahbi/npcs/Zafif.lua b/scripts/zones/Al_Zahbi/npcs/Zafif.lua index 34898ca9b49..29b9d85cc18 100644 --- a/scripts/zones/Al_Zahbi/npcs/Zafif.lua +++ b/scripts/zones/Al_Zahbi/npcs/Zafif.lua @@ -10,22 +10,22 @@ local entity = {} entity.onTrigger = function(player, npc) local stock = { - { 4612, 23400, }, -- Scroll of Cure IV - { 4616, 11200, }, -- Scroll of Curaga II - { 4617, 19932, }, -- Scroll of Curaga III - { 4653, 32000, }, -- Scroll of Protect III - { 4654, 91116, }, -- Scroll of Protect IV - { 4736, 85500, }, -- Scroll of Protectra IV - { 4629, 35000, }, -- Scroll of Holy - { 4647, 20000, }, -- Scroll of Banishga II - { 4625, 2330, }, -- Scroll of Silena - { 4626, 19200, }, -- Scroll of Stona - { 4627, 13300, }, -- Scroll of Viruna - { 4628, 8586, }, -- Scroll of Cursna - { 4868, 77600, }, -- Scroll of Dispell - { 4720, 27000, }, -- Scroll of Flash - { 4750, 99375, }, -- Scroll of Reraise III - { 4715, 28500, }, -- Scroll of Reprisal + { xi.item.SCROLL_OF_CURE_IV, 23400, }, + { xi.item.SCROLL_OF_CURAGA_II, 11200, }, + { xi.item.SCROLL_OF_CURAGA_III, 19932, }, + { xi.item.SCROLL_OF_PROTECT_III, 32000, }, + { xi.item.SCROLL_OF_PROTECT_IV, 91116, }, + { xi.item.SCROLL_OF_PROTECTRA_IV, 85500, }, + { xi.item.SCROLL_OF_HOLY, 35000, }, + { xi.item.SCROLL_OF_BANISHGA_II, 20000, }, + { xi.item.SCROLL_OF_SILENA, 2330, }, + { xi.item.SCROLL_OF_STONA, 19200, }, + { xi.item.SCROLL_OF_VIRUNA, 13300, }, + { xi.item.SCROLL_OF_CURSNA, 8586, }, + { xi.item.SCROLL_OF_DISPEL, 77600, }, + { xi.item.SCROLL_OF_FLASH, 27000, }, + { xi.item.SCROLL_OF_RERAISE_III, 99375, }, + { xi.item.SCROLL_OF_REPRISAL, 28500, }, } player:showText(npc, ID.text.ZAFIF_SHOP_DIALOG) diff --git a/scripts/zones/Selbina/npcs/Melyon.lua b/scripts/zones/Selbina/npcs/Melyon.lua index 895371c241a..ceeb88e707a 100644 --- a/scripts/zones/Selbina/npcs/Melyon.lua +++ b/scripts/zones/Selbina/npcs/Melyon.lua @@ -10,10 +10,10 @@ local entity = {} entity.onTrade = function(player, npc, trade) if player:getQuestStatus(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.ONLY_THE_BEST) ~= xi.questStatus.QUEST_AVAILABLE then - if npcUtil.tradeHas(trade, { { 4366, 5 } }) then -- La Theine Cabbage x5 - player:startEvent(62, 0, 4366) - elseif npcUtil.tradeHas(trade, { { 629, 3 } }) then -- Millioncorn x3 - player:startEvent(63, 0, 629) + if npcUtil.tradeHas(trade, { { xi.item.LA_THEINE_CABBAGE, 5 } }) then -- La Theine Cabbage x5 + player:startEvent(62, 0, xi.item.LA_THEINE_CABBAGE) + elseif npcUtil.tradeHas(trade, { { xi.item.EAR_OF_MILLIONCORN, 3 } }) then -- Millioncorn x3 + player:startEvent(63, 0, xi.item.EAR_OF_MILLIONCORN) elseif npcUtil.tradeHas(trade, xi.item.CLUMP_OF_BOYAHDA_MOSS) then -- Boyahda Moss x1 player:startEvent(64, 0, xi.item.CLUMP_OF_BOYAHDA_MOSS) end diff --git a/scripts/zones/Selbina/npcs/Romeo.lua b/scripts/zones/Selbina/npcs/Romeo.lua index e99b408c15f..62fd081d438 100644 --- a/scripts/zones/Selbina/npcs/Romeo.lua +++ b/scripts/zones/Selbina/npcs/Romeo.lua @@ -11,11 +11,11 @@ entity.onTrade = function(player, npc, trade) if player:getQuestStatus(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.DONATE_TO_RECYCLING) == xi.questStatus.QUEST_ACCEPTED and ( - npcUtil.tradeHas(trade, { { 16482, 5 } }) or - npcUtil.tradeHas(trade, { { 16483, 5 } }) or - npcUtil.tradeHas(trade, { { 16534, 5 } }) or - npcUtil.tradeHas(trade, { { 17068, 5 } }) or - npcUtil.tradeHas(trade, { { 17104, 5 } }) + npcUtil.tradeHas(trade, { { xi.item.ONION_DAGGER, 5 } }) or + npcUtil.tradeHas(trade, { { xi.item.ONION_KNIFE, 5 } }) or + npcUtil.tradeHas(trade, { { xi.item.ONION_SWORD, 5 } }) or + npcUtil.tradeHas(trade, { { xi.item.ONION_ROD, 5 } }) or + npcUtil.tradeHas(trade, { { xi.item.ONION_STAFF, 5 } }) ) then player:startEvent(21) -- Finish quest "Donate to Recycling"