From 6a8e8a05f9dbc0345db745026e59dd67b18863c5 Mon Sep 17 00:00:00 2001 From: Will Buck Date: Sun, 27 Apr 2025 18:16:33 -0500 Subject: [PATCH 1/2] add ele recast, blu recast mods Style fix in modifier.h --- scripts/actions/spells/blue/mind_blast.lua | 2 +- .../actions/spells/blue/mysterious_light.lua | 2 +- scripts/actions/spells/blue/regurgitation.lua | 2 +- scripts/actions/spells/blue/sandspin.lua | 2 +- scripts/enum/mod.lua | 2 + sql/item_mods.sql | 79 +++++++++++++------ src/map/modifier.h | 10 ++- src/map/utils/battleutils.cpp | 9 +++ 8 files changed, 75 insertions(+), 33 deletions(-) diff --git a/scripts/actions/spells/blue/mind_blast.lua b/scripts/actions/spells/blue/mind_blast.lua index 0a8c34f465b..e504c0f30db 100644 --- a/scripts/actions/spells/blue/mind_blast.lua +++ b/scripts/actions/spells/blue/mind_blast.lua @@ -38,7 +38,7 @@ spellObject.onSpellCast = function(caster, target, spell) params.chr_wsc = 0.0 -- Handle damage. - local damage = xi.spells.blue.useBreathSpell(caster, target, spell, params) + local damage = xi.spells.blue.useMagicalSpell(caster, target, spell, params) if damage <= 0 then return damage diff --git a/scripts/actions/spells/blue/mysterious_light.lua b/scripts/actions/spells/blue/mysterious_light.lua index 47592c6a265..0dd9824cb54 100644 --- a/scripts/actions/spells/blue/mysterious_light.lua +++ b/scripts/actions/spells/blue/mysterious_light.lua @@ -37,7 +37,7 @@ spellObject.onSpellCast = function(caster, target, spell) params.chr_wsc = 0.3 -- Handle damage. - local damage = xi.spells.blue.useBreathSpell(caster, target, spell, params) + local damage = xi.spells.blue.useMagicalSpell(caster, target, spell, params) if damage <= 0 then return damage diff --git a/scripts/actions/spells/blue/regurgitation.lua b/scripts/actions/spells/blue/regurgitation.lua index 90bb632deba..45669bdd664 100644 --- a/scripts/actions/spells/blue/regurgitation.lua +++ b/scripts/actions/spells/blue/regurgitation.lua @@ -37,7 +37,7 @@ spellObject.onSpellCast = function(caster, target, spell) params.chr_wsc = 0.0 -- Handle damage. - local damage = xi.spells.blue.useBreathSpell(caster, target, spell, params) + local damage = xi.spells.blue.useMagicalSpell(caster, target, spell, params) if caster:isBehind(target) then damage = math.floor(damage * 1.25) end diff --git a/scripts/actions/spells/blue/sandspin.lua b/scripts/actions/spells/blue/sandspin.lua index 5a715160066..3e290394a37 100644 --- a/scripts/actions/spells/blue/sandspin.lua +++ b/scripts/actions/spells/blue/sandspin.lua @@ -37,7 +37,7 @@ spellObject.onSpellCast = function(caster, target, spell) params.chr_wsc = 0.0 -- Handle damage. - local damage = xi.spells.blue.useBreathSpell(caster, target, spell, params) + local damage = xi.spells.blue.useMagicalSpell(caster, target, spell, params) if damage <= 0 then return damage diff --git a/scripts/enum/mod.lua b/scripts/enum/mod.lua index 3bca2534071..cfc71b162b6 100644 --- a/scripts/enum/mod.lua +++ b/scripts/enum/mod.lua @@ -596,6 +596,7 @@ xi.mod = WHITE_MAGIC_CAST = 396, BLACK_MAGIC_RECAST = 397, WHITE_MAGIC_RECAST = 398, + ELEMENTAL_MAGIC_RECAST = 1144, -- Recast time for elemental magic spells (percent, usually negative) ALACRITY_CELERITY_EFFECT = 399, LIGHT_ARTS_EFFECT = 334, DARK_ARTS_EFFECT = 335, @@ -1031,6 +1032,7 @@ xi.mod = ENHANCES_BURST_AFFINITY = 1139, -- Increases WSC bonus on spells cast with Burst Affinity (percent) ENHANCES_CHAIN_AFFINITY = 1140, -- TODO: Increases WSC bonus on spells cast with Chain Affinity (base damage +) + BLUE_MAGIC_RECAST = 1145, -- Recast time for blue magic spells (percent, usually negative) -- IF YOU ADD ANY NEW MODIFIER HERE, ADD IT IN src/map/modifier.h ASWELL! diff --git a/sql/item_mods.sql b/sql/item_mods.sql index c446e26d0d8..a6af38e1f2a 100644 --- a/sql/item_mods.sql +++ b/sql/item_mods.sql @@ -4852,11 +4852,12 @@ INSERT INTO `item_mods` VALUES (11086,112,20); -- HEALING: 20 INSERT INTO `item_mods` VALUES (11086,369,2); -- REFRESH: 2 -- Goetia Coat +2 -INSERT INTO `item_mods` VALUES (11087,1,50); -- DEF: 50 -INSERT INTO `item_mods` VALUES (11087,5,45); -- MP: 45 -INSERT INTO `item_mods` VALUES (11087,28,11); -- MATT: 11 -INSERT INTO `item_mods` VALUES (11087,30,11); -- MACC: 11 -INSERT INTO `item_mods` VALUES (11087,369,2); -- REFRESH: 2 +INSERT INTO `item_mods` VALUES (11087,1,50); -- DEF: 50 +INSERT INTO `item_mods` VALUES (11087,5,45); -- MP: 45 +INSERT INTO `item_mods` VALUES (11087,28,11); -- MATT: 11 +INSERT INTO `item_mods` VALUES (11087,30,11); -- MACC: 11 +INSERT INTO `item_mods` VALUES (11087,369,2); -- REFRESH: 2 +INSERT INTO `item_mods` VALUES (11087,1144,-12); -- ELEMENTAL_MAGIC_RECAST: -12 -- Estoqueurs Sayon +2 INSERT INTO `item_mods` VALUES (11088,1,52); -- DEF: 52 @@ -5090,10 +5091,11 @@ INSERT INTO `item_mods` VALUES (11118,5,50); -- MP: 50 INSERT INTO `item_mods` VALUES (11118,74,100); -- ENHANCES_MANA_CEDE: 100 -- Mavi Bazubands +2 -INSERT INTO `item_mods` VALUES (11119,1,26); -- DEF: 26 -INSERT INTO `item_mods` VALUES (11119,13,10); -- MND: 10 -INSERT INTO `item_mods` VALUES (11119,27,-4); -- ENMITY: -4 -INSERT INTO `item_mods` VALUES (11119,28,10); -- MATT: 10 +INSERT INTO `item_mods` VALUES (11119,1,26); -- DEF: 26 +INSERT INTO `item_mods` VALUES (11119,13,10); -- MND: 10 +INSERT INTO `item_mods` VALUES (11119,27,-4); -- ENMITY: -4 +INSERT INTO `item_mods` VALUES (11119,28,10); -- MATT: 10 +INSERT INTO `item_mods` VALUES (11119,1145,-12); -- BLUE_MAGIC_RECAST -12 -- Navarchs Gants +2 INSERT INTO `item_mods` VALUES (11120,1,26); -- DEF: 26 @@ -5557,11 +5559,12 @@ INSERT INTO `item_mods` VALUES (11186,112,15); -- HEALING: 15 INSERT INTO `item_mods` VALUES (11186,369,1); -- REFRESH: 1 -- Goetia Coat +1 -INSERT INTO `item_mods` VALUES (11187,1,47); -- DEF: 47 -INSERT INTO `item_mods` VALUES (11187,5,35); -- MP: 35 -INSERT INTO `item_mods` VALUES (11187,28,8); -- MATT: 8 -INSERT INTO `item_mods` VALUES (11187,30,8); -- MACC: 8 -INSERT INTO `item_mods` VALUES (11187,369,1); -- REFRESH: 1 +INSERT INTO `item_mods` VALUES (11187,1,47); -- DEF: 47 +INSERT INTO `item_mods` VALUES (11187,5,35); -- MP: 35 +INSERT INTO `item_mods` VALUES (11187,28,8); -- MATT: 8 +INSERT INTO `item_mods` VALUES (11187,30,8); -- MACC: 8 +INSERT INTO `item_mods` VALUES (11187,369,1); -- REFRESH: 1 +INSERT INTO `item_mods` VALUES (11187,1144,-6); -- ELEMENTAL_MAGIC_RECAST: -6 -- Estoqueurs Sayon +1 INSERT INTO `item_mods` VALUES (11188,1,49); -- DEF: 49 @@ -5786,10 +5789,11 @@ INSERT INTO `item_mods` VALUES (11218,5,40); -- MP: 40 INSERT INTO `item_mods` VALUES (11218,74,50); -- ENHANCES_MANA_CEDE: 50 -- Mavi Bazubands +1 -INSERT INTO `item_mods` VALUES (11219,1,24); -- DEF: 24 -INSERT INTO `item_mods` VALUES (11219,13,7); -- MND: 7 -INSERT INTO `item_mods` VALUES (11219,27,-3); -- ENMITY: -3 -INSERT INTO `item_mods` VALUES (11219,28,7); -- MATT: 7 +INSERT INTO `item_mods` VALUES (11219,1,24); -- DEF: 24 +INSERT INTO `item_mods` VALUES (11219,13,7); -- MND: 7 +INSERT INTO `item_mods` VALUES (11219,27,-3); -- ENMITY: -3 +INSERT INTO `item_mods` VALUES (11219,28,7); -- MATT: 7 +INSERT INTO `item_mods` VALUES (11219,1145,-6); -- BLUE_MAGIC_RECAST -6 -- Navarchs Gants +1 INSERT INTO `item_mods` VALUES (11220,1,24); -- DEF: 24 @@ -43826,6 +43830,7 @@ INSERT INTO `item_mods` VALUES (21176,12,12); -- INT: 12 INSERT INTO `item_mods` VALUES (21176,13,12); -- MND: 12 INSERT INTO `item_mods` VALUES (21176,28,18); -- MATT: 18 INSERT INTO `item_mods` VALUES (21176,311,207); -- MAGIC_DAMAGE: 207 +INSERT INTO `item_mods` VALUES (21176,1144,-3); -- ELEMENTAL_MAGIC_RECAST: -3 -- Twebuliij INSERT INTO `item_mods` VALUES (21177,5,20); -- MP: 20 @@ -49305,7 +49310,7 @@ INSERT INTO `item_mods` VALUES (23154,369,3); -- REFRESH: 3 INSERT INTO `item_mods` VALUES (23154,370,4); -- REGEN: 4 INSERT INTO `item_mods` VALUES (23154,384,300); -- HASTE_GEAR: 3% --- Wicce Coat : 2 +-- Wicce Coat +2 INSERT INTO `item_mods` VALUES (23155,1,144); -- DEF: 144 INSERT INTO `item_mods` VALUES (23155,2,70); -- HP: 70 INSERT INTO `item_mods` VALUES (23155,5,122); -- MP: 122 @@ -49325,7 +49330,7 @@ INSERT INTO `item_mods` VALUES (23155,68,78); -- EVA: 78 INSERT INTO `item_mods` VALUES (23155,311,24); -- MAGIC_DAMAGE: 24 INSERT INTO `item_mods` VALUES (23155,369,3); -- REFRESH: 3 INSERT INTO `item_mods` VALUES (23155,384,300); -- HASTE_GEAR: 3% -INSERT INTO `item_mods` VALUES (23155,901,15); -- ELEMENTAL_CELERITY: -15% +INSERT INTO `item_mods` VALUES (23155,1144,-15); -- ELEMENTAL_MAGIC_RECAST: -15 -- TODO: MAG_BURST_BONUS_II: : 4 -- Lethargy Sayon +2 @@ -50979,7 +50984,7 @@ INSERT INTO `item_mods` VALUES (23234,31,77); -- MEVA: 77 INSERT INTO `item_mods` VALUES (23234,68,64); -- EVA: 64 INSERT INTO `item_mods` VALUES (23234,160,-900); -- DMG: -9% INSERT INTO `item_mods` VALUES (23234,384,300); -- HASTE_GEAR: 3% --- TODO: Blue magic recast delay -15% +INSERT INTO `item_mods` VALUES (23234,1145,-15); -- BLUE_MAGIC_RECAST -15 -- Chasseur's Gants +2 INSERT INTO `item_mods` VALUES (23235,1,110); -- DEF: 110 @@ -65806,6 +65811,7 @@ INSERT INTO `item_mods` VALUES (26904,31,62); -- MEVA: 62 INSERT INTO `item_mods` VALUES (26904,68,17); -- EVA: 17 INSERT INTO `item_mods` VALUES (26904,369,2); -- REFRESH: 2 INSERT INTO `item_mods` VALUES (26904,384,200); -- HASTE_GEAR: 200 +INSERT INTO `item_mods` VALUES (26904,1144,-13); -- ELEMENTAL_MAGIC_RECAST: -13 -- Wicce Coat +1 INSERT INTO `item_mods` VALUES (26905,1,124); -- DEF: 124 @@ -65825,6 +65831,7 @@ INSERT INTO `item_mods` VALUES (26905,31,91); -- MEVA: 91 INSERT INTO `item_mods` VALUES (26905,68,38); -- EVA: 38 INSERT INTO `item_mods` VALUES (26905,369,2); -- REFRESH: 2 INSERT INTO `item_mods` VALUES (26905,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (26905,1144,-14); -- ELEMENTAL_MAGIC_RECAST: -14 -- Lethargy Sayon INSERT INTO `item_mods` VALUES (26906,1,91); -- DEF: 91 @@ -68200,6 +68207,7 @@ INSERT INTO `item_mods` VALUES (27082,29,1); -- MDEF: 1 INSERT INTO `item_mods` VALUES (27082,31,25); -- MEVA: 25 INSERT INTO `item_mods` VALUES (27082,68,11); -- EVA: 11 INSERT INTO `item_mods` VALUES (27082,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (27082,1145,-13); -- BLUE_MAGIC_RECAST -13 -- Hashishin Bazubands +1 INSERT INTO `item_mods` VALUES (27083,1,90); -- DEF: 90 @@ -68218,6 +68226,7 @@ INSERT INTO `item_mods` VALUES (27083,29,3); -- MDEF: 3 INSERT INTO `item_mods` VALUES (27083,31,37); -- MEVA: 37 INSERT INTO `item_mods` VALUES (27083,68,24); -- EVA: 24 INSERT INTO `item_mods` VALUES (27083,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (27083,1145,-14); -- BLUE_MAGIC_RECAST -14 -- Chasseurs Gants INSERT INTO `item_mods` VALUES (27084,1,60); -- DEF: 60 @@ -68412,6 +68421,7 @@ INSERT INTO `item_mods` VALUES (27105,31,37); -- MEVA: 37 INSERT INTO `item_mods` VALUES (27105,68,22); -- EVA: 22 INSERT INTO `item_mods` VALUES (27105,115,13); -- ELEM: 13 INSERT INTO `item_mods` VALUES (27105,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (27105,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 -- Asteria Mitts INSERT INTO `item_mods` VALUES (27106,1,82); -- DEF: 82 @@ -70749,9 +70759,9 @@ INSERT INTO `item_mods` VALUES (27304,28,30); -- MATT: 30 INSERT INTO `item_mods` VALUES (27304,29,6); -- MDEF: 6 INSERT INTO `item_mods` VALUES (27304,31,118); -- MEVA: 118 INSERT INTO `item_mods` VALUES (27304,68,24); -- EVA: 24 -INSERT INTO `item_mods` VALUES (27304,174,9); -- SKILLCHAINBONUS: 9 +INSERT INTO `item_mods` VALUES (27304,175,8); -- SKILLCHAINDMG: 8 INSERT INTO `item_mods` VALUES (27304,384,500); -- HASTE_GEAR: 500 -INSERT INTO `item_mods` VALUES (27304,397,7); -- BLACK_MAGIC_RECAST: 7 +INSERT INTO `item_mods` VALUES (27304,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 -- Amalric Slops +1 INSERT INTO `item_mods` VALUES (27305,1,106); -- DEF: 106 @@ -70768,9 +70778,9 @@ INSERT INTO `item_mods` VALUES (27305,28,40); -- MATT: 40 INSERT INTO `item_mods` VALUES (27305,29,6); -- MDEF: 6 INSERT INTO `item_mods` VALUES (27305,31,118); -- MEVA: 118 INSERT INTO `item_mods` VALUES (27305,68,24); -- EVA: 24 -INSERT INTO `item_mods` VALUES (27305,175,8); -- SKILLCHAINDMG: 8 +INSERT INTO `item_mods` VALUES (27305,175,9); -- SKILLCHAINDMG: 9 INSERT INTO `item_mods` VALUES (27305,384,500); -- HASTE_GEAR: 500 -INSERT INTO `item_mods` VALUES (27305,397,8); -- BLACK_MAGIC_RECAST: 8 +INSERT INTO `item_mods` VALUES (27305,1144,-8); -- ELEMENTAL_MAGIC_RECAST: -8 -- Kaykaus Tights INSERT INTO `item_mods` VALUES (27306,1,107); -- DEF: 107 @@ -72986,6 +72996,25 @@ INSERT INTO `item_mods` VALUES (27489,384,300); -- HASTE_GEAR: 300 INSERT INTO `item_mods` VALUES (27489,386,100); -- KICK_DMG: 100 INSERT INTO `item_mods` VALUES (27489,429,15); -- FOOTWORK_ATT_BONUS: 15 +-- Tutyr Sabots +INSERT INTO `item_mods` VALUES (27490,1,70); -- DEF: 70 +INSERT INTO `item_mods` VALUES (27490,2,13); -- HP: 13 +INSERT INTO `item_mods` VALUES (27490,5,14); -- MP: 14 +INSERT INTO `item_mods` VALUES (27490,8,10); -- STR: 10 +INSERT INTO `item_mods` VALUES (27490,9,11); -- DEX: 11 +INSERT INTO `item_mods` VALUES (27490,10,10); -- VIT: 10 +INSERT INTO `item_mods` VALUES (27490,11,33); -- AGI: 33 +INSERT INTO `item_mods` VALUES (27490,12,22); -- INT: 22 +INSERT INTO `item_mods` VALUES (27490,13,19); -- MND: 19 +INSERT INTO `item_mods` VALUES (27490,14,34); -- CHR: 34 +INSERT INTO `item_mods` VALUES (27490,68,55); -- EVA: 55 +INSERT INTO `item_mods` VALUES (27490,31,107); -- MEVA: 107 +INSERT INTO `item_mods` VALUES (27490,28,23); -- MATT: 23 +INSERT INTO `item_mods` VALUES (27490,29,5); -- MDEF: 5 +INSERT INTO `item_mods` VALUES (27490,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (27490,27,-7); -- ENMITY: -7 +INSERT INTO `item_mods` VALUES (27490,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 + -- Herculean Boots INSERT INTO `item_mods` VALUES (27496,1,79); -- DEF: 79 INSERT INTO `item_mods` VALUES (27496,2,9); -- HP: 9 diff --git a/src/map/modifier.h b/src/map/modifier.h index b05227658e4..df1eeb762d1 100644 --- a/src/map/modifier.h +++ b/src/map/modifier.h @@ -401,7 +401,7 @@ enum class Mod KICK_ATTACK_RATE = 292, // Percent chance to kick PERFECT_COUNTER_ATT = 428, // TODO: Raises weapon damage by 20 when countering while under the Perfect Counter effect. This also affects Weapon Rank (though // not if fighting barehanded). - COUNTER_DAMAGE = 1047, // TODO: Increases Damage from Counter Attacks (Percent) + COUNTER_DAMAGE = 1047, // Increases Damage from Counter Attacks (Percent) FOOTWORK_ATT_BONUS = 429, // Raises the attack bonus of Footwork. (Tantra Gaiters +2 raise 25/256 to 38/256) COUNTERSTANCE_EFFECT = 543, // Counterstance effect in percents DODGE_EFFECT = 552, // Dodge effect in percents @@ -420,8 +420,9 @@ enum class Mod REGEN_BONUS = 989, // Increases the amount of HP restored by Regen // Black Mage - CLEAR_MIND = 295, // Used in conjunction with HEALMP to increase amount between tics - CONSERVE_MP = 296, // Percent chance + CLEAR_MIND = 295, // Used in conjunction with HEALMP to increase amount between tics + CONSERVE_MP = 296, // Percent chance + ELEMENTAL_MAGIC_RECAST = 1144, // Recast time for elemental magic spells (percent, usually negative) // Red Mage BLINK = 299, // Tracks blink shadows @@ -610,6 +611,7 @@ enum class Mod BLUE_MAGIC_EFFECT = 1059, // TODO: Bonus to Attribute Value of spell (percent) ENHANCES_BURST_AFFINITY = 1139, // Increases WSC bonus on spells cast with Burst Affinity (percent) ENHANCES_CHAIN_AFFINITY = 1140, // TODO: Increases WSC bonus on spells cast with Chain Affinity (base damage +) + BLUE_MAGIC_RECAST = 1145, // Recast time for blue magic spells (percent, usually negative) // Corsair EXP_BONUS = 382, // @@ -1077,7 +1079,7 @@ enum class Mod // 570 through 825 used by WS DMG mods these are not spares. // // SPARE IDs: 544 to 551, both included. - // SPARE IDs: 1144 and onward + // SPARE IDs: 1146 and onward, but skip 1337 (AUGMENTS_ABSORB) }; // temporary workaround for using enum class as unordered_map key until compilers support it diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp index c3a31dcdb9d..f044cd90231 100644 --- a/src/map/utils/battleutils.cpp +++ b/src/map/utils/battleutils.cpp @@ -6405,6 +6405,15 @@ namespace battleutils recast = std::max(recast, static_cast(base * 0.2f)); + if (PSpell->getSkillType() == SKILLTYPE::SKILL_ELEMENTAL_MAGIC) + { + recast = static_cast(recast * ((100.0f + PEntity->getMod(Mod::ELEMENTAL_MAGIC_RECAST)) / 100.0f)); + } + if (PSpell->getSkillType() == SKILLTYPE::SKILL_BLUE_MAGIC) + { + recast = static_cast(recast * ((100.0f + PEntity->getMod(Mod::BLUE_MAGIC_RECAST)) / 100.0f)); + } + // Light/Dark arts recast bonus/penalties applies after other bonuses if (PSpell->getSpellGroup() == SPELLGROUP_BLACK) { From 6b87494ec41cbea0e41dd1e1a08cf0c4f9284e18 Mon Sep 17 00:00:00 2001 From: Will Buck Date: Tue, 29 Apr 2025 04:16:03 -0500 Subject: [PATCH 2/2] Fix item mods IDs --- sql/item_mods.sql | 30 +++++++++++++++--------------- src/map/modifier.h | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/sql/item_mods.sql b/sql/item_mods.sql index 249409d81d6..1b3eb8696ab 100644 --- a/sql/item_mods.sql +++ b/sql/item_mods.sql @@ -4860,7 +4860,7 @@ INSERT INTO `item_mods` VALUES (11087,5,45); -- MP: 45 INSERT INTO `item_mods` VALUES (11087,28,11); -- MATT: 11 INSERT INTO `item_mods` VALUES (11087,30,11); -- MACC: 11 INSERT INTO `item_mods` VALUES (11087,369,2); -- REFRESH: 2 -INSERT INTO `item_mods` VALUES (11087,1144,-12); -- ELEMENTAL_MAGIC_RECAST: -12 +INSERT INTO `item_mods` VALUES (11087,1146,-12); -- ELEMENTAL_MAGIC_RECAST: -12 -- Estoqueurs Sayon +2 INSERT INTO `item_mods` VALUES (11088,1,52); -- DEF: 52 @@ -5098,7 +5098,7 @@ INSERT INTO `item_mods` VALUES (11119,1,26); -- DEF: 26 INSERT INTO `item_mods` VALUES (11119,13,10); -- MND: 10 INSERT INTO `item_mods` VALUES (11119,27,-4); -- ENMITY: -4 INSERT INTO `item_mods` VALUES (11119,28,10); -- MATT: 10 -INSERT INTO `item_mods` VALUES (11119,1145,-12); -- BLUE_MAGIC_RECAST -12 +INSERT INTO `item_mods` VALUES (11119,1147,-12); -- BLUE_MAGIC_RECAST -12 -- Navarchs Gants +2 INSERT INTO `item_mods` VALUES (11120,1,26); -- DEF: 26 @@ -5567,7 +5567,7 @@ INSERT INTO `item_mods` VALUES (11187,5,35); -- MP: 35 INSERT INTO `item_mods` VALUES (11187,28,8); -- MATT: 8 INSERT INTO `item_mods` VALUES (11187,30,8); -- MACC: 8 INSERT INTO `item_mods` VALUES (11187,369,1); -- REFRESH: 1 -INSERT INTO `item_mods` VALUES (11187,1144,-6); -- ELEMENTAL_MAGIC_RECAST: -6 +INSERT INTO `item_mods` VALUES (11187,1146,-6); -- ELEMENTAL_MAGIC_RECAST: -6 -- Estoqueurs Sayon +1 INSERT INTO `item_mods` VALUES (11188,1,49); -- DEF: 49 @@ -5796,7 +5796,7 @@ INSERT INTO `item_mods` VALUES (11219,1,24); -- DEF: 24 INSERT INTO `item_mods` VALUES (11219,13,7); -- MND: 7 INSERT INTO `item_mods` VALUES (11219,27,-3); -- ENMITY: -3 INSERT INTO `item_mods` VALUES (11219,28,7); -- MATT: 7 -INSERT INTO `item_mods` VALUES (11219,1145,-6); -- BLUE_MAGIC_RECAST -6 +INSERT INTO `item_mods` VALUES (11219,1147,-6); -- BLUE_MAGIC_RECAST -6 -- Navarchs Gants +1 INSERT INTO `item_mods` VALUES (11220,1,24); -- DEF: 24 @@ -43868,7 +43868,7 @@ INSERT INTO `item_mods` VALUES (21176,12,12); -- INT: 12 INSERT INTO `item_mods` VALUES (21176,13,12); -- MND: 12 INSERT INTO `item_mods` VALUES (21176,28,18); -- MATT: 18 INSERT INTO `item_mods` VALUES (21176,311,207); -- MAGIC_DAMAGE: 207 -INSERT INTO `item_mods` VALUES (21176,1144,-3); -- ELEMENTAL_MAGIC_RECAST: -3 +INSERT INTO `item_mods` VALUES (21176,1146,-3); -- ELEMENTAL_MAGIC_RECAST: -3 -- Twebuliij INSERT INTO `item_mods` VALUES (21177,5,20); -- MP: 20 @@ -49368,7 +49368,7 @@ INSERT INTO `item_mods` VALUES (23155,68,78); -- EVA: 78 INSERT INTO `item_mods` VALUES (23155,311,24); -- MAGIC_DAMAGE: 24 INSERT INTO `item_mods` VALUES (23155,369,3); -- REFRESH: 3 INSERT INTO `item_mods` VALUES (23155,384,300); -- HASTE_GEAR: 3% -INSERT INTO `item_mods` VALUES (23155,1144,-15); -- ELEMENTAL_MAGIC_RECAST: -15 +INSERT INTO `item_mods` VALUES (23155,1146,-15); -- ELEMENTAL_MAGIC_RECAST: -15 -- TODO: MAG_BURST_BONUS_II: : 4 -- Lethargy Sayon +2 @@ -51022,7 +51022,7 @@ INSERT INTO `item_mods` VALUES (23234,31,77); -- MEVA: 77 INSERT INTO `item_mods` VALUES (23234,68,64); -- EVA: 64 INSERT INTO `item_mods` VALUES (23234,160,-900); -- DMG: -9% INSERT INTO `item_mods` VALUES (23234,384,300); -- HASTE_GEAR: 3% -INSERT INTO `item_mods` VALUES (23234,1145,-15); -- BLUE_MAGIC_RECAST -15 +INSERT INTO `item_mods` VALUES (23234,1147,-15); -- BLUE_MAGIC_RECAST -15 -- Chasseur's Gants +2 INSERT INTO `item_mods` VALUES (23235,1,110); -- DEF: 110 @@ -65850,7 +65850,7 @@ INSERT INTO `item_mods` VALUES (26904,31,62); -- MEVA: 62 INSERT INTO `item_mods` VALUES (26904,68,17); -- EVA: 17 INSERT INTO `item_mods` VALUES (26904,369,2); -- REFRESH: 2 INSERT INTO `item_mods` VALUES (26904,384,200); -- HASTE_GEAR: 200 -INSERT INTO `item_mods` VALUES (26904,1144,-13); -- ELEMENTAL_MAGIC_RECAST: -13 +INSERT INTO `item_mods` VALUES (26904,1146,-13); -- ELEMENTAL_MAGIC_RECAST: -13 -- Wicce Coat +1 INSERT INTO `item_mods` VALUES (26905,1,124); -- DEF: 124 @@ -65870,7 +65870,7 @@ INSERT INTO `item_mods` VALUES (26905,31,91); -- MEVA: 91 INSERT INTO `item_mods` VALUES (26905,68,38); -- EVA: 38 INSERT INTO `item_mods` VALUES (26905,369,2); -- REFRESH: 2 INSERT INTO `item_mods` VALUES (26905,384,300); -- HASTE_GEAR: 300 -INSERT INTO `item_mods` VALUES (26905,1144,-14); -- ELEMENTAL_MAGIC_RECAST: -14 +INSERT INTO `item_mods` VALUES (26905,1146,-14); -- ELEMENTAL_MAGIC_RECAST: -14 -- Lethargy Sayon INSERT INTO `item_mods` VALUES (26906,1,91); -- DEF: 91 @@ -68246,7 +68246,7 @@ INSERT INTO `item_mods` VALUES (27082,29,1); -- MDEF: 1 INSERT INTO `item_mods` VALUES (27082,31,25); -- MEVA: 25 INSERT INTO `item_mods` VALUES (27082,68,11); -- EVA: 11 INSERT INTO `item_mods` VALUES (27082,384,300); -- HASTE_GEAR: 300 -INSERT INTO `item_mods` VALUES (27082,1145,-13); -- BLUE_MAGIC_RECAST -13 +INSERT INTO `item_mods` VALUES (27082,1147,-13); -- BLUE_MAGIC_RECAST -13 -- Hashishin Bazubands +1 INSERT INTO `item_mods` VALUES (27083,1,90); -- DEF: 90 @@ -68265,7 +68265,7 @@ INSERT INTO `item_mods` VALUES (27083,29,3); -- MDEF: 3 INSERT INTO `item_mods` VALUES (27083,31,37); -- MEVA: 37 INSERT INTO `item_mods` VALUES (27083,68,24); -- EVA: 24 INSERT INTO `item_mods` VALUES (27083,384,300); -- HASTE_GEAR: 300 -INSERT INTO `item_mods` VALUES (27083,1145,-14); -- BLUE_MAGIC_RECAST -14 +INSERT INTO `item_mods` VALUES (27083,1147,-14); -- BLUE_MAGIC_RECAST -14 -- Chasseurs Gants INSERT INTO `item_mods` VALUES (27084,1,60); -- DEF: 60 @@ -68460,7 +68460,7 @@ INSERT INTO `item_mods` VALUES (27105,31,37); -- MEVA: 37 INSERT INTO `item_mods` VALUES (27105,68,22); -- EVA: 22 INSERT INTO `item_mods` VALUES (27105,115,13); -- ELEM: 13 INSERT INTO `item_mods` VALUES (27105,384,300); -- HASTE_GEAR: 300 -INSERT INTO `item_mods` VALUES (27105,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 +INSERT INTO `item_mods` VALUES (27105,1146,-7); -- ELEMENTAL_MAGIC_RECAST: -7 -- Asteria Mitts INSERT INTO `item_mods` VALUES (27106,1,82); -- DEF: 82 @@ -70800,7 +70800,7 @@ INSERT INTO `item_mods` VALUES (27304,31,118); -- MEVA: 118 INSERT INTO `item_mods` VALUES (27304,68,24); -- EVA: 24 INSERT INTO `item_mods` VALUES (27304,175,8); -- SKILLCHAINDMG: 8 INSERT INTO `item_mods` VALUES (27304,384,500); -- HASTE_GEAR: 500 -INSERT INTO `item_mods` VALUES (27304,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 +INSERT INTO `item_mods` VALUES (27304,1146,-7); -- ELEMENTAL_MAGIC_RECAST: -7 -- Amalric Slops +1 INSERT INTO `item_mods` VALUES (27305,1,106); -- DEF: 106 @@ -70819,7 +70819,7 @@ INSERT INTO `item_mods` VALUES (27305,31,118); -- MEVA: 118 INSERT INTO `item_mods` VALUES (27305,68,24); -- EVA: 24 INSERT INTO `item_mods` VALUES (27305,175,9); -- SKILLCHAINDMG: 9 INSERT INTO `item_mods` VALUES (27305,384,500); -- HASTE_GEAR: 500 -INSERT INTO `item_mods` VALUES (27305,1144,-8); -- ELEMENTAL_MAGIC_RECAST: -8 +INSERT INTO `item_mods` VALUES (27305,1146,-8); -- ELEMENTAL_MAGIC_RECAST: -8 -- Kaykaus Tights INSERT INTO `item_mods` VALUES (27306,1,107); -- DEF: 107 @@ -73052,7 +73052,7 @@ INSERT INTO `item_mods` VALUES (27490,28,23); -- MATT: 23 INSERT INTO `item_mods` VALUES (27490,29,5); -- MDEF: 5 INSERT INTO `item_mods` VALUES (27490,384,300); -- HASTE_GEAR: 300 INSERT INTO `item_mods` VALUES (27490,27,-7); -- ENMITY: -7 -INSERT INTO `item_mods` VALUES (27490,1144,-7); -- ELEMENTAL_MAGIC_RECAST: -7 +INSERT INTO `item_mods` VALUES (27490,1146,-7); -- ELEMENTAL_MAGIC_RECAST: -7 -- Herculean Boots INSERT INTO `item_mods` VALUES (27496,1,79); -- DEF: 79 diff --git a/src/map/modifier.h b/src/map/modifier.h index a55e7f99824..cc9e6610b83 100644 --- a/src/map/modifier.h +++ b/src/map/modifier.h @@ -1090,7 +1090,6 @@ enum class Mod // The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring. // 570 through 825 used by WS DMG mods these are not spares. // - // SPARE IDs: 544 to 551, both included. // SPARE IDs: 1148 and onward, but skip 1337 (AUGMENTS_ABSORB) };