From dbfce02580dd5710e36a61d8e62a9ca2627a8510 Mon Sep 17 00:00:00 2001 From: Will Buck Date: Thu, 1 May 2025 03:46:17 -0500 Subject: [PATCH] Add six new item mod IDs --- scripts/enum/mod.lua | 24 ++++++--- scripts/globals/spells/damage_spell.lua | 2 +- sql/item_mods.sql | 66 ++++++++++++++++++------- src/map/modifier.h | 43 +++++++++------- 4 files changed, 90 insertions(+), 45 deletions(-) diff --git a/scripts/enum/mod.lua b/scripts/enum/mod.lua index d8ead7ddc1e..7a916175898 100644 --- a/scripts/enum/mod.lua +++ b/scripts/enum/mod.lua @@ -470,6 +470,8 @@ xi.mod = ADDITIVE_GUARD = 1092, -- Additive % bonus to final Guard rate (adds after clamp) AUGMENTS_IMPETUS = 1097, -- see https://www.bg-wiki.com/ffxi/Impetus, adds Crit Hit Damage & Accuracy for Impetus + -- Black Mage + -- Paladin ENHANCES_CHIVALRY = 1061, -- Enhances "Chivalry" effect (increases the base TP modifier by the provided value / 100, e.g. mod value 5 = +0.05) ENHANCES_DIVINE_EMBLEM = 1062, -- Enhances "Divine Emblem" effect/"Divine Emblem" + (increases the ability's special enmity bonus by the provided value) @@ -499,6 +501,9 @@ xi.mod = ENHANCES_DIABOLIC_EYE = 275, -- Diabolic Eye duration + "modifier-value" seconds per Diabolic Eye merit. ENHANCES_NETHER_VOID = 1083, -- Enhances "Nether Void" effect (Increases the potency of the next Absorb or Drain Dark Magic by % ENHANCES_MUTED_SOUL = 1084, -- Enhances "Muted Soul" effect (Adds 3% Zanshin rate per MUTED_SOUL merit level) + ENHANCES_ABSORB_EFFECTS = 1136, -- Absorb Spell duration +x seconds (Enhances "Absorb" effects) + AUGMENTS_ABSORB = 1137, -- Non-Liberator Absorb Spell potency +x% (Augments "Absorb" effects) + ABSORB_EFFECT_DURATION = 1138, -- Absorb Spell duration +% ("Absorb" effect duration +x%) -- Beastmaster TANDEM_STRIKE_POWER = 271, -- Grants a bonus to your and your pet's accuracy and magic accuracy when you and your pet are attacking the same target. @@ -526,6 +531,11 @@ xi.mod = -- Puppetmaster AUTOMATON_LVL_BONUS = 1044, -- Automaton: Lv. (Increases automaton's base level above 99) + -- Blue Mage + 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 = 1147, -- Recast time for blue magic spells (percent, usually negative) + -- Geomancer FULL_CIRCLE = 1025, -- Increases the initial multiplier on MP returned via Full Circle BOLSTER_EFFECT = 1028, -- Adds bonus duration as +N seconds @@ -1038,13 +1048,13 @@ xi.mod = PARRY_HP_RECOVERY = 1135, -- Recover HP on successful parry. - ENHANCES_ABSORB_EFFECTS = 1136, -- Absorb Spell duration +x seconds (Enhances "Absorb" effects) - AUGMENTS_ABSORB = 1337, -- Non-Liberator Absorb Spell potency +x% (Augments "Absorb" effects) - ABSORB_EFFECT_DURATION = 1138, -- Absorb Spell duration +% ("Absorb" effect duration +x%) - - 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 = 1147, -- Recast time for blue magic spells (percent, usually negative) + -- TODO: These mods are not yet implemented. + ENHANCES_FUTAE = 1148, -- TODO: Adds to the +50% bonus damage to elemental ninjutsu provided by Futae (percent) + ENHANCES_ELEMENTAL_SEAL = 1149, -- TODO: Bonus magic damage when using Elemental Seal (percent) + ELEMENTAL_DEBUFF_EFFECT = 1150, -- TODO: Increase stat reduction by +N, and DoT by N/2 HP per tick + ENF_MAG_DURATION = 1151, -- TODO: Increase enfeebling spell duration (percent) + REWARD_RECAST = 1152, -- TODO: Reduces Reward recast time (seconds) + AUGMENTS_ABSORB_TP = 1153, -- TODO: Increases absorb-TP potency, stacks with AUGMENTS_ABSORB -- IF YOU ADD ANY NEW MODIFIER HERE, ADD IT IN src/map/modifier.h ASWELL! diff --git a/scripts/globals/spells/damage_spell.lua b/scripts/globals/spells/damage_spell.lua index 9cc09c458c8..7e7a069f8b0 100644 --- a/scripts/globals/spells/damage_spell.lua +++ b/scripts/globals/spells/damage_spell.lua @@ -613,7 +613,7 @@ xi.spells.damage.calculateMagicBonusDiff = function(caster, target, spellId, ski end -- "Enhances ninjutsu damage" ("Koga Hatsuburi" type gear) - mab = mab + caster:getMod(xi.mod.NIN_NUKE_BONUS_INNIN) + mab = mab + caster:getMod(xi.mod.NIN_NUKE_BONUS_GEAR) end if math.random(1, 100) <= mabCrit then diff --git a/sql/item_mods.sql b/sql/item_mods.sql index 1b3eb8696ab..2e5982898aa 100644 --- a/sql/item_mods.sql +++ b/sql/item_mods.sql @@ -2948,6 +2948,7 @@ INSERT INTO `item_mods` VALUES (10718,2,24); -- HP: 24 INSERT INTO `item_mods` VALUES (10718,8,7); -- STR: 7 INSERT INTO `item_mods` VALUES (10718,9,7); -- DEX: 7 INSERT INTO `item_mods` VALUES (10718,360,3); -- CHARM_TIME: 3 +INSERT INTO `item_mods` VALUES (10718,1152,10); -- REWARD_RECAST: 10 -- Bards Cannions +2 INSERT INTO `item_mods` VALUES (10719,1,40); -- DEF: 40 @@ -5043,6 +5044,7 @@ INSERT INTO `item_mods` VALUES (11111,23,10); -- ATT: 10 INSERT INTO `item_mods` VALUES (11111,25,10); -- ACC: 10 INSERT INTO `item_mods` VALUES (11111,83,5); -- GSWORD: 5 INSERT INTO `item_mods` VALUES (11111,384,500); -- HASTE_GEAR: 500 +INSERT INTO `item_mods` VALUES (11111,1153,10); -- AUGMENTS_ABSORB_TP: 10 -- Ferine Manoplas +2 INSERT INTO `item_mods` VALUES (11112,1,29); -- DEF: 29 @@ -5080,6 +5082,8 @@ INSERT INTO `item_mods` VALUES (11116,9,10); -- DEX: 10 INSERT INTO `item_mods` VALUES (11116,11,10); -- AGI: 10 INSERT INTO `item_mods` VALUES (11116,25,8); -- ACC: 8 INSERT INTO `item_mods` VALUES (11116,68,8); -- EVA: 8 +INSERT INTO `item_mods` VALUES (11116,522,10); -- NIN_NUKE_BONUS_GEAR: 10 +INSERT INTO `item_mods` VALUES (11116,1148,20); -- ENHANCES_FUTAE: 20 -- Lancers Vambraces +2 INSERT INTO `item_mods` VALUES (11117,1,30); -- DEF: 30 @@ -5743,6 +5747,7 @@ INSERT INTO `item_mods` VALUES (11211,23,7); -- ATT: 7 INSERT INTO `item_mods` VALUES (11211,25,7); -- ACC: 7 INSERT INTO `item_mods` VALUES (11211,82,3); -- SWORD: 3 INSERT INTO `item_mods` VALUES (11211,384,400); -- HASTE_GEAR: 400 +INSERT INTO `item_mods` VALUES (11211,1153,5); -- AUGMENTS_ABSORB_TP: 5 -- Ferine Manoplas +1 INSERT INTO `item_mods` VALUES (11212,1,27); -- DEF: 27 @@ -5779,6 +5784,8 @@ INSERT INTO `item_mods` VALUES (11216,9,7); -- DEX: 7 INSERT INTO `item_mods` VALUES (11216,11,7); -- AGI: 7 INSERT INTO `item_mods` VALUES (11216,25,6); -- ACC: 6 INSERT INTO `item_mods` VALUES (11216,68,6); -- EVA: 6 +INSERT INTO `item_mods` VALUES (11216,522,5); -- NIN_NUKE_BONUS_GEAR: 5 +INSERT INTO `item_mods` VALUES (11216,1148,10); -- ENHANCES_FUTAE: 10 -- Lancers Vambraces +1 INSERT INTO `item_mods` VALUES (11217,1,28); -- DEF: 28 @@ -25596,7 +25603,7 @@ INSERT INTO `item_mods` VALUES (15083,27,1); -- ENMITY: 1 -- Koga Hatsuburi INSERT INTO `item_mods` VALUES (15084,1,22); -- DEF: 22 INSERT INTO `item_mods` VALUES (15084,2,20); -- HP: 20 -INSERT INTO `item_mods` VALUES (15084,522,5); -- NIN_NUKE_BONUS: 5 +INSERT INTO `item_mods` VALUES (15084,522,5); -- NIN_NUKE_BONUS_GEAR: 5 -- Wyrm Armet INSERT INTO `item_mods` VALUES (15085,1,25); -- DEF: 25 @@ -26079,11 +26086,13 @@ INSERT INTO `item_mods` VALUES (15156,110,12); -- PARRY: 12 INSERT INTO `item_mods` VALUES (15157,1,25); -- DEF: 25 INSERT INTO `item_mods` VALUES (15157,5,8); -- MP: 8 INSERT INTO `item_mods` VALUES (15157,27,-1); -- ENMITY: -1 +INSERT INTO `item_mods` VALUES (15157,1152,10); -- REWARD_RECAST: 10 -- Braves Warbonnet INSERT INTO `item_mods` VALUES (15158,1,26); -- DEF: 26 INSERT INTO `item_mods` VALUES (15158,5,9); -- MP: 9 INSERT INTO `item_mods` VALUES (15158,27,-2); -- ENMITY: -2 +INSERT INTO `item_mods` VALUES (15158,1152,15); -- REWARD_RECAST: 15 -- Igqira Tiara INSERT INTO `item_mods` VALUES (15159,1,20); -- DEF: 20 @@ -26680,7 +26689,7 @@ INSERT INTO `item_mods` VALUES (15256,27,1); -- ENMITY: 1 -- Koga Hatsuburi +1 INSERT INTO `item_mods` VALUES (15257,1,23); -- DEF: 23 INSERT INTO `item_mods` VALUES (15257,2,27); -- HP: 27 -INSERT INTO `item_mods` VALUES (15257,522,5); -- NIN_NUKE_BONUS: 5 +INSERT INTO `item_mods` VALUES (15257,522,5); -- NIN_NUKE_BONUS_GEAR: 5 -- Wyrm Armet +1 INSERT INTO `item_mods` VALUES (15258,1,26); -- DEF: 26 @@ -30514,12 +30523,14 @@ INSERT INTO `item_mods` VALUES (16104,1,26); -- DEF: 26 INSERT INTO `item_mods` VALUES (16104,2,8); -- HP: 8 INSERT INTO `item_mods` VALUES (16104,5,8); -- MP: 8 INSERT INTO `item_mods` VALUES (16104,27,-3); -- ENMITY: -3 +INSERT INTO `item_mods` VALUES (16104,1152,10); -- REWARD_RECAST: 10 -- Stout Bonnet INSERT INTO `item_mods` VALUES (16105,1,27); -- DEF: 27 INSERT INTO `item_mods` VALUES (16105,2,9); -- HP: 9 INSERT INTO `item_mods` VALUES (16105,5,9); -- MP: 9 INSERT INTO `item_mods` VALUES (16105,27,-5); -- ENMITY: -5 +INSERT INTO `item_mods` VALUES (16105,1152,16); -- REWARD_RECAST: 16 -- Askar Zucchetto INSERT INTO `item_mods` VALUES (16106,1,23); -- DEF: 23 @@ -39331,6 +39342,7 @@ INSERT INTO `item_mods` VALUES (18994,28,20); -- MATT: 20 INSERT INTO `item_mods` VALUES (18994,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (18994,256,31); -- AFTERMATH: 31 INSERT INTO `item_mods` VALUES (18994,355,186); -- ADDS_WEAPONSKILL: 186 +INSERT INTO `item_mods` VALUES (18994,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (18995,30,10); -- MACC: 10 @@ -39635,6 +39647,7 @@ INSERT INTO `item_mods` VALUES (19063,28,30); -- MATT: 30 INSERT INTO `item_mods` VALUES (19063,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19063,256,36); -- AFTERMATH: 36 INSERT INTO `item_mods` VALUES (19063,355,186); -- ADDS_WEAPONSKILL: 186 +INSERT INTO `item_mods` VALUES (19063,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19064,30,15); -- MACC: 15 @@ -39755,6 +39768,7 @@ INSERT INTO `item_mods` VALUES (19083,28,40); -- MATT: 40 INSERT INTO `item_mods` VALUES (19083,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19083,256,36); -- AFTERMATH: 36 INSERT INTO `item_mods` VALUES (19083,355,186); -- ADDS_WEAPONSKILL: 186 +INSERT INTO `item_mods` VALUES (19083,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19084,30,20); -- MACC: 20 @@ -40308,7 +40322,7 @@ INSERT INTO `item_mods` VALUES (19270,13,2); -- MND: 2 INSERT INTO `item_mods` VALUES (19271,1,10); -- DEF: 10 -- Yagentoshiro -INSERT INTO `item_mods` VALUES (19272,522,10); -- NIN_NUKE_BONUS: 10 +INSERT INTO `item_mods` VALUES (19272,522,10); -- NIN_NUKE_BONUS_GEAR: 10 -- Onishibari INSERT INTO `item_mods` VALUES (19273,68,5); -- EVA: 5 @@ -40594,6 +40608,7 @@ INSERT INTO `item_mods` VALUES (19615,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19615,256,36); -- AFTERMATH: 36 INSERT INTO `item_mods` VALUES (19615,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (19615,756,15); -- WSD+% (Vidohunir): 15 +INSERT INTO `item_mods` VALUES (19615,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19616,30,25); -- MACC: 25 @@ -40810,6 +40825,7 @@ INSERT INTO `item_mods` VALUES (19713,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19713,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (19713,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (19713,756,15); -- WSD+% (Vidohunir): 15 +INSERT INTO `item_mods` VALUES (19713,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19714,30,25); -- MACC: 25 @@ -41389,7 +41405,8 @@ INSERT INTO `item_mods` VALUES (19822,28,60); -- MATT: 60 INSERT INTO `item_mods` VALUES (19822,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19822,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (19822,355,186); -- ADDS_WEAPONSKILL: 186 -INSERT INTO `item_mods` VALUES (19822,411,30); -- QUICK_DRAW_DMG: 30 +INSERT INTO `item_mods` VALUES (19822,756,30); -- WSD+% (Vidohunir): 30 +INSERT INTO `item_mods` VALUES (19822,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19823,30,30); -- MACC: 30 @@ -41736,6 +41753,7 @@ INSERT INTO `item_mods` VALUES (19951,30,10); -- MACC: 10 INSERT INTO `item_mods` VALUES (19951,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (19951,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (19951,756,30); -- WSD+% (Vidohunir): 30 +INSERT INTO `item_mods` VALUES (19951,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Murgleis INSERT INTO `item_mods` VALUES (19952,30,30); -- MACC: 30 @@ -43719,6 +43737,7 @@ INSERT INTO `item_mods` VALUES (21139,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (21139,311,248); -- MAGIC_DAMAGE: 248 INSERT INTO `item_mods` VALUES (21139,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (21139,756,30); -- WSD+% (Vidohunir): 30 +INSERT INTO `item_mods` VALUES (21139,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Laevateinn INSERT INTO `item_mods` VALUES (21140,25,30); -- ACC: 30 @@ -43728,6 +43747,7 @@ INSERT INTO `item_mods` VALUES (21140,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (21140,311,248); -- MAGIC_DAMAGE: 248 INSERT INTO `item_mods` VALUES (21140,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (21140,756,30); -- WSD+% (Vidohunir): 30 +INSERT INTO `item_mods` VALUES (21140,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Nirvana (119 I) INSERT INTO `item_mods` VALUES (21141,25,30); -- ACC: 30 @@ -46248,6 +46268,7 @@ INSERT INTO `item_mods` VALUES (22062,256,41); -- AFTERMATH: 41 INSERT INTO `item_mods` VALUES (22062,311,279); -- MAGIC_DAMAGE: 279 INSERT INTO `item_mods` VALUES (22062,355,186); -- ADDS_WEAPONSKILL: 186 INSERT INTO `item_mods` VALUES (22062,756,30); -- WSD+% (Vidohunir): 30 +INSERT INTO `item_mods` VALUES (22062,1149,10); -- ENHANCES_ELEMENTAL_SEAL: 10 -- Nirvana (119 III) INSERT INTO `item_mods` VALUES (22063,25,30); -- ACC: 30 @@ -47671,7 +47692,7 @@ INSERT INTO `item_mods` VALUES (23075,31,53); -- MEVA: 53 INSERT INTO `item_mods` VALUES (23075,68,63); -- EVA: 63 INSERT INTO `item_mods` VALUES (23075,110,18); -- PARRY: 18 INSERT INTO `item_mods` VALUES (23075,384,800); -- HASTE_GEAR: 8% -INSERT INTO `item_mods` VALUES (23075,522,18); -- NIN_NUKE_BONUS: 18 +INSERT INTO `item_mods` VALUES (23075,522,18); -- NIN_NUKE_BONUS_GEAR: 18 -- Pteroslaver Armet +2 INSERT INTO `item_mods` VALUES (23076,1,121); -- DEF: 121 @@ -50845,7 +50866,7 @@ INSERT INTO `item_mods` VALUES (23226,68,64); -- EVA: 64 INSERT INTO `item_mods` VALUES (23226,83,23); -- GSWORD: 23 INSERT INTO `item_mods` VALUES (23226,160,-900); -- DMG: -9% INSERT INTO `item_mods` VALUES (23226,384,600); -- HASTE_GEAR: 6% --- TODO: "Absorb-TP" effect +25% +INSERT INTO `item_mods` VALUES (23226,1153,25); -- AUGMENTS_ABSORB_TP: 25 -- Nukumi Manoplas +2 INSERT INTO `item_mods` VALUES (23227,1,112); -- DEF: 112 @@ -50956,8 +50977,8 @@ INSERT INTO `item_mods` VALUES (23231,31,93); -- MEVA: 93 INSERT INTO `item_mods` VALUES (23231,68,69); -- EVA: 69 INSERT INTO `item_mods` VALUES (23231,384,500); -- HASTE_GEAR: 5% INSERT INTO `item_mods` VALUES (23231,487,10); -- MAG_BURST_BONUS: 10 -INSERT INTO `item_mods` VALUES (23231,522,16); -- NIN_NUKE_BONUS: 16 --- TODO: "Futae"+26 +INSERT INTO `item_mods` VALUES (23231,522,16); -- NIN_NUKE_BONUS_GEAR: 16 +INSERT INTO `item_mods` VALUES (23231,1148,26); -- ENHANCES_FUTAE: 26 -- Peltast's vambraces +2 INSERT INTO `item_mods` VALUES (23232,1,118); -- DEF: 118 @@ -51329,6 +51350,7 @@ INSERT INTO `item_mods` VALUES (23249,228,1); -- AQUAN_KILLER: 1 INSERT INTO `item_mods` VALUES (23249,229,1); -- PLANTOID_KILLER: 1 INSERT INTO `item_mods` VALUES (23249,230,1); -- BEAST_KILLER: 1 INSERT INTO `item_mods` VALUES (23249,384,600); -- HASTE_GEAR: 600 +INSERT INTO `item_mods` VALUES (23249,1152,18); -- REWARD_RECAST: 18 -- Brioso Cannions +2 INSERT INTO `item_mods` VALUES (23250,1,117); -- DEF: 117 @@ -51775,7 +51797,7 @@ INSERT INTO `item_mods` VALUES (23272,31,79); -- MEVA: 79 INSERT INTO `item_mods` VALUES (23272,68,48); -- EVA: 48 INSERT INTO `item_mods` VALUES (23272,360,9); -- CHARM_TIME: 9 INSERT INTO `item_mods` VALUES (23272,384,600); -- HASTE_GEAR: 6% --- TODO: "Reward" recast delay -19 +INSERT INTO `item_mods` VALUES (23272,1152,19); -- REWARD_RECAST: 19 -- Bihu Cannions +2 INSERT INTO `item_mods` VALUES (23273,1,117); -- DEF: 117 @@ -55591,7 +55613,7 @@ INSERT INTO `item_mods` VALUES (23584,228,2); -- AQUAN_KILLER: 2 INSERT INTO `item_mods` VALUES (23584,229,2); -- PLANTOID_KILLER: 2 INSERT INTO `item_mods` VALUES (23584,230,2); -- BEAST_KILLER: 2 INSERT INTO `item_mods` VALUES (23584,384,600); -- HASTE_GEAR: 600 --- TODO: "Reward" recast time: -19 +INSERT INTO `item_mods` VALUES (23584,1152,19); -- REWARD_RECAST: 19 -- Brioso Cannions +3 INSERT INTO `item_mods` VALUES (23585,1,127); -- DEF: 127 @@ -56415,6 +56437,7 @@ INSERT INTO `item_mods` VALUES (23669,31,127); -- MEVA: 127 INSERT INTO `item_mods` VALUES (23669,68,75); -- EVA: 75 INSERT INTO `item_mods` VALUES (23669,115,17); -- ELEM: 17 INSERT INTO `item_mods` VALUES (23669,384,300); -- HASTE_GEAR: 300 +INSERT INTO `item_mods` VALUES (23669,1150,30); -- ELEMENTAL_DEBUFF_EFFECT: 30 -- Vitiation Boots +3 INSERT INTO `item_mods` VALUES (23670,1,87); -- DEF: 87 @@ -57878,7 +57901,7 @@ INSERT INTO `item_mods` VALUES (23780,244,11); -- SILENCERES: 11 INSERT INTO `item_mods` VALUES (23780,311,20); -- MAGIC_DAMAGE: 20 INSERT INTO `item_mods` VALUES (23780,384,500); -- HASTE_GEAR: 500 INSERT INTO `item_mods` VALUES (23780,487,9); -- MAG_BURST_BONUS: 9 --- TODO: Elemental magic status ailment effects +10 +INSERT INTO `item_mods` VALUES (23780,1150,10); -- ELEMENTAL_DEBUFF_EFFECT: 10 -- Bunzis Pants INSERT INTO `item_mods` VALUES (23781,1,142); -- DEF: 142 @@ -60761,7 +60784,8 @@ INSERT INTO `item_mods` VALUES (25823,311,49); -- MAGIC_DAMAGE: 49 INSERT INTO `item_mods` VALUES (25823,384,400); -- HASTE_GEAR: 400 -- Regal Cuffs -INSERT INTO `item_mods` VALUES (25827,832,2); -- AQUAVEIL_COUNT: 2 +INSERT INTO `item_mods` VALUES (25827,832,2); -- AQUAVEIL_COUNT: 2 +INSERT INTO `item_mods` VALUES (25827,1151,20); -- ENF_MAG_DURATION: 20 -- TODO: non-AQUAVEIL MODS -- Fancy Trunks @@ -61758,7 +61782,7 @@ INSERT INTO `item_mods` VALUES (26108,165,5); -- CRITHITRATE: 5 -- Snotra Earring INSERT INTO `item_mods` VALUES (26109,13,8); -- MND: 8 INSERT INTO `item_mods` VALUES (26109,30,10); -- MACC: 10 --- TODO: Enfeeble Magic Duration: +10% +INSERT INTO `item_mods` VALUES (26109,1151,10); -- ENF_MAG_DURATION: 10 -- Balder Earring +1 INSERT INTO `item_mods` VALUES (26115,23,10); -- ATT: 10 @@ -61864,7 +61888,7 @@ INSERT INTO `item_mods` VALUES (26187,305,10); -- RECYCLE: 10 -- Kishar Ring INSERT INTO `item_mods` VALUES (26188,30,5); -- MACC: 5 INSERT INTO `item_mods` VALUES (26188,170,4); -- FASTCAST: 4 --- TODO: Enfeeble Magic Duration: +10% +INSERT INTO `item_mods` VALUES (26188,1151,10); -- ENF_MAG_DURATION: 10 INSERT INTO `item_mods` VALUES (26188,1138,10); -- ABSORB_EFFECT_DURATION: 10 -- Moonlight Ring @@ -62141,7 +62165,7 @@ INSERT INTO `item_mods` VALUES (26362,73,4); -- STORETP: 4 -- Obstinate Sash INSERT INTO `item_mods` VALUES (26363,13,5); -- MND: 5 --- TODO: Enfeeble magic duration +5% +INSERT INTO `item_mods` VALUES (26363,1151,5); -- ENF_MAG_DURATION: 5 -- Sroda Belt INSERT INTO `item_mods` VALUES (26364,339,15); -- REGEN_DURATION: 15 @@ -67966,6 +67990,7 @@ INSERT INTO `item_mods` VALUES (27066,31,47); -- MEVA: 47 INSERT INTO `item_mods` VALUES (27066,68,11); -- EVA: 11 INSERT INTO `item_mods` VALUES (27066,83,15); -- GSWORD: 15 INSERT INTO `item_mods` VALUES (27066,384,500); -- HASTE_GEAR: 500 +INSERT INTO `item_mods` VALUES (27066,1153,15); -- AUGMENTS_ABSORB_TP: 15 -- Heathens Gauntlets +1 INSERT INTO `item_mods` VALUES (27067,1,103); -- DEF: 103 @@ -67984,6 +68009,7 @@ INSERT INTO `item_mods` VALUES (27067,31,32); -- MEVA: 32 INSERT INTO `item_mods` VALUES (27067,68,24); -- EVA: 24 INSERT INTO `item_mods` VALUES (27067,83,18); -- GSWORD: 18 INSERT INTO `item_mods` VALUES (27067,384,600); -- HASTE_GEAR: 600 +INSERT INTO `item_mods` VALUES (27067,1153,20); -- AUGMENTS_ABSORB_TP: 20 -- Nukumi Manoplas INSERT INTO `item_mods` VALUES (27068,1,66); -- DEF: 66 @@ -68143,6 +68169,7 @@ INSERT INTO `item_mods` VALUES (27076,25,13); -- ACC: 13 INSERT INTO `item_mods` VALUES (27076,31,29); -- MEVA: 29 INSERT INTO `item_mods` VALUES (27076,68,29); -- EVA: 29 INSERT INTO `item_mods` VALUES (27076,384,400); -- HASTE_GEAR: 400 +INSERT INTO `item_mods` VALUES (27076,1148,22); -- ENHANCES_FUTAE: 22 -- Hattori Tekko +1 INSERT INTO `item_mods` VALUES (27077,1,91); -- DEF: 91 @@ -68158,6 +68185,7 @@ INSERT INTO `item_mods` VALUES (27077,25,23); -- ACC: 23 INSERT INTO `item_mods` VALUES (27077,31,43); -- MEVA: 43 INSERT INTO `item_mods` VALUES (27077,68,59); -- EVA: 59 INSERT INTO `item_mods` VALUES (27077,384,500); -- HASTE_GEAR: 500 +INSERT INTO `item_mods` VALUES (27077,1148,24); -- ENHANCES_FUTAE: 24 -- Peltasts Vambraces INSERT INTO `item_mods` VALUES (27078,1,75); -- DEF: 75 @@ -69083,7 +69111,7 @@ INSERT INTO `item_mods` VALUES (27168,31,47); -- MEVA: 47 INSERT INTO `item_mods` VALUES (27168,68,17); -- EVA: 17 INSERT INTO `item_mods` VALUES (27168,360,5); -- CHARM_TIME: 5 INSERT INTO `item_mods` VALUES (27168,384,600); -- HASTE_GEAR: 600 --- TODO: "Reward" recast delay -15 +INSERT INTO `item_mods` VALUES (27168,1152,15); -- REWARD_RECAST: 15 -- Ankusa Trousers +1 INSERT INTO `item_mods` VALUES (27169,1,112); -- DEF: 112 @@ -69099,7 +69127,7 @@ INSERT INTO `item_mods` VALUES (27169,31,69); -- MEVA: 69 INSERT INTO `item_mods` VALUES (27169,68,38); -- EVA: 38 INSERT INTO `item_mods` VALUES (27169,360,7); -- CHARM_TIME: 7 INSERT INTO `item_mods` VALUES (27169,384,600); -- HASTE_GEAR: 600 --- TODO: "Reward" recast delay -17 +INSERT INTO `item_mods` VALUES (27169,1152,17); -- REWARD_RECAST: 17 -- Bihu Cannions INSERT INTO `item_mods` VALUES (27170,1,76); -- DEF: 76 @@ -79389,7 +79417,7 @@ INSERT INTO `item_mods` VALUES (28098,229,1); -- PLANTOID_KILLER: 1 INSERT INTO `item_mods` VALUES (28098,230,1); -- BEAST_KILLER: 1 INSERT INTO `item_mods` VALUES (28098,360,7); -- CHARM_TIME: 7 INSERT INTO `item_mods` VALUES (28098,384,600); -- HASTE_GEAR: 600 --- TODO: Reduces "Reward" recast time +INSERT INTO `item_mods` VALUES (28098,1152,15); -- REWARD_RECAST: 15 -- Brioso Cannions INSERT INTO `item_mods` VALUES (28099,1,76); -- DEF: 76 @@ -79759,7 +79787,7 @@ INSERT INTO `item_mods` VALUES (28119,229,1); -- PLANTOID_KILLER: 1 INSERT INTO `item_mods` VALUES (28119,230,1); -- BEAST_KILLER: 1 INSERT INTO `item_mods` VALUES (28119,360,7); -- CHARM_TIME: 7 INSERT INTO `item_mods` VALUES (28119,384,600); -- HASTE_GEAR: 600 --- TODO: "Reward" recast time: -17 +INSERT INTO `item_mods` VALUES (28119,1152,17); -- REWARD_RECAST: 17 -- Brioso Cannions +1 INSERT INTO `item_mods` VALUES (28120,1,107); -- DEF: 107 diff --git a/src/map/modifier.h b/src/map/modifier.h index cc9e6610b83..4cc27aa26bb 100644 --- a/src/map/modifier.h +++ b/src/map/modifier.h @@ -482,20 +482,23 @@ enum class Mod SHIELD_BARRIER = 1082, // Grants a bonus to Protect spells cast by self while a shield is equipped. // Dark Knight - ARCANE_CIRCLE_DURATION = 858, // Arcane Circle extended duration in seconds - ARCANE_CIRCLE_POTENCY = 1069, // Increases the potency of the Arcane Circle effect (e.g. mod value 2 = +2% Arcana Killer) - SOULEATER_EFFECT = 96, // Souleater power in percents - SOULEATER_EFFECT_II = 53, // Uncapped additive Souleaterbonus in percents, 10 = .1 - DESPERATE_BLOWS = 906, // Adds ability haste to Last Resort - STALWART_SOUL = 907, // Reduces damage taken from Souleater - DREAD_SPIKES_EFFECT = 998, // Percent increase to total HP drain for Dread Spikes - DARK_MAGIC_CAST = 1071, // Reduces Dark Magic Casting Time by percentage (e.g. mod value -10 = -10% cast time) - DARK_MAGIC_DURATION = 1072, // Increases Dark Magic spell durations by percentage (e.g. mod value 10 = +10% duration) - ENHANCES_BLOOD_WEAPON = 1070, // Enhances "Blood Weapon" effect (increases Blood Weapon's duration in seconds) - ENHANCES_DARK_SEAL = 1073, // Enhances "Dark Seal" effect (Increases Dark Magic spell durations by 10% per Dark Seal merit while Dark Seal active) - ENHANCES_DIABOLIC_EYE = 275, // Diabolic Eye duration + "modifier-value" seconds per Diabolic Eye merit. - ENHANCES_NETHER_VOID = 1083, // Enhances "Nether Void" effect (Increases the potency of the next Absorb or Drain Dark Magic by % - ENHANCES_MUTED_SOUL = 1084, // Enhances "Muted Soul" effect (Adds 3% Zanshin rate per MUTED_SOUL merit level) + ARCANE_CIRCLE_DURATION = 858, // Arcane Circle extended duration in seconds + ARCANE_CIRCLE_POTENCY = 1069, // Increases the potency of the Arcane Circle effect (e.g. mod value 2 = +2% Arcana Killer) + SOULEATER_EFFECT = 96, // Souleater power in percents + SOULEATER_EFFECT_II = 53, // Uncapped additive Souleaterbonus in percents, 10 = .1 + DESPERATE_BLOWS = 906, // Adds ability haste to Last Resort + STALWART_SOUL = 907, // Reduces damage taken from Souleater + DREAD_SPIKES_EFFECT = 998, // Percent increase to total HP drain for Dread Spikes + DARK_MAGIC_CAST = 1071, // Reduces Dark Magic Casting Time by percentage (e.g. mod value -10 = -10% cast time) + DARK_MAGIC_DURATION = 1072, // Increases Dark Magic spell durations by percentage (e.g. mod value 10 = +10% duration) + ENHANCES_BLOOD_WEAPON = 1070, // Enhances "Blood Weapon" effect (increases Blood Weapon's duration in seconds) + ENHANCES_DARK_SEAL = 1073, // Enhances "Dark Seal" effect (Increases Dark Magic spell durations by 10% per Dark Seal merit while Dark Seal active) + ENHANCES_DIABOLIC_EYE = 275, // Diabolic Eye duration + "modifier-value" seconds per Diabolic Eye merit. + ENHANCES_NETHER_VOID = 1083, // Enhances "Nether Void" effect (Increases the potency of the next Absorb or Drain Dark Magic by % + ENHANCES_MUTED_SOUL = 1084, // Enhances "Muted Soul" effect (Adds 3% Zanshin rate per MUTED_SOUL merit level) + ENHANCES_ABSORB_EFFECTS = 1136, // Absorb Spell duration +x seconds (Enhances "Absorb" effects) + AUGMENTS_ABSORB = 1137, // Non-Liberator Absorb Spell potency +x% (Augments "Absorb" effects) + ABSORB_EFFECT_DURATION = 1138, // Absorb Spell duration +% ("Absorb" effect duration +x%) // Beastmaster TAME = 304, // Additional percent chance to charm @@ -1081,16 +1084,20 @@ enum class Mod PARRY_HP_RECOVERY = 1135, // Recover HP on successful parry. - ENHANCES_ABSORB_EFFECTS = 1136, // Absorb Spell duration +x seconds (Enhances "Absorb" effects) - AUGMENTS_ABSORB = 1337, // Non-Liberator Absorb Spell potency +x% (Augments "Absorb" effects) - ABSORB_EFFECT_DURATION = 1138, // Absorb Spell duration +% ("Absorb" effect duration +x%) + // TODO: These mods are not yet implemented. + ENHANCES_FUTAE = 1148, // TODO: Adds to the +50% bonus damage to elemental ninjutsu provided by Futae (percent) + ENHANCES_ELEMENTAL_SEAL = 1149, // TODO: Bonus magic damage when using Elemental Seal (percent) + ELEMENTAL_DEBUFF_EFFECT = 1150, // TODO: Increase stat reduction by +N, and DoT by N/2 HP per tick + ENF_MAG_DURATION = 1151, // TODO: Increase enfeebling spell duraiton (percent) + REWARD_RECAST = 1152, // TODO: Reward recast time reduction (seconds) + AUGMENTS_ABSORB_TP = 1153, // TODO: Increases absorb-TP potency, stacks with AUGMENTS_ABSORB // IF YOU ADD ANY NEW MODIFIER HERE, ADD IT IN scripts/enum/mod.lua ASWELL! // 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: 1148 and onward, but skip 1337 (AUGMENTS_ABSORB) + // SPARE IDs: 1154 and onward }; // temporary workaround for using enum class as unordered_map key until compilers support it