Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Data/ModCache.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4357,6 +4357,7 @@ c["3% of Elemental Damage Leeched as Energy Shield if 2 Shaper Items are Equippe
c["3% of Life Regenerated per Second if you've dealt a Critical Strike in the past 8 seconds"]={{[1]={[1]={type="Condition",var="CritInPast8Sec"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=3}},nil}
c["3% of Physical Attack Damage Leeched as Life"]={{[1]={flags=1,keywordFlags=0,name="PhysicalDamageLifeLeech",type="BASE",value=3}},nil}
c["3% of Physical Damage Leeched as Energy Shield if 2 Elder Items are Equipped"]={{[1]={[1]={threshold=2,type="MultiplierThreshold",var="ElderItem"},flags=0,keywordFlags=0,name="PhysicalDamageEnergyShieldLeech",type="BASE",value=3}},nil}
c["3% of Physical Damage Prevented Recently is Regenerated as Energy Shield Per Second if 6 Crusader Items are Equipped"]={{[1]={[1]={threshold=6,type="MultiplierThreshold",var="CrusaderItem"},flags=0,keywordFlags=0,name="PhysicalDamageMitigatedEnergyShieldPseudoRecoup",type="BASE",value=12}},nil}
c["3% of Physical Damage prevented from Hits Recently is Regenerated as Energy Shield per second"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageMitigatedEnergyShieldPseudoRecoup",type="BASE",value=12}},nil}
c["3% reduced Attack and Cast Speed per Frenzy Charge"]={{[1]={[1]={type="Multiplier",var="FrenzyCharge"},flags=0,keywordFlags=0,name="Speed",type="INC",value=-3}},nil}
c["3% reduced Cost of Skills"]={{[1]={flags=0,keywordFlags=0,name="Cost",type="INC",value=-3}},nil}
Expand Down Expand Up @@ -4646,7 +4647,6 @@ c["30% of Lightning Damage is taken from Mana before Life"]={{[1]={flags=0,keywo
c["30% of Physical Damage Converted to Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToChaos",type="BASE",value=30}},nil}
c["30% of Physical Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=30}},nil}
c["30% of Physical Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToLightning",type="BASE",value=30}},nil}
c["30% of Physical Damage Prevented Recently is Regenerated as Energy Shield Per Second if 6 Crusader Items are Equipped"]={{[1]={[1]={threshold=6,type="MultiplierThreshold",var="CrusaderItem"},flags=0,keywordFlags=0,name="PhysicalDamageMitigatedEnergyShieldPseudoRecoup",type="BASE",value=120}},nil}
c["30% of Physical Damage from Hits taken as Cold Damage during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsCold",type="BASE",value=30}},nil}
c["30% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=30}},nil}
c["30% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-30}},nil}
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Uniques/Special/BoundByDestiny.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ return {
["CannotBeFrozen6RedeemerItemsUnique__1"] = { type = "6Redeemer", affix = "", "Cannot be Frozen if 6 Redeemer Items are Equipped", statOrder = { 4344 }, level = 1, group = "CannotBeFrozen6RedeemerItems", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "ailment" }, },
["GlobalColdGemLevel6RedeemerItemsUnique__1"] = { type = "6Redeemer", affix = "", "+1 to Level of all Cold Skill Gems if 6 Redeemer Items are Equipped", statOrder = { 4348 }, level = 1, group = "GlobalColdGemLevel6RedeemerItems", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "gem" }, },
["MaximumFrenzyCharges6RedeemerItemsUnique__1"] = { type = "6Redeemer", affix = "", "+1 to Maximum Frenzy Charges if 6 Redeemer Items are Equipped", statOrder = { 4353 }, level = 1, group = "MaximumFrenzyCharges6RedeemerItems", weightKey = { }, weightVal = { }, modTags = { "frenzy_charge" }, },
["PhysicalDamagePreventedAsEnergyShieldRegen6CrusaderItemsUnique__1"] = { type = "6Crusader", affix = "", "(10-30)% of Physical Damage Prevented Recently is Regenerated as Energy Shield Per Second if 6 Crusader Items are Equipped", statOrder = { 4350 }, level = 1, group = "PhysicalDamagePreventedAsEnergyShieldRegen6CrusaderItems", weightKey = { }, weightVal = { }, modTags = { "defences", "armour", "energy_shield" }, },
["PhysicalDamagePreventedAsEnergyShieldRegen6CrusaderItemsUnique__1"] = { type = "6Crusader", affix = "", "(1-3)% of Physical Damage Prevented Recently is Regenerated as Energy Shield Per Second if 6 Crusader Items are Equipped", statOrder = { 4350 }, level = 1, group = "PhysicalDamagePreventedAsEnergyShieldRegen6CrusaderItems", weightKey = { }, weightVal = { }, modTags = { "defences", "armour", "energy_shield" }, },
["GlobalLightningGemLevel6CrusaderItemsUnique__1"] = { type = "6Crusader", affix = "", "+1 to Level of all Lightning Skill Gems if 6 Crusader Items are Equipped", statOrder = { 4351 }, level = 1, group = "GlobalLightningGemLevel6CrusaderItems", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "gem" }, },
["IncreasedMaximumPowerCharges6CrusaderItemsUnique__1"] = { type = "6Crusader", affix = "", "+1 to Maximum Power Charges if 6 Crusader Items are Equipped", statOrder = { 4354 }, level = 1, group = "IncreasedMaximumPowerCharges6CrusaderItems", weightKey = { }, weightVal = { }, modTags = { "power_charge" }, },
}
2 changes: 1 addition & 1 deletion src/Export/statdesc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function describeStats(stats)
val[spec.v].min = round(val[spec.v].min / 6, 1)
val[spec.v].max = round(val[spec.v].max / 6, 1)
val[spec.v].fmt = "g"
elseif spec.k == "divide_by_ten_1dp_if_required" then
elseif spec.k == "divide_by_ten_1dp_if_required" or spec.k == "divide_by_ten_1dp" then
val[spec.v].min = round(val[spec.v].min / 10, 1)
val[spec.v].max = round(val[spec.v].max / 10, 1)
val[spec.v].fmt = "g"
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/StatDescriber.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ local function applySpecial(val, spec)
val[spec.v].min = val[spec.v].min / 6
val[spec.v].max = val[spec.v].max / 6
val[spec.v].fmt = "g"
elseif spec.k == "divide_by_ten_1dp_if_required" then
elseif spec.k == "divide_by_ten_1dp_if_required" or spec.k == "divide_by_ten_1dp" then
val[spec.v].min = round(val[spec.v].min / 10, 1)
val[spec.v].max = round(val[spec.v].max / 10, 1)
val[spec.v].fmt = "g"
Expand Down