From b4dd0af85c10367e4293b6a843d24da707f4201a Mon Sep 17 00:00:00 2001 From: sruon Date: Fri, 12 Jun 2026 21:21:53 -0600 Subject: [PATCH] Amulya Guild Shop converted to lua --- scripts/data/guild_shops.lua | 80 ++++++++++++++++++++++++ scripts/enum/item.lua | 9 +++ scripts/zones/Metalworks/npcs/Amulya.lua | 2 +- sql/guild_shops.sql | 73 --------------------- sql/item_basic.sql | 22 +++---- 5 files changed, 101 insertions(+), 85 deletions(-) diff --git a/scripts/data/guild_shops.lua b/scripts/data/guild_shops.lua index 59951c95404..c7a92cff011 100644 --- a/scripts/data/guild_shops.lua +++ b/scripts/data/guild_shops.lua @@ -21,6 +21,86 @@ xi.data = xi.data or {} ---@type table xi.data.guildShops = { + ['Amulya'] = + { + hours = { 8, 23 }, + priceFloor = xi.guildPriceFloor.THREE_QUARTER_MAX, + stock = + { + { id = xi.item.CHUNK_OF_TIN_ORE, initial = 180, maxStock = 240, targetStock = 180, buyMax = 200, restockRate = 40 }, + { id = xi.item.CHUNK_OF_IRON_ORE, initial = 180, maxStock = 240, targetStock = 180, buyMax = 4500, restockRate = 30 }, + { id = xi.item.CHUNK_OF_MYTHRIL_ORE, initial = 0, maxStock = 240, targetStock = 180, buyMax = 10000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.CHUNK_OF_DARKSTEEL_ORE, initial = 0, maxStock = 240, targetStock = 180, buyMax = 28500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_INGOT, initial = 36, maxStock = 240, targetStock = 180, buyMax = 380, restockRate = 12 }, + { id = xi.item.IRON_INGOT, initial = 36, maxStock = 240, targetStock = 180, buyMax = 18000, restockRate = 12 }, + { id = xi.item.STEEL_INGOT, initial = 0, maxStock = 60, targetStock = 45, buyMax = 26250, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_INGOT, initial = 0, maxStock = 60, targetStock = 45, buyMax = 50000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_INGOT, initial = 0, maxStock = 60, targetStock = 45, buyMax = 142500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_SHEET, initial = 36, maxStock = 240, targetStock = 180, buyMax = 460, restockRate = 12 }, + { id = xi.item.IRON_SHEET, initial = 36, maxStock = 240, targetStock = 180, buyMax = 27000, restockRate = 12 }, + { id = xi.item.STEEL_SHEET, initial = 0, maxStock = 240, targetStock = 180, buyMax = 42000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_SHEET, initial = 0, maxStock = 240, targetStock = 180, buyMax = 60000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_SHEET, initial = 0, maxStock = 240, targetStock = 180, buyMax = 171000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.HANDFUL_OF_BRONZE_SCALES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 540, restockRate = 0 }, -- targetStock assumed + { id = xi.item.HANDFUL_OF_IRON_SCALES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 31500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.HANDFUL_OF_STEEL_SCALES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 49500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.IRON_CHAIN, initial = 0, maxStock = 60, targetStock = 45, buyMax = 31500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_CHAIN, initial = 0, maxStock = 60, targetStock = 45, buyMax = 199500, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_KNUCKLES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 1220, restockRate = 0 }, + { id = xi.item.METAL_KNUCKLES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 26190, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_KNUCKLES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 103320, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_KNUCKLES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 233700, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BAGHNAKHS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 43200, restockRate = 0 }, -- targetStock assumed + { id = xi.item.PATAS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 228800, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_KNIFE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 820, restockRate = 0 }, -- targetStock assumed + { id = xi.item.KNIFE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 12125, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_KNIFE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 72800, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_KNIFE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 288600, restockRate = 0 }, -- targetStock assumed + { id = xi.item.KUKRI, initial = 0, maxStock = 60, targetStock = 45, buyMax = 31050, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_KUKRI, initial = 0, maxStock = 60, targetStock = 45, buyMax = 99360, restockRate = 0 }, -- targetStock assumed + { id = xi.item.SCIMITAR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 22625, restockRate = 0 }, -- targetStock assumed + { id = xi.item.TULWAR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 194000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.FALCHION, initial = 0, maxStock = 60, targetStock = 45, buyMax = 340000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DARKSTEEL_FALCHION, initial = 0, maxStock = 60, targetStock = 45, buyMax = 555000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BILBO, initial = 0, maxStock = 60, targetStock = 45, buyMax = 17475, restockRate = 0 }, -- targetStock assumed + { id = xi.item.TUCK, initial = 0, maxStock = 60, targetStock = 45, buyMax = 64380, restockRate = 0 }, -- targetStock assumed + { id = xi.item.DEGEN, initial = 0, maxStock = 60, targetStock = 45, buyMax = 51120, restockRate = 0 }, -- targetStock assumed + { id = xi.item.SCHLAEGER, initial = 0, maxStock = 60, targetStock = 45, buyMax = 559000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_AXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 1580, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BATTLEAXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 61335, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MYTHRIL_AXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 243000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.TABAR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 330000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BUTTERFLY_AXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 3360, restockRate = 0 }, -- targetStock assumed + { id = xi.item.GREATAXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 22750, restockRate = 0 }, -- targetStock assumed + { id = xi.item.HEAVY_AXE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 206080, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_HAMMER, initial = 0, maxStock = 60, targetStock = 45, buyMax = 1700, restockRate = 0 }, -- targetStock assumed + { id = xi.item.WARHAMMER, initial = 0, maxStock = 60, targetStock = 45, buyMax = 32790, restockRate = 0 }, -- targetStock assumed + { id = xi.item.MAUL, initial = 0, maxStock = 60, targetStock = 45, buyMax = 79800, restockRate = 0 }, -- targetStock assumed + { id = xi.item.ARQUEBUS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 260200, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_LEGGINGS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 640, restockRate = 0 }, -- targetStock assumed + { id = xi.item.LEGGINGS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 78720, restockRate = 0 }, -- targetStock assumed + { id = xi.item.PLATE_LEGGINGS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 118800, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_CAP, initial = 0, maxStock = 60, targetStock = 45, buyMax = 840, restockRate = 0 }, -- targetStock assumed + { id = xi.item.PADDED_CAP, initial = 0, maxStock = 60, targetStock = 45, buyMax = 102000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_SUBLIGAR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 1040, restockRate = 0 }, -- targetStock assumed + { id = xi.item.IRON_SUBLIGAR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 126720, restockRate = 0 }, -- targetStock assumed + { id = xi.item.CUISSES, initial = 0, maxStock = 60, targetStock = 45, buyMax = 189000, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_MITTENS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 700, restockRate = 0 }, -- targetStock assumed + { id = xi.item.IRON_MITTENS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 86400, restockRate = 0 }, -- targetStock assumed + { id = xi.item.GAUNTLETS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 129600, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BRONZE_HARNESS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 1280, restockRate = 0 }, -- targetStock assumed + { id = xi.item.PADDED_ARMOR, initial = 0, maxStock = 60, targetStock = 45, buyMax = 157440, restockRate = 0 }, -- targetStock assumed + { id = xi.item.BREASTPLATE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 245700, restockRate = 0 }, -- targetStock assumed + { id = xi.item.GORGET, initial = 0, maxStock = 60, targetStock = 45, buyMax = 91800, restockRate = 0 }, -- targetStock assumed + { id = xi.item.ASPIS, initial = 0, maxStock = 60, targetStock = 45, buyMax = 4725, restockRate = 0 }, -- targetStock assumed + { id = xi.item.TARGE, initial = 0, maxStock = 60, targetStock = 45, buyMax = 61200, restockRate = 0 }, -- targetStock assumed + { id = xi.item.SCUTUM, initial = 0, maxStock = 60, targetStock = 45, buyMax = 273600, restockRate = 0 }, -- targetStock assumed + { id = xi.item.CROSSBOW_BOLT, initial = 0, maxStock = 240, targetStock = 180, buyMax = 30, restockRate = 0 }, + { id = xi.item.MYTHRIL_BOLT, initial = 0, maxStock = 240, targetStock = 180, buyMax = 120, restockRate = 0 }, + { id = xi.item.TATHLUM, initial = 0, maxStock = 240, targetStock = 180, buyMax = 1610, restockRate = 0 }, + { id = xi.item.BRONZE_BED, initial = 0, maxStock = 60, targetStock = 45, buyMax = 38925, restockRate = 0 }, -- targetStock assumed + }, + }, ['Beugungel'] = { hours = { 5, 22 }, diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index 2ab6ac39936..dc2fb7565fa 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -11,6 +11,7 @@ xi.item = { NONE = 0, PILE_OF_CHOCOBO_BEDDING = 1, + BRONZE_BED = 5, WORKBENCH = 22, OAK_TABLE = 24, DRAWING_DESK = 28, @@ -294,10 +295,12 @@ xi.item = HANDFUL_OF_BRONZE_SCALES = 672, HANDFUL_OF_BRASS_SCALES = 673, HANDFUL_OF_IRON_SCALES = 674, + HANDFUL_OF_STEEL_SCALES = 676, CHUNK_OF_ALUMINUM_ORE = 678, ALUMINUM_INGOT = 679, IRON_CHAIN = 680, MYTHRIL_CHAIN = 681, + DARKSTEEL_CHAIN = 682, ADAMAN_CHAIN = 683, CHUNK_OF_KHROMA_ORE = 685, IMPERIAL_WOOTZ_INGOT = 686, @@ -5340,6 +5343,7 @@ xi.item = FISH_SCALE_SHIELD = 12316, FLAME_SHIELD = 12317, ROYAL_GUARDS_SHIELD = 12321, + SCUTUM = 12323, TOWER_SHIELD = 12324, ROYAL_SQUIRES_SHIELD = 12336, DECURIONS_SHIELD = 12337, @@ -7452,6 +7456,8 @@ xi.item = BRONZE_KNUCKLES = 16390, BRASS_KNUCKLES = 16391, METAL_KNUCKLES = 16392, + MYTHRIL_KNUCKLES = 16393, + DARKSTEEL_KNUCKLES = 16394, KOENIGS_KNUCKLES = 16396, KATARS = 16399, DARKSTEEL_KATARS = 16400, @@ -7482,6 +7488,7 @@ xi.item = MYTHRIL_KNIFE = 16467, DARKSTEEL_KNIFE = 16468, KUKRI = 16473, + MYTHRIL_KUKRI = 16475, THIEFS_KNIFE = 16480, ONION_DAGGER = 16482, ONION_KNIFE = 16483, @@ -7498,6 +7505,7 @@ xi.item = JUNIOR_MUSKETEERS_TUCK = 16516, DEGEN = 16517, MYTHRIL_DEGEN = 16518, + SCHLAEGER = 16519, VERDUN = 16520, FLAME_DEGEN = 16522, FLEURET = 16524, @@ -7520,6 +7528,7 @@ xi.item = RIDILL = 16555, MUSKETEER_COMMANDERS_FALCHION = 16557, FALCHION = 16558, + DARKSTEEL_FALCHION = 16559, PLATINUM_CUTLASS = 16562, SPATHA = 16565, LONGSWORD = 16566, diff --git a/scripts/zones/Metalworks/npcs/Amulya.lua b/scripts/zones/Metalworks/npcs/Amulya.lua index 84ba7ed1fc2..9369b724bf1 100644 --- a/scripts/zones/Metalworks/npcs/Amulya.lua +++ b/scripts/zones/Metalworks/npcs/Amulya.lua @@ -8,7 +8,7 @@ local entity = {} entity.onTrigger = function(player, npc) - if player:sendGuild(5332, 8, 23, 2) then + if xi.guildShops.onTrigger(player, npc) then player:showText(npc, zones[xi.zone.METALWORKS].text.AMULYA_SHOP_DIALOG) end end diff --git a/sql/guild_shops.sql b/sql/guild_shops.sql index e83fe651903..9f8190913f6 100644 --- a/sql/guild_shops.sql +++ b/sql/guild_shops.sql @@ -1157,79 +1157,6 @@ INSERT INTO `guild_shops` VALUES (531,13783,81084,162345,60,0,0); -- iron_scale -- INSERT INTO `guild_shops` VALUES (531,13785,20240,45600,60,0,0); -- steel_scale_mail TODO: missing min_price and max_price -- INSERT INTO `guild_shops` VALUES (531,12306,20240,45600,60,0,0); -- kite_shield TODO: missing min_price and max_price --- Amulya (Metalworks) Smithing Guild (S) -INSERT INTO `guild_shops` VALUES (5332,641,30,66,240,48,180); -- chunk_of_tin_ore -INSERT INTO `guild_shops` VALUES (5332,643,675,3825,240,33,180); -- chunk_of_iron_ore -INSERT INTO `guild_shops` VALUES (5332,644,1500,9800,240,0,0); -- chunk_of_mythril_ore --- INSERT INTO `guild_shops` VALUES (5332,645,28272,28272,240,0,0); -- chunk_of_darksteel_ore TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,649,115,349,240,33,36); -- bronze_ingot -INSERT INTO `guild_shops` VALUES (5332,651,2700,13680,240,33,36); -- iron_ingot -INSERT INTO `guild_shops` VALUES (5332,652,3517,25620,60,0,0); -- steel_ingot -INSERT INTO `guild_shops` VALUES (5332,653,19900,36400,60,0,0); -- mythril_ingot --- INSERT INTO `guild_shops` VALUES (5332,654,19900,36400,60,0,0); -- darksteel_ingot TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,660,61,423,240,33,36); -- bronze_sheet -INSERT INTO `guild_shops` VALUES (5332,662,4050,20520,240,33,36); -- iron_sheet -INSERT INTO `guild_shops` VALUES (5332,666,14868,39984,240,0,0); -- steel_sheet -INSERT INTO `guild_shops` VALUES (5332,663,20240,45600,240,0,0); -- mythril_sheet -INSERT INTO `guild_shops` VALUES (5332,664,66690,66690,240,0,0); -- darksteel_sheet TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,672,81,254,60,0,0); -- handful_of_bronze_scales -INSERT INTO `guild_shops` VALUES (5332,674,4945,30744,60,0,0); -- handful_of_iron_scales -INSERT INTO `guild_shops` VALUES (5332,676,7350,13720,60,0,0); -- handful_of_steel_scales -INSERT INTO `guild_shops` VALUES (5332,680,11781,12411,60,0,0); -- iron_chain --- INSERT INTO `guild_shops` VALUES (5332,682,20240,45600,60,0,0); -- darksteel_chain TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16390,439,1161,60,0,0); -- bronze_knuckles --- INSERT INTO `guild_shops` VALUES (5332,16392,439,1161,60,0,0); -- metal_knuckles TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16393,439,1161,60,0,0); -- mythril_knuckles TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16394,439,1161,60,0,0); -- darksteel_knuckles TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16406,10713,17020,60,0,0); -- baghnakhs -INSERT INTO `guild_shops` VALUES (5332,16419,34320,76416,60,0,0); -- patas -INSERT INTO `guild_shops` VALUES (5332,16465,229,754,60,0,0); -- bronze_knife --- INSERT INTO `guild_shops` VALUES (5332,16466,439,1161,60,0,0); -- knife TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16467,22422,22422,60,0,0); -- mythril_knife --- INSERT INTO `guild_shops` VALUES (5332,16468,439,1161,60,0,0); -- darksteel_knife TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16473,439,1161,60,0,0); -- kukri TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16475,439,1161,60,0,0); -- mythril_kukri TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16552,8914,8914,60,0,0); -- scimitar --- INSERT INTO `guild_shops` VALUES (5332,16553,439,1161,60,0,0); -- tulwar TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16558,51000,81600,60,0,0); -- falchion --- INSERT INTO `guild_shops` VALUES (5332,16559,439,1161,60,0,0); -- darksteel_falchion TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16512,439,1161,60,0,0); -- bilbo TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16513,62834,62834,60,0,0); -- tuck TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16517,62834,62834,60,0,0); -- degen TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16519,62834,62834,60,0,0); -- schlaeger TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16640,290,2898,60,0,0); -- bronze_axe --- INSERT INTO `guild_shops` VALUES (5332,16643,62834,62834,60,0,0); -- battleaxe TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,16644,62834,62834,60,0,0); -- mythril_axe TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16657,95040,314160,60,0,0); -- tabar -INSERT INTO `guild_shops` VALUES (5332,16704,1323,3565,60,0,0); -- butterfly_axe --- INSERT INTO `guild_shops` VALUES (5332,16705,62834,62834,60,0,0); -- greataxe TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,16706,30912,90783,60,0,0); -- heavy_axe --- INSERT INTO `guild_shops` VALUES (5332,17042,290,2898,60,0,0); -- bronze_hammer TODO: missing min_price and max_price --- INSERT INTO `guild_shops` VALUES (5332,17044,290,2898,60,0,0); -- war_hammer TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,17045,11970,29366,60,0,0); -- maul --- INSERT INTO `guild_shops` VALUES (5332,17248,62834,62834,60,0,0); -- arquebus TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,12960,222,573,60,0,0); -- bronze_leggings -INSERT INTO `guild_shops` VALUES (5332,12962,27866,76830,60,0,0); -- leggings -INSERT INTO `guild_shops` VALUES (5332,12928,34927,45144,60,0,0); -- plate_leggings --- INSERT INTO `guild_shops` VALUES (5332,12448,290,705,60,0,0); -- bronze_cap TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,12450,15300,15300,60,0,0); -- padded_cap -INSERT INTO `guild_shops` VALUES (5332,12832,409,818,60,0,0); -- bronze_subligar -INSERT INTO `guild_shops` VALUES (5332,12836,19008,38565,60,0,0); -- iron_subligar -INSERT INTO `guild_shops` VALUES (5332,12800,34020,69552,60,0,0); -- cuisses -INSERT INTO `guild_shops` VALUES (5332,12704,191,394,60,0,0); -- bronze_mittens -INSERT INTO `guild_shops` VALUES (5332,12706,12960,12960,60,0,0); -- iron_mittens -INSERT INTO `guild_shops` VALUES (5332,12672,19440,23328,60,0,0); -- gauntlets --- INSERT INTO `guild_shops` VALUES (5332,12576,290,1249,60,0,0); -- bronze_harness TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,12578,61086,81086,60,0,0); -- padded_armor -INSERT INTO `guild_shops` VALUES (5332,12544,36855,83538,60,0,0); -- breastplate -INSERT INTO `guild_shops` VALUES (5332,13080,13770,14412,60,0,0); -- gorget -INSERT INTO `guild_shops` VALUES (5332,12299,708,2835,60,0,0); -- aspis -INSERT INTO `guild_shops` VALUES (5332,11872,59731,62834,60,0,0); -- targe --- INSERT INTO `guild_shops` VALUES (5332,12323,62834,62834,60,0,0); -- scutum TODO: missing min_price and max_price -INSERT INTO `guild_shops` VALUES (5332,17336,4,11,240,0,0); -- crossbow_bolt -INSERT INTO `guild_shops` VALUES (5332,17337,4,11,240,0,0); -- mythril_bolt -INSERT INTO `guild_shops` VALUES (5332,17298,38,38,240,0,0); -- tathlum TODO: missing min_price and max_price - -- Akamafula (Lower Jeuno) Tenshodo Merchent -- TODO: Audit and update Akamafula.lua. Converted from a guild merchant to a standard shop as of April 2018. INSERT INTO `guild_shops` VALUES (60417,16896,517,884,20,10,20); -- kunai INSERT INTO `guild_shops` VALUES (60417,16900,1404,2160,20,7,15); -- wakizashi diff --git a/sql/item_basic.sql b/sql/item_basic.sql index b6e028d2746..e0aabaef0c8 100644 --- a/sql/item_basic.sql +++ b/sql/item_basic.sql @@ -690,13 +690,13 @@ INSERT INTO `item_basic` VALUES (672,0,'handful_of_bronze_scales','bronze_scales INSERT INTO `item_basic` VALUES (673,0,'handful_of_brass_scales','brass_scales','ブラスの小札',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,71); INSERT INTO `item_basic` VALUES (674,0,'handful_of_iron_scales','iron_scales','アイアンの小札',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,1050); INSERT INTO `item_basic` VALUES (675,0,'handful_of_adaman_scales','adaman_scales','アダマンの小札',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,1512); -INSERT INTO `item_basic` VALUES (676,0,'handful_of_steel_scales','steel_scales','スチールの小札',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,1400); +INSERT INTO `item_basic` VALUES (676,0,'handful_of_steel_scales','steel_scales','スチールの小札',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,900); INSERT INTO `item_basic` VALUES (677,0,'chunk_of_white_steel','white_steel','白鋼',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX | @FLAG_NOAUCTION | @FLAG_NOSALE | @FLAG_NODELIVERY,@NONE,0); INSERT INTO `item_basic` VALUES (678,0,'chunk_of_aluminum_ore','aluminum_ore','軽銀鉱',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,204); INSERT INTO `item_basic` VALUES (679,0,'aluminum_ingot','aluminum_ingot','アルミインゴット',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,1000); INSERT INTO `item_basic` VALUES (680,0,'iron_chain','iron_chain','アイアンの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,1050); INSERT INTO `item_basic` VALUES (681,0,'mythril_chain','mythril_chain','ミスリルの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,1750); -INSERT INTO `item_basic` VALUES (682,0,'darksteel_chain','darksteel_chain','ダークの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,3391); +INSERT INTO `item_basic` VALUES (682,0,'darksteel_chain','darksteel_chain','ダークの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,3325); INSERT INTO `item_basic` VALUES (683,0,'adaman_chain','adaman_chain','アダマンの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,7250); INSERT INTO `item_basic` VALUES (684,0,'aluminum_chain','aluminum_chain','アルミの鎖',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,953); INSERT INTO `item_basic` VALUES (685,0,'chunk_of_khroma_ore','khroma_ore','クロマ鉄鉱',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@SMITHING,725); @@ -817,7 +817,7 @@ INSERT INTO `item_basic` VALUES (799,0,'onyx','onyx','オニキス',@GENERAL_TYP INSERT INTO `item_basic` VALUES (800,0,'amethyst','amethyst','アメジスト',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,207); INSERT INTO `item_basic` VALUES (801,0,'chrysoberyl','chrysoberyl','クリソベリル',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,2460); INSERT INTO `item_basic` VALUES (802,0,'moonstone','moonstone','ムーンストーン',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,2400); -INSERT INTO `item_basic` VALUES (803,0,'sunstone','sunstone','サンストーン',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,2454); +INSERT INTO `item_basic` VALUES (803,0,'sunstone','sunstone','サンストーン',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,2400); INSERT INTO `item_basic` VALUES (804,0,'spinel','spinel','スピネル',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,3800); INSERT INTO `item_basic` VALUES (805,0,'zircon','zircon','ジルコン',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,2400); INSERT INTO `item_basic` VALUES (806,0,'tourmaline','tourmaline','トルマリン',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX,@GOLDSMITHING,207); @@ -11168,7 +11168,7 @@ INSERT INTO `item_basic` VALUES (13443,0,'opal_ring','opal_ring','オパール INSERT INTO `item_basic` VALUES (13444,0,'sardonyx_ring','sardonyx_ring','サードニクスリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,250); INSERT INTO `item_basic` VALUES (13445,0,'gold_ring','gold_ring','ゴールドリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,2767); INSERT INTO `item_basic` VALUES (13446,0,'mythril_ring','mythril_ring','ミスリルリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,733); -INSERT INTO `item_basic` VALUES (13447,0,'platinum_ring','platinum_ring','プラチナリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,3689); +INSERT INTO `item_basic` VALUES (13447,0,'platinum_ring','platinum_ring','プラチナリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,6200); INSERT INTO `item_basic` VALUES (13448,0,'emerald_ring','emerald_ring','エメラルドリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,8410); INSERT INTO `item_basic` VALUES (13449,0,'ruby_ring','ruby_ring','ルビーリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,8410); INSERT INTO `item_basic` VALUES (13450,0,'diamond_ring','diamond_ring','ダイアリング',@EQUIPMENT_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,8410); @@ -12337,7 +12337,7 @@ INSERT INTO `item_basic` VALUES (14612,0,'serenity_ring_+1','serenity_ring_+1',' INSERT INTO `item_basic` VALUES (14613,0,'vigor_ring_+1','vigor_ring_+1','元気の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,4150); INSERT INTO `item_basic` VALUES (14614,0,'mystic_ring_+1','mystic_ring_+1','魔力の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,4150); INSERT INTO `item_basic` VALUES (14615,0,'allure_ring_+1','allure_ring_+1','魅惑の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,4238); -INSERT INTO `item_basic` VALUES (14616,0,'triton_ring','triton_ring','トリトンリング',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,3997); +INSERT INTO `item_basic` VALUES (14616,0,'triton_ring','triton_ring','トリトンリング',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,31450); INSERT INTO `item_basic` VALUES (14617,0,'nimble_ring_+1','nimble_ring_+1','俊足の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,5533); INSERT INTO `item_basic` VALUES (14618,0,'triumph_ring_+1','triumph_ring_+1','凱旋の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,11592); INSERT INTO `item_basic` VALUES (14619,0,'omniscient_ring_+1','omn._ring_+1','全知の指輪+1',@EQUIPMENT_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@RINGS,5533); @@ -14172,7 +14172,7 @@ INSERT INTO `item_basic` VALUES (16461,0,'adaman_kris','adaman_kris','アダマ INSERT INTO `item_basic` VALUES (16463,0,'combat_casters_dagger','cmb.cst._dagger','連邦魔戦士制式短剣',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@DAGGER,2669); INSERT INTO `item_basic` VALUES (16465,0,'bronze_knife','bronze_knife','ブロンズナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,41); INSERT INTO `item_basic` VALUES (16466,0,'knife','knife','ナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,485); -INSERT INTO `item_basic` VALUES (16467,0,'mythril_knife','mythril_knife','ミスリルナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,2069); +INSERT INTO `item_basic` VALUES (16467,0,'mythril_knife','mythril_knife','ミスリルナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,2080); INSERT INTO `item_basic` VALUES (16468,0,'darksteel_knife','darksteel_knife','ダークナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,4810); INSERT INTO `item_basic` VALUES (16469,0,'cermet_knife','cermet_knife','サーメットナイフ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,5967); INSERT INTO `item_basic` VALUES (16470,0,'gully','gully','ガリィ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,2890); @@ -14256,13 +14256,13 @@ INSERT INTO `item_basic` VALUES (16548,0,'coral_sword','coral_sword','珊瑚の INSERT INTO `item_basic` VALUES (16549,0,'divine_sword','divine_sword','ディバインソード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,4928); INSERT INTO `item_basic` VALUES (16550,0,'hallowed_sword','hallowed_sword','ハロウェドソード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANTRADENPC | @FLAG_CANEQUIP,@SWORD,5327); INSERT INTO `item_basic` VALUES (16551,0,'sapara','sapara','サパラ',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,198); -INSERT INTO `item_basic` VALUES (16552,0,'scimitar','scimitar','シミター',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,923); +INSERT INTO `item_basic` VALUES (16552,0,'scimitar','scimitar','シミター',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,905); INSERT INTO `item_basic` VALUES (16553,0,'tulwar','tulwar','タルワール',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,4850); INSERT INTO `item_basic` VALUES (16554,0,'hanger','hanger','ハンガー',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,10185); INSERT INTO `item_basic` VALUES (16555,0,'ridill','ridill','リディル',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_INSCRIBABLE | @FLAG_NOAUCTION | @FLAG_CANEQUIP | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,18000); INSERT INTO `item_basic` VALUES (16556,0,'bloody_blade','bloody_blade','ブラッディブレード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,9675); INSERT INTO `item_basic` VALUES (16557,0,'musketeer_commanders_falchion','msk.cmd._falchion','銃士隊長制式曲刀',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@SWORD,10000); -INSERT INTO `item_basic` VALUES (16558,0,'falchion','falchion','ファルシオン',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,6900); +INSERT INTO `item_basic` VALUES (16558,0,'falchion','falchion','ファルシオン',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,6800); INSERT INTO `item_basic` VALUES (16559,0,'darksteel_falchion','darksteel_falchion','ダークファルシオン',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,9250); INSERT INTO `item_basic` VALUES (16560,0,'cutlass','cutlass','カトラス',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,12250); INSERT INTO `item_basic` VALUES (16562,0,'platinum_cutlass','platinum_cutlass','プラチナカトラス',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,9393); @@ -14332,7 +14332,7 @@ INSERT INTO `item_basic` VALUES (16628,0,'longsword_+1','longsword_+1','ロン INSERT INTO `item_basic` VALUES (16629,0,'small_sword','small_sword','スモールソード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@SWORD,1290); INSERT INTO `item_basic` VALUES (16630,0,'striker_sword','striker_sword','ストライカーソード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP | @FLAG_RARE,@SWORD,0); INSERT INTO `item_basic` VALUES (16631,0,'kaiser_sword','kaiser_sword','カイザーソード',@WEAPON_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@SWORD,2185); -INSERT INTO `item_basic` VALUES (16632,0,'bilbo_+1','bilbo_+1','ビルボ+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,873); +INSERT INTO `item_basic` VALUES (16632,0,'bilbo_+1','bilbo_+1','ビルボ+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,793); INSERT INTO `item_basic` VALUES (16633,0,'degen_+1','degen_+1','デーゲン+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,3503); INSERT INTO `item_basic` VALUES (16634,0,'broadsword_+1','broadsword_+1','ブロードソード+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,5256); -- TODO: Verify BaseSell INSERT INTO `item_basic` VALUES (16635,0,'mythril_sword_+1','mythril_sword_+1','ミスリルソード+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@SWORD,5125); @@ -14438,7 +14438,7 @@ INSERT INTO `item_basic` VALUES (16735,0,'axe_of_trials','axe_of_trials','トラ INSERT INTO `item_basic` VALUES (16736,0,'dagger_+1','dagger_+1','ダガー+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,484); INSERT INTO `item_basic` VALUES (16737,0,'baselard_+1','baselard_+1','バゼラード+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,1000); INSERT INTO `item_basic` VALUES (16738,0,'mythril_dagger_+1','mythril_dagger_+1','ミスリルダガー+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,1918); -INSERT INTO `item_basic` VALUES (16739,0,'mythril_knife_+1','mythril_knife_+1','ミスリルナイフ+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,2586); +INSERT INTO `item_basic` VALUES (16739,0,'mythril_knife_+1','mythril_knife_+1','ミスリルナイフ+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,2466); INSERT INTO `item_basic` VALUES (16740,0,'brass_dagger_+1','brass_dagger_+1','ブラスダガー+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,232); INSERT INTO `item_basic` VALUES (16741,0,'poison_dagger_+1','poison_dagger_+1','ポイズンダガー+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,1170); INSERT INTO `item_basic` VALUES (16742,0,'poison_knife_+1','poison_knife_+1','ポイズンナイフ+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@DAGGER,1500); @@ -14990,7 +14990,7 @@ INSERT INTO `item_basic` VALUES (17294,0,'comet_tail','comet_tail','コメット INSERT INTO `item_basic` VALUES (17295,0,'rising_sun_+1','rising_sun_+1','ライジングサン+1',@WEAPON_TYPE,1,@FLAG_INSCRIBABLE | @FLAG_CANEQUIP,@BOW,4653); INSERT INTO `item_basic` VALUES (17296,0,'pebble','pebble','石つぶて',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,1); INSERT INTO `item_basic` VALUES (17297,0,'throwing_coin','throwing_coin','銭',@WEAPON_TYPE,12,@FLAG_CANEQUIP,@AMMUNITION,1); -INSERT INTO `item_basic` VALUES (17298,0,'tathlum','tathlum','タスラム',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,40); +INSERT INTO `item_basic` VALUES (17298,0,'tathlum','tathlum','タスラム',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,14); INSERT INTO `item_basic` VALUES (17299,0,'astragalos','astragalos','アストラガルス',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,42); INSERT INTO `item_basic` VALUES (17300,0,'platinum_bullet','platinum_bullet','プラチナブレット',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,37); INSERT INTO `item_basic` VALUES (17301,0,'shuriken','shuriken','手裏剣',@WEAPON_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANEQUIP,@AMMUNITION,10);