diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index 75e41c1dfc3..f1c4cce7b57 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -274,6 +274,7 @@ c["+1% Chance to Block Attack Damage per 50 Strength"]={{[1]={[1]={div=50,stat=" c["+1% Chance to Block Attack Damage per Endurance Charge"]={{[1]={[1]={type="Multiplier",var="EnduranceCharge"},flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=1}},nil} c["+1% Chance to Block Attack Damage per Frenzy Charge"]={{[1]={[1]={type="Multiplier",var="FrenzyCharge"},flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=1}},nil} c["+1% Chance to Block Attack Damage per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=1}},nil} +c["+1% Chance to Block Attack Damage per Summoned Skeleton"]={{[1]={[1]={stat="ActiveSkeletonLimit",type="PerStat"},flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=1}},nil} c["+1% Chance to Block Spell Damage per 5% Chance to Block Attack Damage"]={{[1]={[1]={div=5,stat="BlockChance",type="PerStat"},flags=0,keywordFlags=0,name="SpellBlockChance",type="BASE",value=1}},nil} c["+1% Chance to Block Spell Damage per 50 Strength"]={{[1]={[1]={div=50,stat="Str",type="PerStat"},flags=0,keywordFlags=0,name="SpellBlockChance",type="BASE",value=1}},nil} c["+1% Chance to Suppress Spell Damage per 15 Dexterity"]={{[1]={[1]={div=15,stat="Dex",type="PerStat"},flags=0,keywordFlags=0,name="SpellSuppressionChance",type="BASE",value=1}},nil} @@ -5003,8 +5004,8 @@ c["130% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC end)();(function() c["130% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEnergyShield",type="INC",value=130}},nil} c["130% increased Armour and Evasion"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEvasion",type="INC",value=130}},nil} -c["130% increased Critical Strike Chance against Blinded Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Blinded"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=130}},nil} end)();(function() +c["130% increased Critical Strike Chance against Blinded Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Blinded"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=130}},nil} c["130% increased Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="INC",value=130}},nil} c["130% increased Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",type="INC",value=130}},nil} c["130% increased Evasion Rating if you've Cast Dash recently"]={{[1]={[1]={type="Condition",var="CastDashRecently"},flags=0,keywordFlags=0,name="Evasion",type="INC",value=130}},nil} @@ -6048,6 +6049,7 @@ c["18% increased Quantity of Fish Caught"]={{}," Quantity of Fish Caught "} c["18% increased Quantity of Items found during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="LootQuantity",type="INC",value=18}},nil} c["18% increased Skill Effect Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=18}},nil} c["18% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type="INC",value=18}},nil} +c["18% increased Spell Damage per Summoned Skeleton"]={{[1]={[1]={stat="ActiveSkeletonLimit",type="PerStat"},flags=2,keywordFlags=0,name="Damage",type="INC",value=18}},nil} c["18% increased Strength"]={{[1]={flags=0,keywordFlags=0,name="Str",type="INC",value=18}},nil} c["18% increased Stun Duration on Enemies"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunDuration",type="INC",value=18}},nil} c["18% increased Stun and Block Recovery"]={{[1]={flags=0,keywordFlags=0,name="StunRecovery",type="INC",value=18}},nil} @@ -7257,6 +7259,7 @@ c["24% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name=" c["24% increased Armour and Evasion"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEvasion",type="INC",value=24}},nil} c["24% increased Armour, Evasion and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="Defences",type="INC",value=24}},nil} c["24% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",type="INC",value=24}},nil} +c["24% increased Attack Damage per Raised Zombie"]={{[1]={[1]={stat="ActiveZombieLimit",type="PerStat"},flags=1,keywordFlags=0,name="Damage",type="INC",value=24}},nil} c["24% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=24}},nil} c["24% increased Attack Speed if you've used an Attack Movement Skill Recently"]={{[1]={[1]={type="Condition",var="UsedMovementSkillRecently"},flags=1,keywordFlags=0,name="Speed",type="INC",value=24}},nil} c["24% increased Attack Speed while Fortified"]={{[1]={[1]={type="Condition",var="Fortified"},flags=1,keywordFlags=0,name="Speed",type="INC",value=24}},nil} @@ -8461,6 +8464,7 @@ c["30% increased Mana Recovery from Flasks"]={{[1]={flags=0,keywordFlags=0,name= c["30% increased Mana Regeneration Rate"]={{[1]={flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} c["30% increased Mana Regeneration Rate if you have Frozen an Enemy Recently"]={{[1]={[1]={type="Condition",var="FrozenEnemyRecently"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} c["30% increased Mana Regeneration Rate if you have Shocked an Enemy Recently"]={{[1]={[1]={type="Condition",var="ShockedEnemyRecently"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} +c["30% increased Mana Regeneration Rate per Raised Spectre"]={{[1]={[1]={stat="ActiveSpectreLimit",type="PerStat"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} c["30% increased Mana Regeneration Rate while stationary"]={{[1]={[1]={type="Condition",var="Stationary"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} c["30% increased Mana Reservation Efficiency of Skills that throw Mines"]={{[1]={flags=0,keywordFlags=8192,name="ManaReservationEfficiency",type="INC",value=30}},nil} c["30% increased Maximum total Energy Shield Recovery per second from Leech"]={{[1]={flags=0,keywordFlags=0,name="MaxEnergyShieldLeechRate",type="INC",value=30}},nil} @@ -10009,11 +10013,11 @@ c["5% chance to Freeze"]={{[1]={flags=0,keywordFlags=0,name="EnemyFreezeChance", c["5% chance to Freeze, Shock and Ignite"]={{[1]={flags=0,keywordFlags=0,name="EnemyFreezeChance",type="BASE",value=5},[2]={flags=0,keywordFlags=0,name="EnemyShockChance",type="BASE",value=5},[3]={flags=0,keywordFlags=0,name="EnemyIgniteChance",type="BASE",value=5}},nil} c["5% chance to Gain Unholy Might for 4 seconds on Melee Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=67108864,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}},nil} c["5% chance to Hinder Enemies on Hit with Spells"]={{[1]={flags=2,keywordFlags=0,name="HinderChance",type="BASE",value=5},[2]={[1]={actor="enemy",type="ActorCondition",var="Hindered"},flags=0,keywordFlags=0,name="Dummy",source="Select enemy Hindered in Configuration",type="DUMMY",value=1}},nil} +end)();(function() c["5% chance to Ignite"]={{[1]={flags=0,keywordFlags=0,name="EnemyIgniteChance",type="BASE",value=5}},nil} c["5% chance to Impale Enemies on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="ImpaleChance",type="BASE",value=5}},nil} c["5% chance to Intimidate Enemies for 4 seconds on Hit"]={{}," to Intimidate Enemies "} c["5% chance to Knock Enemies Back on hit"]={{[1]={flags=0,keywordFlags=0,name="EnemyKnockbackChance",type="BASE",value=5}},nil} -end)();(function() c["5% chance to Poison on Hit"]={{[1]={flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=5}},nil} c["5% chance to Recover 10% of Mana when you use a Skill"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=5}}," to Recover 10% of when you use a Skill "} c["5% chance to Restore your Ward on Hit"]={{[1]={flags=4,keywordFlags=0,name="Ward",type="BASE",value=5}}," to Restore your "} @@ -13835,11 +13839,11 @@ c["All Damage Taken from Hits can Chill you"]={nil,"All Damage Taken from Hits c c["All Damage Taken from Hits can Chill you Enemies Chilled by your Hits can be Shattered as though Frozen"]={nil,"All Damage Taken from Hits can Chill you Enemies Chilled by your Hits can be Shattered as though Frozen "} c["All Damage Taken from Hits can Ignite you"]={nil,"All Damage Taken from Hits can Ignite you "} c["All Damage can Freeze"]={{[1]={flags=0,keywordFlags=0,name="PhysicalCanFreeze",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="LightningCanFreeze",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="FireCanFreeze",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="ChaosCanFreeze",type="FLAG",value=true}},nil} -c["All Damage can Freeze against Cursed Enemies"]={nil,"All Damage can Freeze against Cursed Enemies "} +c["All Damage can Freeze against Cursed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="PhysicalCanFreeze",type="FLAG",value=true},[2]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="LightningCanFreeze",type="FLAG",value=true},[3]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="FireCanFreeze",type="FLAG",value=true},[4]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="ChaosCanFreeze",type="FLAG",value=true}},nil} c["All Damage can Ignite"]={{[1]={flags=0,keywordFlags=0,name="PhysicalCanIgnite",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="ColdCanIgnite",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="LightningCanIgnite",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="ChaosCanIgnite",type="FLAG",value=true}},nil} -c["All Damage can Ignite against Cursed Enemies"]={nil,"All Damage can Ignite against Cursed Enemies "} +c["All Damage can Ignite against Cursed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="PhysicalCanIgnite",type="FLAG",value=true},[2]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="ColdCanIgnite",type="FLAG",value=true},[3]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="LightningCanIgnite",type="FLAG",value=true},[4]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="ChaosCanIgnite",type="FLAG",value=true}},nil} c["All Damage can Shock"]={{[1]={flags=0,keywordFlags=0,name="PhysicalCanShock",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="FireCanShock",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="ColdCanShock",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="ChaosCanShock",type="FLAG",value=true}},nil} -c["All Damage can Shock against Cursed Enemies"]={nil,"All Damage can Shock against Cursed Enemies "} +c["All Damage can Shock against Cursed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="PhysicalCanShock",type="FLAG",value=true},[2]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="FireCanShock",type="FLAG",value=true},[3]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="ColdCanShock",type="FLAG",value=true},[4]={[1]={actor="enemy",type="ActorCondition",var="Cursed"},flags=0,keywordFlags=0,name="ChaosCanShock",type="FLAG",value=true}},nil} c["All Damage from Critical Strikes can apply Cold Ailments during effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="PhysicalCanChill",type="FLAG",value=true},[2]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="LightningCanChill",type="FLAG",value=true},[3]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="FireCanChill",type="FLAG",value=true},[4]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ChaosCanChill",type="FLAG",value=true},[5]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="PhysicalCanFreeze",type="FLAG",value=true},[6]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="LightningCanFreeze",type="FLAG",value=true},[7]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="FireCanFreeze",type="FLAG",value=true},[8]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ChaosCanFreeze",type="FLAG",value=true},[9]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="PhysicalCanBrittle",type="FLAG",value=true},[10]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="LightningCanBrittle",type="FLAG",value=true},[11]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="FireCanBrittle",type="FLAG",value=true},[12]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ChaosCanBrittle",type="FLAG",value=true}},nil} c["All Damage from Critical Strikes can apply Lightning Ailments during effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="PhysicalCanShock",type="FLAG",value=true},[2]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ColdCanShock",type="FLAG",value=true},[3]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="FireCanShock",type="FLAG",value=true},[4]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ChaosCanShock",type="FLAG",value=true},[5]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="PhysicalCanSap",type="FLAG",value=true},[6]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ColdCanSap",type="FLAG",value=true},[7]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="FireCanSap",type="FLAG",value=true},[8]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,type="Condition",var="NeverCrit"},flags=0,keywordFlags=0,name="ChaosCanSap",type="FLAG",value=true}},nil} c["All Damage from Hits can Poison"]={{[1]={flags=0,keywordFlags=0,name="FireCanPoison",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="ColdCanPoison",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="LightningCanPoison",type="FLAG",value=true}},nil} @@ -15017,11 +15021,11 @@ c["Consecrated Ground you create grants 30% increased Accuracy Rating to you and c["Consecrated Ground you create grants 30% increased Mana Regeneration"]={{[1]={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil} c["Consecrated Ground you create grants 5% reduced damage taken to you and Allies"]={{[1]={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="ExtraAura",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageTaken",type="INC",value=-5}}}},nil} c["Consecrated Ground you create while affected by Zealotry causes enemies to take 10% increased Damage"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="OnConsecratedGround"},[2]={type="Condition",var="AffectedByZealotry"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageTakenConsecratedGround",type="INC",value=10}}}},nil} +end)();(function() c["Consecrated Ground you create while affected by Zealotry causes enemies to take 9% increased Damage"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="OnConsecratedGround"},[2]={type="Condition",var="AffectedByZealotry"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageTakenConsecratedGround",type="INC",value=9}}}},nil} c["Consumes Frenzy Charges on use"]={nil,"Consumes Frenzy Charges on use "} c["Consumes Frenzy Charges on use Gain Onslaught for 1 second per Frenzy Charge consumed on use"]={nil,"Consumes Frenzy Charges on use Gain Onslaught for 1 second per Frenzy Charge consumed on use "} c["Consumes Maximum Charges to use"]={nil,"Consumes Maximum Charges to use "} -end)();(function() c["Consumes Maximum Charges to use Gain Vaal Souls equal to Charges Consumed when used"]={nil,"Consumes Maximum Charges to use Gain Vaal Souls equal to Charges Consumed when used "} c["Consumes Socketed Uncorrupted Support Gems when they reach Maximum Level"]={nil,"Consumes Socketed Uncorrupted Support Gems when they reach Maximum Level "} c["Consumes Socketed Uncorrupted Support Gems when they reach Maximum Level Can Consume 4 Uncorrupted Support Gems"]={nil,"Consumes Socketed Uncorrupted Support Gems when they reach Maximum Level Can Consume 4 Uncorrupted Support Gems "} @@ -15143,6 +15147,7 @@ c["Curse Skills have 40% increased Skill Effect Duration"]={{[1]={flags=0,keywor c["Curse Skills have 50% increased Skill Effect Duration"]={{[1]={flags=0,keywordFlags=2,name="Duration",type="INC",value=50}},nil} c["Curse Skills have 8% increased Cast Speed"]={{[1]={flags=16,keywordFlags=2,name="Speed",type="INC",value=8}},nil} c["Cursed Enemies cannot inflict Elemental Ailments on You"]={nil,"Cursed Enemies cannot inflict Elemental Ailments on You "} +c["Cursed Enemies cannot inflict Elemental Ailments on You All Damage can Ignite against Cursed Enemies"]={nil,"Cursed Enemies cannot inflict Elemental Ailments on You All Damage can Ignite against Cursed Enemies "} c["Cursed Enemies you Kill are destroyed"]={nil,"Cursed Enemies you Kill are destroyed "} c["Cursed Enemies you Kill are destroyed Enemies Cursed by you have 50% reduced Life Regeneration Rate"]={nil,"Cursed Enemies you Kill are destroyed Enemies Cursed by you have 50% reduced Life Regeneration Rate "} c["Cursed Enemies you Kill are destroyed Enemies Cursed by you have 50% reduced Life Regeneration Rate Enemies you Curse cannot Recharge Energy Shield"]={nil,"Cursed Enemies you Kill are destroyed Enemies Cursed by you have 50% reduced Life Regeneration Rate Enemies you Curse cannot Recharge Energy Shield "} @@ -16729,7 +16734,8 @@ c["Grace has 56% increased Aura Effect"]={{[1]={[1]={includeTransfigured=true,sk c["Grace has 59% increased Aura Effect"]={{[1]={[1]={includeTransfigured=true,skillName="Grace",type="SkillName"},flags=0,keywordFlags=0,name="AuraEffect",type="INC",value=59}},nil} c["Grace has 60% increased Aura Effect"]={{[1]={[1]={includeTransfigured=true,skillName="Grace",type="SkillName"},flags=0,keywordFlags=0,name="AuraEffect",type="INC",value=60}},nil} c["Grace has no Reservation"]={{[1]={[1]={skillId="Grace",type="SkillId"},[2]={neg=true,skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationFlat",value=0}},[2]={[1]={skillId="Grace",type="SkillId"},[2]={neg=true,skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationFlat",value=0}},[3]={[1]={skillId="Grace",type="SkillId"},[2]={neg=true,skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationPercent",value=0}},[4]={[1]={skillId="Grace",type="SkillId"},[2]={neg=true,skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationPercent",value=0}}},nil} -c["Granite Flasks applied to you have 50% increased Effect"]={nil,"Granite Flasks applied to you have 50% increased Effect "} +c["Granite Flasks applied to you have 50% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="GraniteFlaskEffect",type="INC",value=50}},nil} +c["Granite Flasks applied to you have 80% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="GraniteFlaskEffect",type="INC",value=80}},nil} c["Grant bonuses to Non-Channelling Skills you use by consuming 3 Charges from a Flask of"]={nil,"Grant bonuses to Non-Channelling Skills you use by consuming 3 Charges from a Flask of "} c["Grant bonuses to Non-Channelling Skills you use by consuming 3 Charges from a Flask of each of the following types, if possible:"]={{},nil} c["Grants +1 to Dexterity per 2% Quality"]={{[1]={[1]={div=2,type="Multiplier",var="QualityOn{SlotName}"},flags=0,keywordFlags=0,name="Dex",type="BASE",value=1}},nil} @@ -17636,7 +17642,7 @@ c["Life Flasks gain a Charge when you hit an Enemy, no more than once each secon c["Life Flasks used while on Low Life apply Recovery Instantly"]={{[1]={[1]={type="Condition",var="LowLife"},flags=0,keywordFlags=0,name="LifeFlaskInstantRecovery",type="BASE",value=100}},nil} c["Life Leech effects Recover Energy Shield instead while on Full Life"]={{[1]={[1]={type="Condition",var="FullLife"},[2]={type="Condition",var="LeechingLife"},flags=0,keywordFlags=0,name="ImmortalAmbition",type="FLAG",value=true}},nil} c["Life Leech effects are not removed when Unreserved Life is Filled"]={{[1]={flags=0,keywordFlags=0,name="CanLeechLifeOnFullLife",type="FLAG",value=true}},nil} -c["Life Leech from Critical Strikes is instant"]={nil,"Life Leech from Critical Strikes is instant "} +c["Life Leech from Critical Strikes is instant"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="InstantLifeLeech",type="BASE",value=100}},nil} c["Life Leech from Exerted Attacks is instant"]={nil,"Life Leech from Exerted Attacks is instant "} c["Life Leech from Exerted Attacks is instant Non-Exerted Attacks deal no Damage"]={nil,"Life Leech from Exerted Attacks is instant Non-Exerted Attacks deal no Damage "} c["Life Leech from Hits with this Weapon is instant"]={{[1]={[1]={type="Condition",var="{Hand}Attack"},flags=0,keywordFlags=0,name="InstantLifeLeech",type="BASE",value=100}},nil} @@ -19379,6 +19385,7 @@ c["Regenerate 0.6 Mana per Second while holding a Shield"]={{[1]={[1]={type="Con c["Regenerate 0.6 Mana per second while wielding a Staff"]={{[1]={[1]={type="Condition",var="UsingStaff"},flags=0,keywordFlags=0,name="ManaRegen",type="BASE",value=0.6}},nil} c["Regenerate 0.6% of Energy Shield per second"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=0.6}},nil} c["Regenerate 0.6% of Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.6}},nil} +c["Regenerate 0.6% of Life per second for each Raised Zombie"]={{[1]={[1]={stat="ActiveZombieLimit",type="PerStat"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.6}},nil} c["Regenerate 0.6% of Life per second per Endurance Charge"]={{[1]={[1]={type="Multiplier",var="EnduranceCharge"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.6}},nil} c["Regenerate 0.6% of Life per second per Frenzy Charge"]={{[1]={[1]={type="Multiplier",var="FrenzyCharge"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.6}},nil} c["Regenerate 0.6% of Life per second per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.6}},nil} @@ -20017,6 +20024,7 @@ c["Restores Ward on use 40% increased Duration"]={nil,"Restores Ward on use 40% c["Retaliation Skills Debilitate Enemies for 3 seconds on Hit"]={{[1]={flags=0,keywordFlags=0,name="DebilitateChance",type="BASE",value=100}},nil} c["Retaliation Skills Fortify on Melee Hit"]={nil,"Retaliation Skills Fortify on Melee Hit "} c["Retaliation Skills become Usable for 100% longer"]={nil,"Retaliation Skills become Usable for 100% longer "} +end)();(function() c["Retaliation Skills become Usable for 20% longer"]={nil,"Retaliation Skills become Usable for 20% longer "} c["Retaliation Skills become Usable for 30% longer"]={nil,"Retaliation Skills become Usable for 30% longer "} c["Retaliation Skills become Usable for 75% longer"]={nil,"Retaliation Skills become Usable for 75% longer "} @@ -20075,7 +20083,8 @@ c["Rightmost 3 Magic Utility Flasks constantly apply their Flask Effects to you" c["Rogue Equipment cannot be found"]={nil,"Rogue Equipment cannot be found "} c["Rogue Perks are doubled"]={{},"Rogue Perks are d "} c["Roiling Tempest"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Roiling Tempest"},[2]={flags=0,keywordFlags=0,name="Condition:HaveRoilingTempest",type="FLAG",value=true}},nil} -c["Ruby Flasks applied to you have 50% increased Effect"]={nil,"Ruby Flasks applied to you have 50% increased Effect "} +c["Ruby Flasks applied to you have 50% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="RubyFlaskEffect",type="INC",value=50}},nil} +c["Ruby Flasks applied to you have 80% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="RubyFlaskEffect",type="INC",value=80}},nil} c["Runebinder"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Runebinder"},[2]={flags=0,keywordFlags=0,name="Condition:HaveRunebinder",type="FLAG",value=true}},nil} c["Ruthless Hits Intimidate Enemies for 4 seconds"]={nil,"Ruthless Hits Intimidate Enemies for 4 seconds "} c["Sacrifice 10% of your Life when you Use or Trigger a Spell Skill"]={nil,"Sacrifice 10% of your Life when you Use or Trigger a Spell Skill "} @@ -20089,7 +20098,8 @@ c["Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell"]= c["Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell Sacrifice 25% of Life to gain that much Energy Shield when you Cast a Spell"]={nil,"Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell Sacrifice 25% of Life to gain that much Energy Shield when you Cast a Spell "} c["Sap Enemies when you Block their Damage"]={nil,"Sap Enemies when you Block their Damage "} c["Sap Enemies when you Block their Damage 67% increased Chance to Block"]={nil,"Sap Enemies when you Block their Damage 67% increased Chance to Block "} -c["Sapphire Flasks applied to you have 50% increased Effect"]={nil,"Sapphire Flasks applied to you have 50% increased Effect "} +c["Sapphire Flasks applied to you have 50% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="SapphireFlaskEffect",type="INC",value=50}},nil} +c["Sapphire Flasks applied to you have 80% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="SapphireFlaskEffect",type="INC",value=80}},nil} c["Scion: +25 to All Attributes"]={{[1]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Str",type="BASE",value=25},[2]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Dex",type="BASE",value=25},[3]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Int",type="BASE",value=25},[4]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="All",type="BASE",value=25}},nil} c["Scion: 30% increased Damage"]={{[1]={[1]={type="Condition",var="ConnectedToScionStart"},flags=0,keywordFlags=0,name="Damage",type="INC",value=30}},nil} c["Scorch Enemies in Close Range when you Block"]={{[1]={flags=0,keywordFlags=0,name="EnemyScorchChance",type="BASE",value=100}},nil} @@ -21980,7 +21990,8 @@ c["Tinctures applied to you have 8% increased Effect"]={{[1]={[1]={actor="player c["Tinctures deactivate when you have 12 or more Mana Burn"]={{[1]={flags=0,keywordFlags=0,name="MaxManaBurnStacks",type="BASE",value=12}},nil} c["Tinctures have 40% increased effect while at or above 10 stacks of Mana Burn"]={{[1]={[1]={threshold=10,type="MultiplierThreshold",varList={[1]="ManaBurnStacks",[2]="WeepingWoundsStacks"}},flags=0,keywordFlags=0,name="TinctureEffect",type="INC",value=40}},nil} c["Tinctures inflict Weeping Wounds instead of Mana Burn"]={{[1]={flags=0,keywordFlags=0,name="Condition:WeepingWoundsInsteadOfManaBurn",type="FLAG",value=true}},nil} -c["Topaz Flasks applied to you have 50% increased Effect"]={nil,"Topaz Flasks applied to you have 50% increased Effect "} +c["Topaz Flasks applied to you have 50% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="TopazFlaskEffect",type="INC",value=50}},nil} +c["Topaz Flasks applied to you have 80% increased Effect"]={{[1]={[1]={actor="player",type="ActorCondition"},flags=0,keywordFlags=0,name="TopazFlaskEffect",type="INC",value=80}},nil} c["Total Recovery per second from Life Leech is Doubled"]={{[1]={[1]={globalLimit=100,globalLimitKey="LifeLeechRateDoubledLimit",type="Multiplier",var="LifeLeechRateDoubled"},flags=0,keywordFlags=0,name="LifeLeechRate",type="MORE",value=100},[2]={flags=0,keywordFlags=0,name="Multiplier:LifeLeechRateDoubled",type="OVERRIDE",value=1}},nil} c["Totem Life is increased by their Overcapped Fire Resistance"]={{[1]={[1]={div=1,stat="TotemFireResistOverCap",type="PerStat"},flags=0,keywordFlags=0,name="TotemLife",type="INC",value=1}},nil} c["Totems Hinder Enemies within 3 metres of them when Summoned"]={nil,"Totems Hinder Enemies within 3 metres of them when Summoned "} @@ -22212,7 +22223,7 @@ c["Unaffected by Flammability while affected by Purity of Fire"]={{[1]={[1]={ski c["Unaffected by Frostbite while affected by Purity of Ice"]={{[1]={[1]={skillName="Frostbite",type="SkillName"},[2]={type="Condition",var="AffectedByPurityofIce"},[3]={effectType="Global",type="GlobalEffect",unscalable=true},flags=0,keywordFlags=0,name="CurseEffectOnSelf",type="MORE",value=-100}},nil} c["Unaffected by Ignite"]={{[1]={flags=0,keywordFlags=0,name="SelfIgniteEffect",type="MORE",value=-100}},nil} c["Unaffected by Ignite if 2 Warlord Items are Equipped"]={{[1]={[1]={threshold=2,type="MultiplierThreshold",var="WarlordItem"},flags=0,keywordFlags=0,name="SelfIgniteEffect",type="MORE",value=-100}},nil} -c["Unaffected by Ignite or Shock if Maximum Life and Maximum Mana are within 500"]={nil,"Unaffected by Ignite or Shock if Maximum Life and Maximum Mana are within 500 "} +c["Unaffected by Ignite or Shock if Maximum Life and Maximum Mana are within 500"]={{[1]={[1]={stat="MaximumLifeManaDifference",threshold=500,type="StatThreshold",upper=true},flags=0,keywordFlags=0,name="SelfIgniteEffect",type="MORE",value=-100},[2]={[1]={stat="MaximumLifeManaDifference",threshold=500,type="StatThreshold",upper=true},flags=0,keywordFlags=0,name="SelfShockEffect",type="MORE",value=-100}},nil} c["Unaffected by Poison"]={{[1]={flags=0,keywordFlags=0,name="SelfPoisonEffect",type="MORE",value=-100}},nil} c["Unaffected by Poison if 2 Hunter Items are Equipped"]={{[1]={[1]={threshold=2,type="MultiplierThreshold",var="HunterItem"},flags=0,keywordFlags=0,name="SelfPoisonEffect",type="MORE",value=-100}},nil} c["Unaffected by Poison while affected by Malevolence"]={{[1]={[1]={type="Condition",var="AffectedByMalevolence"},[2]={effectType="Global",type="GlobalEffect",unscalable=true},flags=0,keywordFlags=0,name="SelfPoisonEffect",type="MORE",value=-100}},nil} @@ -22650,8 +22661,7 @@ c["You can catch Exotic Fish"]={nil,"You can catch Exotic Fish "} c["You can catch Exotic Fish 40% reduced Quantity of Fish Caught"]={nil,"You can catch Exotic Fish 40% reduced Quantity of Fish Caught "} c["You can catch Foulborn Fish"]={nil,"You can catch Foulborn Fish "} c["You can catch Scourged Fish"]={nil,"You can catch Scourged Fish "} -c["You can have 2 additional Tinctures active"]={nil,"You can have 2 additional Tinctures active "} -c["You can have 2 additional Tinctures active 10% chance to remove 1 Mana Burn on Kill"]={nil,"You can have 2 additional Tinctures active 10% chance to remove 1 Mana Burn on Kill "} +c["You can have 2 additional Tinctures active"]={{[1]={flags=0,keywordFlags=0,name="TinctureLimit",type="BASE",value=2}},nil} c["You can have an Offering of each type"]={nil,"You can have an Offering of each type "} c["You can have an Offering of each type Offering Skills have 50% reduced Duration"]={nil,"You can have an Offering of each type Offering Skills have 50% reduced Duration "} c["You can have an additional Brand Attached to an Enemy"]={{[1]={flags=0,keywordFlags=0,name="BrandsAttachedLimit",type="BASE",value=1}},nil} @@ -22676,7 +22686,7 @@ c["You cannot Cast Socketed Hex Curse Skills"]={nil,"You cannot Cast Socketed He c["You cannot Cast Socketed Hex Curse Skills Inflict Socketed Hexes on Enemies that trigger your Traps"]={{[1]={[1]={slotName="{SlotName}",type="SocketedIn"},flags=0,keywordFlags=0,name="ExtraSupport",type="LIST",value={level=1,skillId="SupportCurseOnTrapTriggered"}}},nil} c["You cannot Recharge Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="NoEnergyShieldRecharge",type="FLAG",value=true}},nil} c["You cannot Regenerate Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="NoEnergyShieldRegen",type="FLAG",value=true}},nil} -c["You cannot Regenerate or Recoup Life"]={nil,"You cannot Regenerate or Recoup Life "} +c["You cannot Regenerate or Recoup Life"]={{[1]={flags=0,keywordFlags=0,name="NoLifeRegen",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="CannotRecoupLife",type="FLAG",value=true}},nil} c["You cannot be Chilled for 3 seconds after being Chilled"]={nil,"You cannot be Chilled for 3 seconds after being Chilled "} c["You cannot be Chilled for 3 seconds after being Chilled You cannot be Frozen for 3 seconds after being Frozen"]={nil,"You cannot be Chilled for 3 seconds after being Chilled You cannot be Frozen for 3 seconds after being Frozen "} c["You cannot be Cursed with Silence"]={{[1]={flags=0,keywordFlags=0,name="SilenceImmune",type="FLAG",value=true}},nil} diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua index deb56891e25..8a3b8f69794 100644 --- a/src/Data/Uniques/amulet.lua +++ b/src/Data/Uniques/amulet.lua @@ -377,12 +377,21 @@ Implicits: 1 ]],[[ Doedre's Tongue Lapis Amulet +Variant: Pre 3.30.0 +Variant: Current (Ignite) +Variant: Current (Shock) +Variant: Current (Freeze) Requires Level 24 Implicits: 1 {tags:attribute}+(20-30) to Intelligence -{tags:resistance}+(30-35)% to all Elemental Resistances -(25-50)% chance to Freeze, Shock and Ignite +{variant:1}{tags:resistance}+(20-25)% to all Elemental Resistances +{variant:2,3,4}{tags:resistance}+(30-35)% to all Elemental Resistances +{variant:1}(20-25)% chance to Freeze, Shock and Ignite +{variant:2,3,4}(25-50)% chance to Freeze, Shock and Ignite Cursed Enemies cannot inflict Elemental Ailments on You +{variant:2}All Damage can Ignite against Cursed Enemies +{variant:3}All Damage can Shock against Cursed Enemies +{variant:4}All Damage can Freeze against Cursed Enemies ]],[[ Extractor Mentis Agate Amulet diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua index 3180dfe02d6..4690eef4f02 100644 --- a/src/Data/Uniques/belt.lua +++ b/src/Data/Uniques/belt.lua @@ -228,29 +228,56 @@ Has 1 Abyssal Socket Doryani's Invitation Heavy Belt Source: Drops from unique{Atziri, Queen of the Vaal} in normal{The Apex of Sacrifice} +Has Alt Variant: true +Has Alt Variant Two: true +Has Alt Variant Three: true +Selected Variant: 9 +Selected Alt Variant: 13 +Selected Alt Variant Two: 17 +Selected Alt Variant Three: 21 Variant: Pre 3.11.0 (Physical) Variant: Pre 3.11.0 (Fire) Variant: Pre 3.11.0 (Cold) Variant: Pre 3.11.0 (Lightning) -Variant: Current (Physical) -Variant: Current (Fire) -Variant: Current (Cold) -Variant: Current (Lightning) +Variant: Pre 3.30.0 (Physical) +Variant: Pre 3.30.0 (Fire) +Variant: Pre 3.30.0 (Cold) +Variant: Pre 3.30.0 (Lightning) +Variant: Current: Physical Damage +Variant: Current: Fire Damage +Variant: Current: Cold Damage +Variant: Current: Lightning Damage +Variant: Current: Fire Resistance +Variant: Current: Cold Resistance +Variant: Current: Lightning Resistance +Variant: Current: Armour +Variant: Current: Physical Leech +Variant: Current: Fire Leech +Variant: Current: Cold Leech +Variant: Current: Lightning Leech +Variant: Current: Granite Flask Effect +Variant: Current: Ruby Flask Effect +Variant: Current: Sapphire Flask Effect +Variant: Current: Topaz Flask Effect Requires Level 68 Implicits: 1 {tags:attribute}+(25-35) to Strength -{variant:1,5}{tags:physical_damage}(15-60)% increased Global Physical Damage -{variant:2,6}{tags:elemental_damage}(15-60)% increased Fire Damage -{variant:3,7}{tags:elemental_damage}(15-60)% increased Cold Damage -{variant:4,8}{tags:elemental_damage}(15-60)% increased Lightning Damage -{variant:2,3,4,6,7,8}{tags:defences}+(250-1000) to Armour -{variant:1,3,4,5,7,8}{tags:resistance}+(25-100)% to Fire Resistance -{variant:1,2,4,5,6,8}{tags:resistance}+(25-100)% to Cold Resistance -{variant:1,2,3,5,6,7}{tags:resistance}+(25-100)% to Lightning Resistance -{variant:5}{tags:resource}0.6% of Physical Damage Leeched as Life -{variant:6}{tags:resource}0.6% of Fire Damage Leeched as Life -{variant:7}{tags:resource}0.6% of Cold Damage Leeched as Life -{variant:8}{tags:resource}0.6% of Lightning Damage Leeched as Life +{variant:1,5,9}{tags:physical_damage}(15-60)% increased Global Physical Damage +{variant:2,6,10}{tags:elemental_damage}(15-60)% increased Fire Damage +{variant:3,7,11}{tags:elemental_damage}(15-60)% increased Cold Damage +{variant:4,8,12}{tags:elemental_damage}(15-60)% increased Lightning Damage +{variant:2,3,4,6,7,8,16}{tags:defences}+(250-1000) to Armour +{variant:1,3,4,5,7,8,13}{tags:resistance}+(25-100)% to Fire Resistance +{variant:1,2,4,5,6,8,14}{tags:resistance}+(25-100)% to Cold Resistance +{variant:1,2,3,5,6,7,15}{tags:resistance}+(25-100)% to Lightning Resistance +{variant:5,17}{tags:resource}0.6% of Physical Damage Leeched as Life +{variant:6,18}{tags:resource}0.6% of Fire Damage Leeched as Life +{variant:7,19}{tags:resource}0.6% of Cold Damage Leeched as Life +{variant:8,20}{tags:resource}0.6% of Lightning Damage Leeched as Life +{variant:21}Granite Flasks applied to you have (20-80)% increased Effect +{variant:22}Ruby Flasks applied to you have (20-80)% increased Effect +{variant:23}Sapphire Flasks applied to you have (20-80)% increased Effect +{variant:24}Topaz Flasks applied to you have (20-80)% increased Effect {variant:2}10% chance to Ignite during any Flask Effect {variant:6}(20-30)% chance to Ignite during any Flask Effect {variant:3}10% chance to Freeze during any Flask Effect diff --git a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua index bdebde15080..271d63363da 100644 --- a/src/Data/Uniques/boots.lua +++ b/src/Data/Uniques/boots.lua @@ -882,16 +882,22 @@ Ralakesh's Impatience Riveted Boots Variant: Pre 3.19.0 Variant: Pre 3.26.0 +Variant: Pre 3.30.0 Endurance +Variant: Pre 3.30.0 Frenzy +Variant: Pre 3.30.0 Power Variant: Endurance Current Variant: Frenzy Current Variant: Power Current +(15-25)% to Cold Resistance +(15-25)% to Chaos Resistance -{variant:3,4,5}(15-25)% increased Movement Speed -{variant:3,4,5}Corrupted Blood cannot be inflicted on you -{variant:1,2,3}Count as having maximum number of Endurance Charges -{variant:1,2,4}Count as having maximum number of Frenzy Charges -{variant:1,2,5}Count as having maximum number of Power Charges +{variant:3,4,5,6,7,8}(15-25)% increased Movement Speed +{variant:3,4,5,6,7,8}Corrupted Blood cannot be inflicted on you +{variant:6}-1 to Maximum Endurance Charges +{variant:7}-1 to Maximum Frenzy Charges +{variant:8}-1 to Maximum Power Charges +{variant:1,2,3,6}Count as having maximum number of Endurance Charges +{variant:1,2,4,7}Count as having maximum number of Frenzy Charges +{variant:1,2,5,8}Count as having maximum number of Power Charges {variant:1}Gain a Frenzy, Endurance, or Power Charge once per second while you are Stationary {variant:1}Lose all Frenzy, Endurance, and Power Charges when you Move ]],[[ diff --git a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua index 286f2d679a2..bd0a32e795f 100644 --- a/src/Data/Uniques/gloves.lua +++ b/src/Data/Uniques/gloves.lua @@ -17,15 +17,18 @@ Vaal Gauntlets Source: Drops from unique{Atziri, Queen of the Vaal} in normal{The Alluring Abyss} Variant: Pre 3.1.0 Variant: Pre 3.16.0 +Variant: Pre 3.30.0 Variant: Current Requires Level 75 +(60-80) to Intelligence {variant:2}(25-35)% increased Global Critical Strike Chance -{variant:3}(40-60)% increased Global Critical Strike Chance +{variant:3,4}(40-60)% increased Global Critical Strike Chance (200-220)% increased Armour +(60-75) to maximum Life {variant:1}Life and Mana Leech from Critical Strikes are instant {variant:2,3}You have Vaal Pact if you've dealt a Critical Strike Recently +{variant:4}Life Leech from Critical Strikes is instant +{variant:4}You cannot Regenerate or Recoup Life ]],[[ Replica Atziri's Acuity Vaal Gauntlets diff --git a/src/Data/Uniques/staff.lua b/src/Data/Uniques/staff.lua index d9f7adb57f2..a326e24da4f 100644 --- a/src/Data/Uniques/staff.lua +++ b/src/Data/Uniques/staff.lua @@ -319,24 +319,46 @@ Grants Summon Greater Harbinger of Brutality ]],[[ Femurs of the Saints Primordial Staff +Has Alt Variant: true +Has Alt Variant Two: true +Has Alt Variant Three: true +Selected Variant: 5 +Selected Alt Variant: 6 +Selected Alt Variant Two: 7 +Selected Alt Variant Three: 8 Variant: Pre 2.6.0 Variant: Pre 3.8.0 Variant: Pre 3.25.0 -Variant: Current +Variant: Pre 3.30.0 +Variant: Current: Minion Damage per Spectre +Variant: Current: Spell Damage per Skeleton +Variant: Current: Attack Damage per Zombie +Variant: Current: Block per Skeleton +Variant: Current: Life Regen per Zombie +Variant: Current: Mana Regen per Spectre +Variant: Current: Speed per Raging Spirit Implicits: 3 {variant:1}+12% Chance to Block Attack Damage {variant:2,3}+18% Chance to Block Attack Damage -{variant:4}+25% Chance to Block Spell Damage -+(2-3) to Level of Socketed Minion Gems -{variant:3,4}Minions deal (80-100)% increased Damage +{variant:4,5,6,7,8,9,10,11}+25% Chance to Block Spell Damage +{variant:1,2,3,4}+2 to Level of Socketed Minion Gems +{variant:5,6,7,8,9,10,11}+(2-3) to Level of Socketed Minion Gems +{variant:3,4}Minions deal (60-80)% increased Damage +{variant:5,6,7,8,9,10,11}Minions deal (80-100)% increased Damage {variant:1,2}Minions Regenerate (1.5-2.5)% of Life per second {variant:1,2}2% increased Minion Attack and Cast Speed per Skeleton you own {variant:1,2}2% increased Minion Duration per Raised Zombie -{variant:1,2}(10-15)% increased Minion Damage per Raised Spectre -{variant:3,4}+(1-2)% Chance to Block Attack Damage per Summoned Skeleton -{variant:3,4}(3-5)% increased Attack and Cast Speed per Summoned Raging Spirit -{variant:3,4}Regenerate (0.8-1)% of Life per second for each Raised Zombie -{variant:3,4}(40-60)% increased Mana Regeneration Rate per Raised Spectre +{variant:1,2,5}(10-15)% increased Minion Damage per Raised Spectre +{variant:6}(12-18)% increased Spell Damage per Summoned Skeleton +{variant:7}(16-24)% increased Attack Damage per Raised Zombie +{variant:3,4}+1% Chance to Block Attack Damage per Summoned Skeleton +{variant:8}+(1-2)% Chance to Block Attack Damage per Summoned Skeleton +{variant:3,4}2% increased Attack and Cast Speed per Summoned Raging Spirit +{variant:11}(3-5)% increased Attack and Cast Speed per Summoned Raging Spirit +{variant:3,4}Regenerate 0.6% of Life per second for each Raised Zombie +{variant:9}Regenerate (0.8-1)% of Life per second for each Raised Zombie +{variant:3,4}30% increased Mana Regeneration Rate per Raised Spectre +{variant:10}(40-60)% increased Mana Regeneration Rate per Raised Spectre ]],[[ Fencoil Gnarled Branch diff --git a/src/Export/Uniques/amulet.lua b/src/Export/Uniques/amulet.lua index d315457a616..8a523a4de73 100644 --- a/src/Export/Uniques/amulet.lua +++ b/src/Export/Uniques/amulet.lua @@ -356,11 +356,20 @@ IncreasedManaEmptyBlueSocketUnique__1 ]],[[ Doedre's Tongue Lapis Amulet +Variant: Pre 3.30.0 +Variant: Current (Ignite) +Variant: Current (Shock) +Variant: Current (Freeze) Implicits: 1 IntelligenceImplicitAmulet1 -AllResistancesUnique__27 -ChanceToFreezeShockIgniteUnique__2 +{variant:1}AllResistancesUnique__27[20,25] +{variant:2,3,4}AllResistancesUnique__27 +{variant:1}ChanceToFreezeShockIgniteUnique__2[20,25] +{variant:2,3,4}ChanceToFreezeShockIgniteUnique__2 CursedEnemiesCannotInflictElementalAilmentsUnique__1 +{variant:2}AllDamageAgainstCursedEnemiesCanIgniteUnique__1 +{variant:3}AllDamageAgainstCursedEnemiesCanShockUnique__1 +{variant:4}AllDamageAgainstCursedEnemiesCanFreezeUnique__1 ]],[[ Extractor Mentis Agate Amulet diff --git a/src/Export/Uniques/belt.lua b/src/Export/Uniques/belt.lua index 37bf033a4fe..202313a24d6 100644 --- a/src/Export/Uniques/belt.lua +++ b/src/Export/Uniques/belt.lua @@ -211,32 +211,59 @@ AbyssJewelSocketUnique__6_ Doryani's Invitation Heavy Belt Source: Drops from unique{Atziri, Queen of the Vaal} in normal{The Apex of Sacrifice} +Has Alt Variant: true +Has Alt Variant Two: true +Has Alt Variant Three: true +Selected Variant: 9 +Selected Alt Variant: 13 +Selected Alt Variant Two: 17 +Selected Alt Variant Three: 21 Variant: Pre 3.11.0 (Physical) Variant: Pre 3.11.0 (Fire) Variant: Pre 3.11.0 (Cold) Variant: Pre 3.11.0 (Lightning) -Variant: Current (Physical) -Variant: Current (Fire) -Variant: Current (Cold) -Variant: Current (Lightning) +Variant: Pre 3.30.0 (Physical) +Variant: Pre 3.30.0 (Fire) +Variant: Pre 3.30.0 (Cold) +Variant: Pre 3.30.0 (Lightning) +Variant: Current: Physical Damage +Variant: Current: Fire Damage +Variant: Current: Cold Damage +Variant: Current: Lightning Damage +Variant: Current: Fire Resistance +Variant: Current: Cold Resistance +Variant: Current: Lightning Resistance +Variant: Current: Armour +Variant: Current: Physical Leech +Variant: Current: Fire Leech +Variant: Current: Cold Leech +Variant: Current: Lightning Leech +Variant: Current: Granite Flask Effect +Variant: Current: Ruby Flask Effect +Variant: Current: Sapphire Flask Effect +Variant: Current: Topaz Flask Effect Implicits: 1 StrengthImplicitBelt1 -{variant:1,5}IncreasedPhysicalDamagePercentUniqueBelt9d -{variant:2,6}FireDamagePercentUniqueBelt9a -{variant:3,7}ColdDamagePercentUniqueBelt9b -{variant:4,8}LightningDamagePercentUniqueBelt9c -{variant:2,3,4,6,7,8}IncreasedPhysicalDamageReductionRatingUniqueBelt9 -{variant:1,3,4,5,7,8}FireResistUniqueBelt9 -{variant:1,2,4,5,6,8}ColdResistUniqueBelt9 -{variant:1,2,3,5,6,7}LightningResistUniqueBelt9 +{variant:1,5,9}IncreasedPhysicalDamagePercentUniqueBelt9d +{variant:2,6,10}FireDamagePercentUniqueBelt9a +{variant:3,7,11}ColdDamagePercentUniqueBelt9b +{variant:4,8,12}LightningDamagePercentUniqueBelt9c +{variant:2,3,4,6,7,8,16}IncreasedPhysicalDamageReductionRatingUniqueBelt9 +{variant:1,3,4,5,7,8,13}FireResistUniqueBelt9 +{variant:1,2,4,5,6,8,14}ColdResistUniqueBelt9 +{variant:1,2,3,5,6,7,15}LightningResistUniqueBelt9 {variant:1}PhysicalDamageLifeLeechPermyriadUniqueBelt9dNew[0.2,0.2] -{variant:5}PhysicalDamageLifeLeechPermyriadUniqueBelt9dNew +{variant:5,17}PhysicalDamageLifeLeechPermyriadUniqueBelt9dNew {variant:2}FireDamageLifeLeechPermyriadUniqueBelt9aNew[0.2,0.2] -{variant:6}FireDamageLifeLeechPermyriadUniqueBelt9aNew +{variant:6,18}FireDamageLifeLeechPermyriadUniqueBelt9aNew {variant:3}ColdDamageLifeLeechPermyriadUniqueBelt9bNew[0.2,0.2] -{variant:7}ColdDamageLifeLeechPermyriadUniqueBelt9bNew +{variant:7,19}ColdDamageLifeLeechPermyriadUniqueBelt9bNew {variant:4}LightningDamageLifeLeechPermyriadUniqueBelt9cNew[0.2,0.2] -{variant:8}LightningDamageLifeLeechPermyriadUniqueBelt9cNew +{variant:8,20}LightningDamageLifeLeechPermyriadUniqueBelt9cNew +{variant:21}GraniteFlaskEffectUniqueBelt9 +{variant:22}RubyFlaskEffectUniqueBelt9 +{variant:23}SapphireFlaskEffectUniqueBelt9 +{variant:24}TopazFlaskEffectUniqueBelt9 {variant:1,5}ReducedStunThresholdWhileUsingFlaskUniqueBelt9d {variant:2}IgniteChanceWhileUsingFlaskUniqueBelt9a[10,10] {variant:6}IgniteChanceWhileUsingFlaskUniqueBelt9a diff --git a/src/Export/Uniques/boots.lua b/src/Export/Uniques/boots.lua index ce44d27079f..cf69f5cbc38 100644 --- a/src/Export/Uniques/boots.lua +++ b/src/Export/Uniques/boots.lua @@ -865,16 +865,22 @@ Ralakesh's Impatience Riveted Boots Variant: Pre 3.19.0 Variant: Pre 3.26.0 +Variant: Pre 3.30.0 Endurance +Variant: Pre 3.30.0 Frenzy +Variant: Pre 3.30.0 Power Variant: Endurance Current Variant: Frenzy Current Variant: Power Current ColdResistUnique__19 ChaosResistUnique__7 -{variant:3,4,5}MovementVelocityUnique__57 -{variant:3,4,5}CorruptedBloodImmunityUnique_1 +{variant:3,4,5,6,7,8}MovementVelocityUnique__57 +{variant:3,4,5,6,7,8}CorruptedBloodImmunityUnique_1 {variant:1,2,3}CountAsHavingMaxEnduranceChargesUnique__1 {variant:1,2,4}CountAsHavingMaxFrenzyChargesUnique__1 {variant:1,2,5}CountAsHavingMaxPowerChargesUnique__1 +{variant:6}CountAsHavingMaxEnduranceChargesNewUnique__1 +{variant:7}CountAsHavingMaxFrenzyChargesNewUnique__1 +{variant:8}CountAsHavingMaxPowerChargesNewUnique__1 {variant:1}GainARandomChargePerSecondWhileStationaryUnique__1 {variant:1}Lose all Frenzy, Endurance, and Power Charges when you Move ]],[[ diff --git a/src/Export/Uniques/gloves.lua b/src/Export/Uniques/gloves.lua index 04192f0cd2f..1b5c395a57a 100644 --- a/src/Export/Uniques/gloves.lua +++ b/src/Export/Uniques/gloves.lua @@ -17,14 +17,17 @@ Vaal Gauntlets Source: Drops from unique{Atziri, Queen of the Vaal} in normal{The Alluring Abyss} Variant: Pre 3.1.0 Variant: Pre 3.16.0 +Variant: Pre 3.30.0 Variant: Current IntelligenceUniqueGlovesStr3 IncreasedLifeUniqueGlovesStr3 LocalIncreasedPhysicalDamageReductionRatingPercentUniqueGlovesStr3 {variant:2}CriticalStrikeChanceUniqueGlovesStr3[25,35] -{variant:3}CriticalStrikeChanceUniqueGlovesStr3 +{variant:3,4}CriticalStrikeChanceUniqueGlovesStr3 {variant:1}CriticalStrikesLeechInstantlyUniqueGlovesStr3 {variant:2,3}VaalPactIfCritRecentlyUnique__1 +{variant:4}InstantLifeLeechFromCritsUnique__1 +{variant:4}CannotRegenerateOrRecoupLifeUnique__1 ]],[[ Replica Atziri's Acuity Vaal Gauntlets diff --git a/src/Export/Uniques/staff.lua b/src/Export/Uniques/staff.lua index 6b6c8f5aa32..b6ccd09d826 100644 --- a/src/Export/Uniques/staff.lua +++ b/src/Export/Uniques/staff.lua @@ -317,24 +317,46 @@ LocalCriticalStrikeChanceUnique__10 ]],[[ Femurs of the Saints Primordial Staff +Has Alt Variant: true +Has Alt Variant Two: true +Has Alt Variant Three: true +Selected Variant: 5 +Selected Alt Variant: 6 +Selected Alt Variant Two: 7 +Selected Alt Variant Three: 8 Variant: Pre 2.6.0 Variant: Pre 3.8.0 Variant: Pre 3.25.0 -Variant: Current +Variant: Pre 3.30.0 +Variant: Current: Minion Damage per Spectre +Variant: Current: Spell Damage per Skeleton +Variant: Current: Attack Damage per Zombie +Variant: Current: Block per Skeleton +Variant: Current: Life Regen per Zombie +Variant: Current: Mana Regen per Spectre +Variant: Current: Speed per Raging Spirit Implicits: 3 -{variant:4}StaffSpellBlockPercent3 +{variant:4,5,6,7,8,9,10,11}StaffSpellBlockPercent3 {variant:1}StaffBlockPercentImplicitStaff1[12,12] {variant:2,3}StaffBlockPercentImplicitStaff1[18,18] -LocalIncreaseSocketedMinionGemLevelUnique__1 -{variant:3,4}MinionDamageUnique__7 +{variant:1,2,3,4}LocalIncreaseSocketedMinionGemLevelUnique__1[2,2] +{variant:5,6,7,8,9,10,11}LocalIncreaseSocketedMinionGemLevelUnique__1 +{variant:3,4}MinionDamageUnique__7[60,80] +{variant:5,6,7,8,9,10,11}MinionDamageUnique__7 {variant:1,2}MinionLifeRegenerationPerRagingSpirit__1 {variant:1,2}MinionAttackAndCastSpeedPerSkeleton__1 {variant:1,2}MinionDurationPerZombie__1 -{variant:1,2}MinionDamagePerSpectre__1 -{variant:3,4}AttackBlockPerSkeletonUnique__1 -{variant:3,4}AttackAndCastSpeedPerRagingSpiritUnique__1 -{variant:3,4}LifeRegenerationPerZombieUnique__1 -{variant:3,4}ManaRegenerationPerSpectreUnique__1 +{variant:1,2,5}MinionDamagePerSpectre__1 +{variant:6}SpellDamagePerSkeletonUnique__1 +{variant:7}AttackDamagePerZombieUnique__1 +{variant:3,4}AttackBlockPerSkeletonUnique__1[1,1] +{variant:8}AttackBlockPerSkeletonUnique__1 +{variant:3,4}AttackAndCastSpeedPerRagingSpiritUnique__1[2,2] +{variant:11}AttackAndCastSpeedPerRagingSpiritUnique__1 +{variant:3,4}LifeRegenerationPerZombieUnique__1[0.6,0.6] +{variant:9}LifeRegenerationPerZombieUnique__1 +{variant:3,4}ManaRegenerationPerSpectreUnique__1[30,30] +{variant:10}ManaRegenerationPerSpectreUnique__1 ]],[[ Fencoil Gnarled Branch diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index 199474356a9..c8ab58c6ed6 100644 --- a/src/Modules/CalcDefence.lua +++ b/src/Modules/CalcDefence.lua @@ -1444,7 +1444,9 @@ function calcs.defence(env, actor) end end for _, recoupType in ipairs(recoupTypeList) do - if recoupType == "Life" and modDB:Flag(nil, "EnergyShieldRecoupInsteadOfLife") then + if recoupType == "Life" and modDB:Flag(nil, "CannotRecoupLife") then + output.LifeRecoup = 0 + elseif recoupType == "Life" and modDB:Flag(nil, "EnergyShieldRecoupInsteadOfLife") then output.LifeRecoup = 0 local lifeRecoup = modDB:Sum("BASE", nil, "LifeRecoup") modDB:NewMod("EnergyShieldRecoup", "BASE", lifeRecoup, "Life Recoup Conversion") @@ -1481,7 +1483,9 @@ function calcs.defence(env, actor) for _, damageType in ipairs(dmgTypeList) do local recoup = modDB:Sum("BASE", nil, damageType..recoupType.."Recoup") local recoupName = damageType..recoupType.."Recoup" - if recoupType == "Life" and modDB:Flag(nil, "EnergyShieldRecoupInsteadOfLife") then + if recoupType == "Life" and modDB:Flag(nil, "CannotRecoupLife") then + output[recoupName] = 0 + elseif recoupType == "Life" and modDB:Flag(nil, "EnergyShieldRecoupInsteadOfLife") then output[recoupName] = 0 modDB:NewMod(damageType.."EnergyShieldRecoup", "BASE", recoup, "Life Recoup Conversion") else diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index cd4d9365f01..26ad8d8e22d 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -130,6 +130,7 @@ function doActorLifeMana(actor) end end output.LowestOfMaximumLifeAndMaximumMana = m_min(output.Life, output.Mana) + output.MaximumLifeManaDifference = math.abs(output.Life - output.Mana) end -- Calculate attributes, and set conditions @@ -1702,9 +1703,10 @@ function calcs.perform(env, skipEHP) local function calcFlaskMods(item, baseName, buffModList, modList, onlyMinion) local flaskEffectInc = effectInc + item.flaskData.effectInc local flaskEffectIncNonPlayer = effectIncNonPlayer + item.flaskData.effectInc - if item.baseName == "Iron Flask" then - flaskEffectInc = flaskEffectInc + modDB:Sum("INC", { actor = "player" }, "IronFlaskEffect") - flaskEffectIncNonPlayer = flaskEffectIncNonPlayer + modDB:Sum("INC", nil, "IronFlaskEffect") + local flaskTypeEffect = ({ ["Iron Flask"] = "IronFlaskEffect", ["Granite Flask"] = "GraniteFlaskEffect", ["Ruby Flask"] = "RubyFlaskEffect", ["Sapphire Flask"] = "SapphireFlaskEffect", ["Topaz Flask"] = "TopazFlaskEffect" })[item.baseName] + if flaskTypeEffect then + flaskEffectInc = flaskEffectInc + modDB:Sum("INC", { actor = "player" }, flaskTypeEffect) + flaskEffectIncNonPlayer = flaskEffectIncNonPlayer + modDB:Sum("INC", nil, flaskTypeEffect) end if item.rarity == "MAGIC" and not (item.base.flask.life or item.base.flask.mana) then flaskEffectInc = flaskEffectInc + effectIncMagic diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index eb217caac18..20c75c3566c 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4031,6 +4031,24 @@ local specialModList = { ["critical strikes with daggers have a (%d+)%% chance to poison the enemy"] = function(num) return { mod("PoisonChance", "BASE", num, nil, ModFlag.Dagger, { type = "Condition", var = "CriticalStrike" }) } end, ["critical strikes with daggers poison the enemy"] = { mod("PoisonChance", "BASE", 100, nil, ModFlag.Dagger, { type = "Condition", var = "CriticalStrike" }) }, ["poison cursed enemies on hit"] = { mod("PoisonChance", "BASE", 100, { type = "ActorCondition", actor = "enemy", var = "Cursed" }) }, + ["all damage can ignite against cursed enemies"] = { + flag("PhysicalCanIgnite", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("ColdCanIgnite", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("LightningCanIgnite", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("ChaosCanIgnite", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + }, + ["all damage can shock against cursed enemies"] = { + flag("PhysicalCanShock", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("FireCanShock", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("ColdCanShock", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("ChaosCanShock", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + }, + ["all damage can freeze against cursed enemies"] = { + flag("PhysicalCanFreeze", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("LightningCanFreeze", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("FireCanFreeze", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + flag("ChaosCanFreeze", { type = "ActorCondition", actor = "enemy", var = "Cursed" }), + }, ["always poison on hit against cursed enemies"] = { mod("PoisonChance", "BASE", 100, { type = "ActorCondition", actor = "enemy", var = "Cursed" }) }, ["wh[ie][ln]e? at maximum frenzy charges, attacks poison enemies"] = { mod("PoisonChance", "BASE", 100, nil, ModFlag.Attack, { type = "StatThreshold", stat = "FrenzyCharges", thresholdStat = "FrenzyChargesMax" }) }, ["traps and mines have a (%d+)%% chance to poison on hit"] = function(num) return { mod("PoisonChance", "BASE", num, nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end, @@ -4761,6 +4779,10 @@ local specialModList = { mod("InstantLifeLeech", "BASE", 100, { type = "Condition", var = "CriticalStrike" }), mod("InstantManaLeech", "BASE", 100, { type = "Condition", var = "CriticalStrike" }) }, + ["life leech from critical strikes is instant"] = { + mod("InstantLifeLeech", "BASE", 100, { type = "Condition", var = "CriticalStrike" }), + }, + ["you cannot regenerate or recoup life"] = { flag("NoLifeRegen"), flag("CannotRecoupLife") }, ["with 5 corrupted items equipped: life leech recovers based on your chaos damage instead"] = { flag("LifeLeechBasedOnChaosDamage", { type = "MultiplierThreshold", var = "CorruptedItem", threshold = 5 }) }, ["you have vaal pact if you've dealt a critical strike recently"] = { mod("Keystone", "LIST", "Vaal Pact", { type = "Condition", var = "CritRecently" }) }, ["you have vaal pact while at maximum endurance charges"] = { mod("Keystone", "LIST", "Vaal Pact", { type = "StatThreshold", stat = "EnduranceCharges", thresholdStat = "EnduranceChargesMax" }) }, @@ -5067,6 +5089,10 @@ local specialModList = { ["unaffected by shock"] = { mod("SelfShockEffect", "MORE", -100) }, ["unaffected by shock while leeching energy shield"] = { mod("SelfShockEffect", "MORE", -100, { type = "Condition", var = "LeechingEnergyShield" }) }, ["unaffected by shock while channelling"] = { mod("SelfShockEffect", "MORE", -100, { type = "Condition", var = "Channelling" }) }, + ["unaffected by ignite or shock if maximum life and maximum mana are within (%d+)"] = function(num) return { + mod("SelfIgniteEffect", "MORE", -100, { type = "StatThreshold", stat = "MaximumLifeManaDifference", threshold = num, upper = true }), + mod("SelfShockEffect", "MORE", -100, { type = "StatThreshold", stat = "MaximumLifeManaDifference", threshold = num, upper = true }), + } end, ["unaffected by scorch"] = { mod("SelfScorchEffect", "MORE", -100) }, ["unaffected by brittle"] = { mod("SelfBrittleEffect", "MORE", -100) }, ["unaffected by sap"] = { mod("SelfSapEffect", "MORE", -100) }, @@ -5316,6 +5342,10 @@ local specialModList = { ["primordial"] = { mod("Multiplier:PrimordialItem", "BASE", 1) }, ["spectres have a base duration of (%d+) seconds"] = { mod("SkillData", "LIST", { key = "duration", value = 6 }, { type = "SkillName", skillName = "Raise Spectre", includeTransfigured = true }) }, ["iron flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("IronFlaskEffect", "INC", num, { type = "ActorCondition", actor = "player" }) } end, + ["granite flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("GraniteFlaskEffect", "INC", num, { type = "ActorCondition", actor = "player" }) } end, + ["ruby flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("RubyFlaskEffect", "INC", num, { type = "ActorCondition", actor = "player" }) } end, + ["sapphire flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("SapphireFlaskEffect", "INC", num, { type = "ActorCondition", actor = "player" }) } end, + ["topaz flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("TopazFlaskEffect", "INC", num, { type = "ActorCondition", actor = "player" }) } end, ["flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("FlaskEffect", "INC", num, { type = "ActorCondition", actor = "player"}) } end, ["flasks applied to you have (%d+)%% increased effect per level"] = function(num) return { mod("FlaskEffect", "INC", num, { type = "ActorCondition", actor = "player"}, { type = "Multiplier", var = "Level" }) } end, ["equipped magic flasks have (%d+)%% increased effect on you if no flasks are adjacent to them"] = function(num) return { mod("MagicFlaskNoAdjacentEffect", "INC", num) } end, @@ -5334,6 +5364,7 @@ local specialModList = { ["tinctures inflict weeping wounds instead of mana burn"] = { flag("Condition:WeepingWoundsInsteadOfManaBurn"), }, ["tincture effects also apply to ranged weapons"] = { flag("TinctureRangedWeapons"), }, ["you can have an additional tincture active"] = { mod("TinctureLimit", "BASE", 1), }, + ["you can have (%d+) additional tinctures active"] = function(num) return { mod("TinctureLimit", "BASE", num) } end, ["(%d+)%% increased tincture cooldown recovery rate"] = function(num) return { mod("TinctureCooldownRecovery", "INC", num) } end, ["adds (%d+) passive skills"] = function(num) return { mod("JewelData", "LIST", { key = "clusterJewelNodeCount", value = num }) } end, ["1 added passive skill is (.+)"] = function(_, name) return { mod("BlightcoreNotable", "LIST", name) } end,