From dc87915dacdcf9d2162ebba4e15059cc65fa97d6 Mon Sep 17 00:00:00 2001 From: sruon Date: Tue, 4 Mar 2025 22:15:19 -0700 Subject: [PATCH] Rename lv75 relic weapons --- scripts/enum/item.lua | 32 +-- scripts/globals/equipment.lua | 32 +-- scripts/globals/goblinfootprint.lua | 2 +- scripts/globals/magian_data.lua | 200 +++++++++--------- .../zones/Beaucedine_Glacier/npcs/relic.lua | 4 +- scripts/zones/Cape_Teriggan/npcs/relic.lua | 4 +- .../zones/Carpenters_Landing/npcs/relic.lua | 4 +- scripts/zones/Castle_Oztroja/npcs/relic.lua | 4 +- scripts/zones/Dragons_Aery/npcs/relic.lua | 4 +- scripts/zones/Horlais_Peak/npcs/relic.lua | 4 +- scripts/zones/Ifrits_Cauldron/npcs/relic.lua | 4 +- scripts/zones/Metalworks/npcs/relic.lua | 4 +- scripts/zones/North_Gustaberg/npcs/relic.lua | 4 +- scripts/zones/RuAun_Gardens/npcs/relic.lua | 4 +- scripts/zones/RuLude_Gardens/npcs/relic.lua | 4 +- .../zones/Sea_Serpent_Grotto/npcs/relic.lua | 4 +- .../npcs/relic_mandau.lua | 4 +- .../npcs/relic_mjollnir.lua | 4 +- .../zones/Valley_of_Sorrows/npcs/relic.lua | 4 +- .../Western_Altepa_Desert/npcs/relic.lua | 4 +- sql/item_basic.sql | 32 +-- 21 files changed, 181 insertions(+), 181 deletions(-) diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua index d8c459c2a68..d26c4c7cbc3 100644 --- a/scripts/enum/item.lua +++ b/scripts/enum/item.lua @@ -5290,7 +5290,7 @@ xi.item = GOTHIC_GAUNTLETS = 15042, RELIC_SHIELD = 15066, ANCILE = 15069, - AEGIS = 15070, + AEGIS_75 = 15070, WARRIORS_MASK = 15072, MELEE_CROWN = 15073, CLERICS_CAP = 15074, @@ -6631,48 +6631,48 @@ xi.item = THROWING_TOMAHAWK = 18258, ANGON = 18259, CAESTUS = 18263, - SPHARAI = 18264, + SPHARAI_75 = 18264, SPHARAI_80 = 18265, BATARDEAU = 18269, - MANDAU = 18270, + MANDAU_75 = 18270, MANDAU_80 = 18271, CALIBURN = 18275, - EXCALIBUR = 18276, + EXCALIBUR_75 = 18276, EXCALIBUR_80 = 18277, VALHALLA = 18281, - RAGNAROK = 18282, + RAGNAROK_75 = 18282, RAGNAROK_80 = 18283, OGRE_KILLER = 18287, - GUTTLER = 18288, + GUTTLER_75 = 18288, GUTTLER_80 = 18289, ABADDON_KILLER = 18293, - BRAVURA = 18294, + BRAVURA_75 = 18294, BRAVURA_80 = 18295, GAE_ASSAIL = 18299, - GUNGNIR = 18300, + GUNGNIR_75 = 18300, GUNGNIR_80 = 18301, BEC_DE_FAUCON = 18305, - APOCALYPSE = 18306, + APOCALYPSE_75 = 18306, APOCALYPSE_80 = 18307, YOSHIMITSU = 18311, - KIKOKU = 18312, + KIKOKU_75 = 18312, KIKOKU_80 = 18313, TOTSUKANOTSURUGI = 18317, - AMANOMURAKUMO = 18318, + AMANOMURAKUMO_75 = 18318, AMANOMURAKUMO_80 = 18319, GULLINTANI = 18323, - MJOLLNIR = 18324, + MJOLLNIR_75 = 18324, MJOLLNIR_80 = 18325, THYRUS = 18329, - CLAUSTRUM = 18330, + CLAUSTRUM_75 = 18330, CLAUSTRUM_80 = 18331, FERDINAND = 18335, - ANNIHILATOR = 18336, + ANNIHILATOR_75 = 18336, ANNIHILATOR_80 = 18337, MILLENNIUM_HORN = 18341, - GJALLARHORN = 18342, + GJALLARHORN_75 = 18342, FUTATOKOROTO = 18347, - YOICHINOYUMI = 18348, + YOICHINOYUMI_75 = 18348, YOICHINOYUMI_80 = 18349, TOURNEY_PATAS = 18350, METEOR_CESTI = 18351, diff --git a/scripts/globals/equipment.lua b/scripts/globals/equipment.lua index f312d6a7958..8eb4bf935f5 100644 --- a/scripts/globals/equipment.lua +++ b/scripts/globals/equipment.lua @@ -52,7 +52,7 @@ xi.equipment.relicIDs = { [xi.equipment.relic.SPHARAI] = { - xi.item.SPHARAI, + xi.item.SPHARAI_75, xi.item.SPHARAI_80, xi.item.SPHARAI_85, xi.item.SPHARAI_90, @@ -66,7 +66,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.MANDAU] = { - xi.item.MANDAU, + xi.item.MANDAU_75, xi.item.MANDAU_80, xi.item.MANDAU_85, xi.item.MANDAU_90, @@ -80,7 +80,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.EXCALIBUR] = { - xi.item.EXCALIBUR, + xi.item.EXCALIBUR_75, xi.item.EXCALIBUR_80, xi.item.EXCALIBUR_85, xi.item.EXCALIBUR_90, @@ -94,7 +94,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.RAGNAROK] = { - xi.item.RAGNAROK, + xi.item.RAGNAROK_75, xi.item.RAGNAROK_80, xi.item.RAGNAROK_85, xi.item.RAGNAROK_90, @@ -108,7 +108,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.GUTTLER] = { - xi.item.GUTTLER, + xi.item.GUTTLER_75, xi.item.GUTTLER_80, xi.item.GUTTLER_85, xi.item.GUTTLER_90, @@ -122,7 +122,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.BRAVURA] = { - xi.item.BRAVURA, + xi.item.BRAVURA_75, xi.item.BRAVURA_80, xi.item.BRAVURA_85, xi.item.BRAVURA_90, @@ -136,7 +136,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.APOCALYPSE] = { - xi.item.APOCALYPSE, + xi.item.APOCALYPSE_75, xi.item.APOCALYPSE_80, xi.item.APOCALYPSE_85, xi.item.APOCALYPSE_90, @@ -150,7 +150,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.GUNGNIR] = { - xi.item.GUNGNIR, + xi.item.GUNGNIR_75, xi.item.GUNGNIR_80, xi.item.GUNGNIR_85, xi.item.GUNGNIR_90, @@ -164,7 +164,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.KIKOKU] = { - xi.item.KIKOKU, + xi.item.KIKOKU_75, xi.item.KIKOKU_80, xi.item.KIKOKU_85, xi.item.KIKOKU_90, @@ -178,7 +178,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.AMANOMURAKUMO] = { - xi.item.AMANOMURAKUMO, + xi.item.AMANOMURAKUMO_75, xi.item.AMANOMURAKUMO_80, xi.item.AMANOMURAKUMO_85, xi.item.AMANOMURAKUMO_90, @@ -192,7 +192,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.MJOLLNIR] = { - xi.item.MJOLLNIR, + xi.item.MJOLLNIR_75, xi.item.MJOLLNIR_80, xi.item.MJOLLNIR_85, xi.item.MJOLLNIR_90, @@ -206,7 +206,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.CLAUSTRUM] = { - xi.item.CLAUSTRUM, + xi.item.CLAUSTRUM_75, xi.item.CLAUSTRUM_80, xi.item.CLAUSTRUM_85, xi.item.CLAUSTRUM_90, @@ -220,7 +220,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.YOICHINOYUMI] = { - xi.item.YOICHINOYUMI, + xi.item.YOICHINOYUMI_75, xi.item.YOICHINOYUMI_80, xi.item.YOICHINOYUMI_85, xi.item.YOICHINOYUMI_90, @@ -235,7 +235,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.ANNIHILATOR] = { - xi.item.ANNIHILATOR, + xi.item.ANNIHILATOR_75, xi.item.ANNIHILATOR_80, xi.item.ANNIHILATOR_85, xi.item.ANNIHILATOR_90, @@ -250,7 +250,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.GJALLARHORN] = { - xi.item.GJALLARHORN, + xi.item.GJALLARHORN_75, xi.item.GJALLARHORN_80, xi.item.GJALLARHORN_85, xi.item.GJALLARHORN_90, @@ -261,7 +261,7 @@ xi.equipment.relicIDs = [xi.equipment.relic.AEGIS] = { - xi.item.AEGIS, + xi.item.AEGIS_75, xi.item.AEGIS_80, xi.item.AEGIS_85, xi.item.AEGIS_90, diff --git a/scripts/globals/goblinfootprint.lua b/scripts/globals/goblinfootprint.lua index 5ff61d81170..7f2b71e344e 100644 --- a/scripts/globals/goblinfootprint.lua +++ b/scripts/globals/goblinfootprint.lua @@ -144,7 +144,7 @@ local csReq = -- add checks to this table [3] = function(player) -- RELIC: Apocalypse -- TODO: Table items and iterate over table for this check - return player:hasItem(xi.item.APOCALYPSE) or + return player:hasItem(xi.item.APOCALYPSE_75) or player:hasItem(xi.item.APOCALYPSE_80) or player:hasItem(xi.item.APOCALYPSE_85) or player:hasItem(xi.item.APOCALYPSE_90) or diff --git a/scripts/globals/magian_data.lua b/scripts/globals/magian_data.lua index a5627f269cc..b05af909f24 100644 --- a/scripts/globals/magian_data.lua +++ b/scripts/globals/magian_data.lua @@ -2685,7 +2685,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, }, textOffset = 349, @@ -2696,7 +2696,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -2709,7 +2709,7 @@ xi.magian.trials = previousTrial = 991, requiredItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -2724,7 +2724,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -2893,7 +2893,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, }, textOffset = 357, @@ -2904,7 +2904,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -2917,7 +2917,7 @@ xi.magian.trials = previousTrial = 1003, requiredItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -2932,7 +2932,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -3049,7 +3049,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, }, textOffset = 363, @@ -3060,7 +3060,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -3073,7 +3073,7 @@ xi.magian.trials = previousTrial = 1012, requiredItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -3088,7 +3088,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3257,7 +3257,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, }, textOffset = 371, @@ -3268,7 +3268,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3281,7 +3281,7 @@ xi.magian.trials = previousTrial = 1024, requiredItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3296,7 +3296,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -3309,7 +3309,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, }, textOffset = 373, @@ -3320,7 +3320,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3333,7 +3333,7 @@ xi.magian.trials = previousTrial = 1027, requiredItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3348,7 +3348,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -3413,7 +3413,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, }, textOffset = 377, @@ -3424,7 +3424,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3437,7 +3437,7 @@ xi.magian.trials = previousTrial = 1033, requiredItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3452,7 +3452,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -3517,7 +3517,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, }, textOffset = 381, @@ -3528,7 +3528,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3541,7 +3541,7 @@ xi.magian.trials = previousTrial = 1039, requiredItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3556,7 +3556,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -3621,7 +3621,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, }, textOffset = 385, @@ -3632,7 +3632,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3645,7 +3645,7 @@ xi.magian.trials = previousTrial = 1045, requiredItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3660,7 +3660,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -3725,7 +3725,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, }, textOffset = 389, @@ -3736,7 +3736,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -3749,7 +3749,7 @@ xi.magian.trials = previousTrial = 1051, requiredItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 0 }, -- DMG:+1 @@ -3764,7 +3764,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -3829,7 +3829,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, }, textOffset = 393, @@ -3840,7 +3840,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3853,7 +3853,7 @@ xi.magian.trials = previousTrial = 1057, requiredItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3868,7 +3868,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 4 }, -- DMG:+5 @@ -3933,7 +3933,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, }, textOffset = 397, @@ -3944,7 +3944,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3957,7 +3957,7 @@ xi.magian.trials = previousTrial = 1063, requiredItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -3972,7 +3972,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 7 }, -- DMG:+8 @@ -4037,7 +4037,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, }, textOffset = 401, @@ -4048,7 +4048,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 3 }, -- DMG:+4 @@ -4061,7 +4061,7 @@ xi.magian.trials = previousTrial = 1069, requiredItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 3 }, -- DMG:+4 @@ -4076,7 +4076,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 9 }, -- DMG:+10 @@ -4245,7 +4245,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, }, textOffset = 409, @@ -4256,7 +4256,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 1 }, -- DMG:+2 (Ranged) @@ -4269,7 +4269,7 @@ xi.magian.trials = previousTrial = 1081, requiredItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 1 }, -- DMG:+2 (Ranged) @@ -4284,7 +4284,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 5 }, -- DMG:+6 (Ranged) @@ -4401,7 +4401,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, }, textOffset = 415, @@ -4412,7 +4412,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 1 }, -- DMG:+2 (Ranged) @@ -4425,7 +4425,7 @@ xi.magian.trials = previousTrial = 1090, requiredItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 1 }, -- DMG:+2 (Ranged) @@ -4440,7 +4440,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 4 }, -- DMG:+5 (Ranged) @@ -5006,7 +5006,7 @@ xi.magian.trials = previousTrial = 992, requiredItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -5021,7 +5021,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -5034,7 +5034,7 @@ xi.magian.trials = previousTrial = 1818, requiredItem = { - itemId = xi.item.MANDAU, + itemId = xi.item.MANDAU_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -5142,7 +5142,7 @@ xi.magian.trials = previousTrial = 1004, requiredItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -5157,7 +5157,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 7 }, -- DMG:+8 @@ -5170,7 +5170,7 @@ xi.magian.trials = previousTrial = 1826, requiredItem = { - itemId = xi.item.SPHARAI, + itemId = xi.item.SPHARAI_75, itemAugments = { [1] = { 740, 7 }, @@ -5250,7 +5250,7 @@ xi.magian.trials = previousTrial = 1013, requiredItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 1 }, -- DMG:+2 @@ -5265,7 +5265,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -5278,7 +5278,7 @@ xi.magian.trials = previousTrial = 1832, requiredItem = { - itemId = xi.item.EXCALIBUR, + itemId = xi.item.EXCALIBUR_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -5386,7 +5386,7 @@ xi.magian.trials = previousTrial = 1025, requiredItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5401,7 +5401,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 9 }, -- DMG:+10 @@ -5414,7 +5414,7 @@ xi.magian.trials = previousTrial = 1840, requiredItem = { - itemId = xi.item.RAGNAROK, + itemId = xi.item.RAGNAROK_75, itemAugments = { [1] = { 740, 9 }, -- DMG:+10 @@ -5438,7 +5438,7 @@ xi.magian.trials = previousTrial = 1028, requiredItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -5453,7 +5453,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -5466,7 +5466,7 @@ xi.magian.trials = previousTrial = 1842, requiredItem = { - itemId = xi.item.GUTTLER, + itemId = xi.item.GUTTLER_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -5518,7 +5518,7 @@ xi.magian.trials = previousTrial = 1034, requiredItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -5533,7 +5533,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5546,7 +5546,7 @@ xi.magian.trials = previousTrial = 1846, requiredItem = { - itemId = xi.item.BRAVURA, + itemId = xi.item.BRAVURA_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5598,7 +5598,7 @@ xi.magian.trials = previousTrial = 1040, requiredItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -5613,7 +5613,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5626,7 +5626,7 @@ xi.magian.trials = previousTrial = 1850, requiredItem = { - itemId = xi.item.GUNGNIR, + itemId = xi.item.GUNGNIR_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5678,7 +5678,7 @@ xi.magian.trials = previousTrial = 1046, requiredItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 6 }, -- DMG:+7 @@ -5693,7 +5693,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5706,7 +5706,7 @@ xi.magian.trials = previousTrial = 1854, requiredItem = { - itemId = xi.item.APOCALYPSE, + itemId = xi.item.APOCALYPSE_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5758,7 +5758,7 @@ xi.magian.trials = previousTrial = 1052, requiredItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 2 }, -- DMG:+3 @@ -5773,7 +5773,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 3 }, -- DMG:+4 @@ -5786,7 +5786,7 @@ xi.magian.trials = previousTrial = 1858, requiredItem = { - itemId = xi.item.KIKOKU, + itemId = xi.item.KIKOKU_75, itemAugments = { [1] = { 740, 3 }, -- DMG:+4 @@ -5838,7 +5838,7 @@ xi.magian.trials = previousTrial = 1058, requiredItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 4 }, -- DMG:+5 @@ -5853,7 +5853,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -5866,7 +5866,7 @@ xi.magian.trials = previousTrial = 1862, requiredItem = { - itemId = xi.item.AMANOMURAKUMO, + itemId = xi.item.AMANOMURAKUMO_75, itemAugments = { [1] = { 740, 5 }, -- DMG:+6 @@ -5918,7 +5918,7 @@ xi.magian.trials = previousTrial = 1064, requiredItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 7 }, -- DMG:+8 @@ -5933,7 +5933,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5946,7 +5946,7 @@ xi.magian.trials = previousTrial = 1866, requiredItem = { - itemId = xi.item.MJOLLNIR, + itemId = xi.item.MJOLLNIR_75, itemAugments = { [1] = { 740, 8 }, -- DMG:+9 @@ -5998,7 +5998,7 @@ xi.magian.trials = previousTrial = 1070, requiredItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 9 }, -- DMG:+10 @@ -6013,7 +6013,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 11 }, -- DMG:+12 @@ -6026,7 +6026,7 @@ xi.magian.trials = previousTrial = 1870, requiredItem = { - itemId = xi.item.CLAUSTRUM, + itemId = xi.item.CLAUSTRUM_75, itemAugments = { [1] = { 740, 11 }, -- DMG:+12 @@ -6134,7 +6134,7 @@ xi.magian.trials = previousTrial = 1082, requiredItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 5 }, -- DMG:+6 (Ranged) @@ -6149,7 +6149,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 7 }, -- DMG:+8 (Ranged) @@ -6162,7 +6162,7 @@ xi.magian.trials = previousTrial = 1878, requiredItem = { - itemId = xi.item.ANNIHILATOR, + itemId = xi.item.ANNIHILATOR_75, itemAugments = { [1] = { 746, 7 }, -- DMG:+8 (Ranged) @@ -6242,7 +6242,7 @@ xi.magian.trials = previousTrial = 1091, requiredItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 4 }, -- DMG:+5 (Ranged) @@ -6257,7 +6257,7 @@ xi.magian.trials = rewardItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 7 }, -- DMG:+8 (Ranged) @@ -6270,7 +6270,7 @@ xi.magian.trials = previousTrial = 1884, requiredItem = { - itemId = xi.item.YOICHINOYUMI, + itemId = xi.item.YOICHINOYUMI_75, itemAugments = { [1] = { 746, 7 }, -- DMG:+8 (Ranged) @@ -7013,7 +7013,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.GJALLARHORN, + itemId = xi.item.GJALLARHORN_75, }, textOffset = 1131, @@ -11513,7 +11513,7 @@ xi.magian.trials = previousTrial = 0, requiredItem = { - itemId = xi.item.AEGIS, + itemId = xi.item.AEGIS_75, }, textOffset = 1132, diff --git a/scripts/zones/Beaucedine_Glacier/npcs/relic.lua b/scripts/zones/Beaucedine_Glacier/npcs/relic.lua index 0b2958f3e94..aefeb9bcadd 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/relic.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.INTRICATE_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.VALHALLA }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(139, xi.item.RAGNAROK) + player:startEvent(139, xi.item.RAGNAROK_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 139 and - npcUtil.giveItem(player, { xi.item.RAGNAROK, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.RAGNAROK_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Cape_Teriggan/npcs/relic.lua b/scripts/zones/Cape_Teriggan/npcs/relic.lua index 241ebc9b03d..62c47b5b5f8 100644 --- a/scripts/zones/Cape_Teriggan/npcs/relic.lua +++ b/scripts/zones/Cape_Teriggan/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.SNARLED_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.FUTATOKOROTO }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(18, xi.item.YOICHINOYUMI) + player:startEvent(18, xi.item.YOICHINOYUMI_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 18 and - npcUtil.giveItem(player, { xi.item.YOICHINOYUMI, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.YOICHINOYUMI_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Carpenters_Landing/npcs/relic.lua b/scripts/zones/Carpenters_Landing/npcs/relic.lua index bbe4115c3fd..2ebd4651690 100644 --- a/scripts/zones/Carpenters_Landing/npcs/relic.lua +++ b/scripts/zones/Carpenters_Landing/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.SUPERNAL_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.ANCILE }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(44, xi.item.AEGIS) + player:startEvent(44, xi.item.AEGIS_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 44 and - npcUtil.giveItem(player, { xi.item.AEGIS, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.AEGIS_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Castle_Oztroja/npcs/relic.lua b/scripts/zones/Castle_Oztroja/npcs/relic.lua index 1061b1bcd76..10eaa3f8244 100644 --- a/scripts/zones/Castle_Oztroja/npcs/relic.lua +++ b/scripts/zones/Castle_Oztroja/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.TEN_THOUSAND_BYNE_BILL, xi.item.MYSTIC_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.CAESTUS }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(59, xi.item.SPHARAI) + player:startEvent(59, xi.item.SPHARAI_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 59 and - npcUtil.giveItem(player, { xi.item.SPHARAI, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) + npcUtil.giveItem(player, { xi.item.SPHARAI_75, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Dragons_Aery/npcs/relic.lua b/scripts/zones/Dragons_Aery/npcs/relic.lua index 5908ba54e0e..6f3b41d9817 100644 --- a/scripts/zones/Dragons_Aery/npcs/relic.lua +++ b/scripts/zones/Dragons_Aery/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.HOLY_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.CALIBURN }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(3, xi.item.EXCALIBUR) + player:startEvent(3, xi.item.EXCALIBUR_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 3 and - npcUtil.giveItem(player, { xi.item.EXCALIBUR, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.EXCALIBUR_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Horlais_Peak/npcs/relic.lua b/scripts/zones/Horlais_Peak/npcs/relic.lua index 8542525ef70..31f56d3d004 100644 --- a/scripts/zones/Horlais_Peak/npcs/relic.lua +++ b/scripts/zones/Horlais_Peak/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.DIVINE_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.TOTSUKANOTSURUGI }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(13, xi.item.AMANOMURAKUMO) + player:startEvent(13, xi.item.AMANOMURAKUMO_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 13 and - npcUtil.giveItem(player, { xi.item.AMANOMURAKUMO, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.AMANOMURAKUMO_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Ifrits_Cauldron/npcs/relic.lua b/scripts/zones/Ifrits_Cauldron/npcs/relic.lua index f80f27785b3..f852901e051 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/relic.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/relic.lua @@ -13,7 +13,7 @@ entity.onTrade = function(player, npc, trade) player:getCharVar('RELIC_IN_PROGRESS') == xi.item.THYRUS and npcUtil.tradeHas(trade, { xi.item.RIMILALA_STRIPESHELL, xi.item.CELESTIAL_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.THYRUS }) -- currency, shard, necropsyche, stage 4 then - player:startEvent(32, xi.item.CLAUSTRUM) + player:startEvent(32, xi.item.CLAUSTRUM_75) end end @@ -24,7 +24,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 32 and - npcUtil.giveItem(player, { xi.item.CLAUSTRUM, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) + npcUtil.giveItem(player, { xi.item.CLAUSTRUM_75, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) then player:setCharVar('RELIC_IN_PROGRESS', 0) player:confirmTrade() diff --git a/scripts/zones/Metalworks/npcs/relic.lua b/scripts/zones/Metalworks/npcs/relic.lua index 375a4309cb2..89b060facf2 100644 --- a/scripts/zones/Metalworks/npcs/relic.lua +++ b/scripts/zones/Metalworks/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.TEN_THOUSAND_BYNE_BILL, xi.item.ETHEREAL_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.FERDINAND }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(843, xi.item.ANNIHILATOR) + player:startEvent(843, xi.item.ANNIHILATOR_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 843 and - npcUtil.giveItem(player, { xi.item.ANNIHILATOR, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) + npcUtil.giveItem(player, { xi.item.ANNIHILATOR_75, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/North_Gustaberg/npcs/relic.lua b/scripts/zones/North_Gustaberg/npcs/relic.lua index 0d7011f5f64..88c4d198348 100644 --- a/scripts/zones/North_Gustaberg/npcs/relic.lua +++ b/scripts/zones/North_Gustaberg/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RIMILALA_STRIPESHELL, xi.item.TENEBROUS_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.BEC_DE_FAUCON }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(254, xi.item.APOCALYPSE) + player:startEvent(254, xi.item.APOCALYPSE_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 254 and - npcUtil.giveItem(player, { xi.item.APOCALYPSE, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) + npcUtil.giveItem(player, { xi.item.APOCALYPSE_75, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/RuAun_Gardens/npcs/relic.lua b/scripts/zones/RuAun_Gardens/npcs/relic.lua index 572be892d82..455614a4040 100644 --- a/scripts/zones/RuAun_Gardens/npcs/relic.lua +++ b/scripts/zones/RuAun_Gardens/npcs/relic.lua @@ -13,7 +13,7 @@ entity.onTrade = function(player, npc, trade) player:getCharVar('RELIC_IN_PROGRESS') == xi.item.GAE_ASSAIL and npcUtil.tradeHasExactly(trade, { xi.item.RIMILALA_STRIPESHELL, xi.item.STELLAR_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.GAE_ASSAIL }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(60, xi.item.GUNGNIR) + player:startEvent(60, xi.item.GUNGNIR_75) end end @@ -24,7 +24,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 60 and - npcUtil.giveItem(player, { xi.item.GUNGNIR, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) + npcUtil.giveItem(player, { xi.item.GUNGNIR_75, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/RuLude_Gardens/npcs/relic.lua b/scripts/zones/RuLude_Gardens/npcs/relic.lua index 4dfecf96768..0fb4db992c8 100644 --- a/scripts/zones/RuLude_Gardens/npcs/relic.lua +++ b/scripts/zones/RuLude_Gardens/npcs/relic.lua @@ -13,7 +13,7 @@ entity.onTrade = function(player, npc, trade) player:getCharVar('RELIC_IN_PROGRESS') == xi.item.ABADDON_KILLER and npcUtil.tradeHas(trade, { xi.item.TEN_THOUSAND_BYNE_BILL, xi.item.SERAPHIC_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.ABADDON_KILLER }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(10035, xi.item.BRAVURA) + player:startEvent(10035, xi.item.BRAVURA_75) end end @@ -24,7 +24,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 10035 and - npcUtil.giveItem(player, { xi.item.BRAVURA, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) + npcUtil.giveItem(player, { xi.item.BRAVURA_75, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua index 2706694e292..7ed138a0dc9 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.TEN_THOUSAND_BYNE_BILL, xi.item.DEMONIAC_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.YOSHIMITSU }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(11, xi.item.KIKOKU) + player:startEvent(11, xi.item.KIKOKU_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 11 and - npcUtil.giveItem(player, { xi.item.KIKOKU, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) + npcUtil.giveItem(player, { xi.item.KIKOKU_75, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua index a0581ef13fb..46dcbfdde69 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua @@ -17,7 +17,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.TEN_THOUSAND_BYNE_BILL, xi.item.ORNATE_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.BATARDEAU }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(207, xi.item.MANDAU) + player:startEvent(207, xi.item.MANDAU_75) end end @@ -28,7 +28,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 207 and - npcUtil.giveItem(player, { xi.item.MANDAU, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) + npcUtil.giveItem(player, { xi.item.MANDAU_75, { xi.item.ONE_HUNDRED_BYNE_BILL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua index c2f943363ad..3687cd30472 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua @@ -16,7 +16,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RANPERRE_GOLDPIECE, xi.item.HEAVENLY_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.GULLINTANI }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(216, xi.item.MJOLLNIR) + player:startEvent(216, xi.item.MJOLLNIR_75) end end @@ -27,7 +27,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 216 and - npcUtil.giveItem(player, { xi.item.MJOLLNIR, { xi.item.MONTIONT_SILVERPIECE, 30 } }) + npcUtil.giveItem(player, { xi.item.MJOLLNIR_75, { xi.item.MONTIONT_SILVERPIECE, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Valley_of_Sorrows/npcs/relic.lua b/scripts/zones/Valley_of_Sorrows/npcs/relic.lua index 7a2e2fe4736..4f87ba0dfa3 100644 --- a/scripts/zones/Valley_of_Sorrows/npcs/relic.lua +++ b/scripts/zones/Valley_of_Sorrows/npcs/relic.lua @@ -14,7 +14,7 @@ entity.onTrade = function(player, npc, trade) npcUtil.tradeHas(trade, { xi.item.RIMILALA_STRIPESHELL, xi.item.MYSTERIAL_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.MILLENNIUM_HORN }) then -- currency, shard, necropsyche, stage 4 - player:startEvent(15, xi.item.GJALLARHORN) + player:startEvent(15, xi.item.GJALLARHORN_75) end end @@ -25,7 +25,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 15 and - npcUtil.giveItem(player, { xi.item.GJALLARHORN, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) + npcUtil.giveItem(player, { xi.item.GJALLARHORN_75, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/scripts/zones/Western_Altepa_Desert/npcs/relic.lua b/scripts/zones/Western_Altepa_Desert/npcs/relic.lua index d9665d1449b..4cdee8acee9 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/relic.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/relic.lua @@ -13,7 +13,7 @@ entity.onTrade = function(player, npc, trade) player:getCharVar('RELIC_IN_PROGRESS') == xi.item.OGRE_KILLER and npcUtil.tradeHas(trade, { xi.item.RIMILALA_STRIPESHELL, xi.item.RUNAEIC_FRAGMENT, xi.item.SHARD_OF_NECROPSYCHE, xi.item.OGRE_KILLER }) then - player:startEvent(205, xi.item.GUTTLER) + player:startEvent(205, xi.item.GUTTLER_75) end end @@ -24,7 +24,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 205 and - npcUtil.giveItem(player, { xi.item.GUTTLER, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) + npcUtil.giveItem(player, { xi.item.GUTTLER_75, { xi.item.LUNGO_NANGO_JADESHELL, 30 } }) then player:confirmTrade() player:setCharVar('RELIC_IN_PROGRESS', 0) diff --git a/sql/item_basic.sql b/sql/item_basic.sql index fa05a81029e..c57b46efb73 100644 --- a/sql/item_basic.sql +++ b/sql/item_basic.sql @@ -12477,7 +12477,7 @@ INSERT INTO `item_basic` VALUES (15066,0,'relic_shield','relic_shield',1,63556,@ INSERT INTO `item_basic` VALUES (15067,0,'bulwark_shield','bulwark_shield',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (15068,0,'dynamis_shield','dynamis_shield',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (15069,0,'ancile','ancile',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (15070,0,'aegis','aegis',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (15070,0,'aegis_75','aegis',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (15071,0,'spartan_hoplon','spartan_hoplon',1,3108,@SHIELD,0,4006); INSERT INTO `item_basic` VALUES (15072,0,'warriors_mask','warriors_mask',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (15073,0,'melee_crown','melee_crown',1,63556,@NONE,1,0); @@ -15640,91 +15640,91 @@ INSERT INTO `item_basic` VALUES (18260,0,'relic_knuckles','relic_knuckles',1,635 INSERT INTO `item_basic` VALUES (18261,0,'militant_knuckles','militant_knuckles',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18262,0,'dynamis_knuckles','dynamis_knuckles',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18263,0,'caestus','caestus',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18264,0,'spharai','spharai',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18264,0,'spharai_75','spharai',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18265,0,'spharai_80','spharai',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18266,0,'relic_dagger','relic_dagger',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18267,0,'malefic_dagger','malefic_dagger',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18268,0,'dynamis_dagger','dynamis_dagger',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18269,0,'batardeau','batardeau',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18270,0,'mandau','mandau',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18270,0,'mandau_75','mandau',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18271,0,'mandau_80','mandau',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18272,0,'relic_sword','relic_sword',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18273,0,'glyptic_sword','glyptic_sword',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18274,0,'dynamis_sword','dynamis_sword',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18275,0,'caliburn','caliburn',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18276,0,'excalibur','excalibur',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18276,0,'excalibur_75','excalibur',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18277,0,'excalibur_80','excalibur',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18278,0,'relic_blade','relic_blade',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18279,0,'gilded_blade','gilded_blade',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18280,0,'dynamis_blade','dynamis_blade',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18281,0,'valhalla','valhalla',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18282,0,'ragnarok','ragnarok',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18282,0,'ragnarok_75','ragnarok',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18283,0,'ragnarok_80','ragnarok',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18284,0,'relic_axe','relic_axe',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18285,0,'leonine_axe','leonine_axe',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18286,0,'dynamis_axe','dynamis_axe',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18287,0,'ogre_killer','ogre_killer',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18288,0,'guttler','guttler',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18288,0,'guttler_75','guttler',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18289,0,'guttler_80','guttler',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18290,0,'relic_bhuj','relic_bhuj',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18291,0,'agonal_bhuj','agonal_bhuj',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18292,0,'dynamis_bhuj','dynamis_bhuj',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18293,0,'abaddon_killer','abaddon_killer',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18294,0,'bravura','bravura',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18294,0,'bravura_75','bravura',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18295,0,'bravura_80','bravura',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18296,0,'relic_lance','relic_lance',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18297,0,'hotspur_lance','hotspur_lance',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18298,0,'dynamis_lance','dynamis_lance',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18299,0,'gae_assail','gae_assail',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18300,0,'gungnir','gungnir',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18300,0,'gungnir_75','gungnir',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18301,0,'gungnir_80','gungnir',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18302,0,'relic_scythe','relic_scythe',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18303,0,'memento_scythe','memento_scythe',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18304,0,'dynamis_scythe','dynamis_scythe',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18305,0,'bec_de_faucon','bec_de_faucon',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18306,0,'apocalypse','apocalypse',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18306,0,'apocalypse_75','apocalypse',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18307,0,'apocalypse_80','apocalypse',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18308,0,'ihintanto','ihintanto',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18309,0,'mimizuku','mimizuku',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18310,0,'rogetsu','rogetsu',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18311,0,'yoshimitsu','yoshimitsu',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18312,0,'kikoku','kikoku',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18312,0,'kikoku_75','kikoku',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18313,0,'kikoku_80','kikoku',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18314,0,'ito','ito',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18315,0,'hayatemaru','hayatemaru',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18316,0,'oboromaru','oboromaru',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18317,0,'totsukanotsurugi','totsukanotsurugi',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18318,0,'amanomurakumo','amanomurakumo',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18318,0,'amanomurakumo_75','amanomurakumo',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18319,0,'amanomurakumo_80','amanomurakumo',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18320,0,'relic_maul','relic_maul',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18321,0,'battering_maul','battering_maul',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18322,0,'dynamis_maul','dynamis_maul',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18323,0,'gullintani','gullintani',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18324,0,'mjollnir','mjollnir',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18324,0,'mjollnir_75','mjollnir',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18325,0,'mjollnir_80','mjollnir',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18326,0,'relic_staff','relic_staff',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18327,0,'sages_staff','sages_staff',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18328,0,'dynamis_staff','dynamis_staff',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18329,0,'thyrus','thyrus',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18330,0,'claustrum','claustrum',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18330,0,'claustrum_75','claustrum',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18331,0,'claustrum_80','claustrum',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18332,0,'relic_gun','relic_gun',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18333,0,'marksman_gun','marksman_gun',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18334,0,'dynamis_gun','dynamis_gun',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18335,0,'ferdinand','ferdinand',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18336,0,'annihilator','annihilator',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18336,0,'annihilator_75','annihilator',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18337,0,'annihilator_80','annihilator',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18338,0,'relic_horn','relic_horn',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18339,0,'pyrrhic_horn','pyrrhic_horn',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18340,0,'dynamis_horn','dynamis_horn',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18341,0,'millennium_horn','millennium_horn',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18342,0,'gjallarhorn','gjallarhorn',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18342,0,'gjallarhorn_75','gjallarhorn',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18343,0,'pans_horn','pans_horn',1,63572,@NONE,1,0); INSERT INTO `item_basic` VALUES (18344,0,'relic_bow','relic_bow',1,63556,@NONE,1,0); INSERT INTO `item_basic` VALUES (18345,0,'wolver_bow','wolver_bow',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18346,0,'dynamis_bow','dynamis_bow',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18347,0,'futatokoroto','futatokoroto',1,63552,@NONE,1,0); -INSERT INTO `item_basic` VALUES (18348,0,'yoichinoyumi','yoichinoyumi',1,63552,@NONE,1,0); +INSERT INTO `item_basic` VALUES (18348,0,'yoichinoyumi_75','yoichinoyumi',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18349,0,'yoichinoyumi_80','yoichinoyumi',1,63552,@NONE,1,0); INSERT INTO `item_basic` VALUES (18350,0,'tourney_patas','tourney_patas',1,34820,@H2H,0,2000); INSERT INTO `item_basic` VALUES (18351,0,'meteor_cesti','meteor_cesti',1,34820,@H2H,0,7350);