From 1b08f28613b57f63909edf0f290ea5e8d52d7339 Mon Sep 17 00:00:00 2001 From: Dayve Date: Wed, 18 May 2016 19:16:32 +1000 Subject: [PATCH 1/6] Update manifest for release --- manifest.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.xml b/manifest.xml index fadb4a189..17a6cdcbd 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,9 +2,9 @@ - - - + + + @@ -12,7 +12,7 @@ - + @@ -20,9 +20,9 @@ - + - + @@ -49,10 +49,10 @@ - + - + From 0277ae99d2ff17e905a656fcc1ba20a99afedb4e Mon Sep 17 00:00:00 2001 From: Dayve Date: Wed, 18 May 2016 19:46:13 +1000 Subject: [PATCH 2/6] Update manifest for release --- manifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.xml b/manifest.xml index 723c9f5c4..17a6cdcbd 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,8 +1,8 @@ - - + + From 6d9f30c4723d9c733eeb1e7f3c0bd61a6b94369b Mon Sep 17 00:00:00 2001 From: twiz-ahk Date: Thu, 7 Dec 2017 07:50:29 -0500 Subject: [PATCH 3/6] Update shield.lua Rise of the Phoenix update --- Data/Uniques/shield.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Data/Uniques/shield.lua b/Data/Uniques/shield.lua index 20a79e1bc..d13732f82 100644 --- a/Data/Uniques/shield.lua +++ b/Data/Uniques/shield.lua @@ -541,14 +541,18 @@ Socketed Gems have 25% reduced Mana Reservation Rise of the Phoenix Mosaic Kite Shield Variant: Pre 1.1.0 +Variant: Pre 3.1.0 Variant: Current Requires Level 65, 85 Str, 85 Int Implicits: 2 {variant:1}+16% to all Elemental Resistances -{variant:2}+8% to all Elemental Resistances +{variant:2,3}+8% to all Elemental Resistances +{variant:3}+(40-60) Maximum Life (80-100)% increased Armour and Energy Shield -6 Life Regenerated per second -+8% to maximum Fire Resistance +{variant:1,2}6 Life Regenerated per second +{variant:3}(15-20) Life Regenerated per second +{variant:1,2}+8% to maximum Fire Resistance +{variant:3}+5% to maximum Fire Resistance +(20-25)% to Fire Resistance 25% increased Fire Resistance while on Low Life 10% increased Movement Speed when on Low Life From c43463597f8edd4e4dd7a6b35bd9fc06000dc8e2 Mon Sep 17 00:00:00 2001 From: Openarl Date: Thu, 7 Dec 2017 23:23:00 +1000 Subject: [PATCH 4/6] Revert "Update shield.lua" This reverts commit 6d9f30c4723d9c733eeb1e7f3c0bd61a6b94369b. --- Data/Uniques/shield.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Data/Uniques/shield.lua b/Data/Uniques/shield.lua index d13732f82..20a79e1bc 100644 --- a/Data/Uniques/shield.lua +++ b/Data/Uniques/shield.lua @@ -541,18 +541,14 @@ Socketed Gems have 25% reduced Mana Reservation Rise of the Phoenix Mosaic Kite Shield Variant: Pre 1.1.0 -Variant: Pre 3.1.0 Variant: Current Requires Level 65, 85 Str, 85 Int Implicits: 2 {variant:1}+16% to all Elemental Resistances -{variant:2,3}+8% to all Elemental Resistances -{variant:3}+(40-60) Maximum Life +{variant:2}+8% to all Elemental Resistances (80-100)% increased Armour and Energy Shield -{variant:1,2}6 Life Regenerated per second -{variant:3}(15-20) Life Regenerated per second -{variant:1,2}+8% to maximum Fire Resistance -{variant:3}+5% to maximum Fire Resistance +6 Life Regenerated per second ++8% to maximum Fire Resistance +(20-25)% to Fire Resistance 25% increased Fire Resistance while on Low Life 10% increased Movement Speed when on Low Life From db0e138ee96b1e5456bab509378f1de88c1a8514 Mon Sep 17 00:00:00 2001 From: Artanys Date: Thu, 31 May 2018 22:46:43 -0400 Subject: [PATCH 5/6] Implementing 3.0 Shock Effect & Duration --- Modules/CalcOffence-3_0.lua | 26 ++++++++++++++++++++++++-- Modules/CalcSections-3_0.lua | 9 ++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Modules/CalcOffence-3_0.lua b/Modules/CalcOffence-3_0.lua index 52c859bb5..d6d886030 100644 --- a/Modules/CalcOffence-3_0.lua +++ b/Modules/CalcOffence-3_0.lua @@ -1847,9 +1847,30 @@ function calcs.offence(env, actor) local baseVal = calcAilmentDamage("Shock", sourceHitDmg, sourceCritDmg) if baseVal > 0 then skillFlags.shock = true - output.ShockDurationMod = 1 + modDB:Sum("INC", cfg, "EnemyShockDuration") / 100 + enemyDB:Sum("INC", nil, "SelfShockDuration") / 100 + + local baseShockDur = 2 + local incDur = 1 + modDB:Sum("INC", cfg, "EnemyShockDuration") / 100 + enemyDB:Sum("INC", nil, "SelfShockDuration") / 100 + output.ShockDurationMod = baseShockDur * incDur + if breakdown then + if output.ShockDurationMod ~= baseShockDur then + globalBreakdown.ShockDurationMod = { + s_format("2.00s ^8(base duration)", baseShockDur), + } + if incDur ~= 0 then + t_insert(globalBreakdown.ShockDurationMod, s_format("x %.2f ^8(increased/reduced shock duration)", incDur)) + end + t_insert(globalBreakdown.ShockDurationMod, s_format("= %.2fs", output.ShockDurationMod)) + end + end + output.ShockEffectMod = 1 + modDB:Sum("INC", cfg, "EnemyShockEffect") / 100 if breakdown then - t_insert(breakdown.ShockDPS, s_format("For shock to apply, target must have no more than %d life.", baseVal * 20 * output.ShockDurationMod)) + --t_insert(breakdown.ShockDPS, s_format("For shock to apply, target must have no more than %d life.", baseVal * 20 * output.ShockDurationMod)) + t_insert(breakdown.ShockDPS, s_format("For 1%% (min) shock to apply, target must have no more than %d life.", baseVal * 500 * output.ShockEffectMod)) + t_insert(breakdown.ShockDPS, s_format("For 10%% shock to apply, target must have no more than %d life.", baseVal * 50 * output.ShockEffectMod)) + t_insert(breakdown.ShockDPS, s_format("For 20%% shock to apply, target must have no more than %d life.", baseVal * 25 * output.ShockEffectMod)) + t_insert(breakdown.ShockDPS, s_format("For 30%% shock to apply, target must have no more than %d life.", baseVal * 16.66 * output.ShockEffectMod)) + t_insert(breakdown.ShockDPS, s_format("For 40%% shock to apply, target must have no more than %d life.", baseVal * 12.5 * output.ShockEffectMod)) + t_insert(breakdown.ShockDPS, s_format("For 50%% (max) shock to apply, target must have no more than %d life.", baseVal * 10 * output.ShockEffectMod)) end end end @@ -1938,6 +1959,7 @@ function calcs.offence(env, actor) end combineStat("ShockChance", "AVERAGE") combineStat("ShockDurationMod", "AVERAGE") + combineStat("ShockEffectMod", "AVERAGE") combineStat("FreezeChance", "AVERAGE") combineStat("FreezeDurationMod", "AVERAGE") end diff --git a/Modules/CalcSections-3_0.lua b/Modules/CalcSections-3_0.lua index 4004455b1..cfd845c8d 100644 --- a/Modules/CalcSections-3_0.lua +++ b/Modules/CalcSections-3_0.lua @@ -719,12 +719,15 @@ return { { label = "Player modifiers", modName = "EnemyShockChance", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfShockChance", enemy = true }, }, }, - { label = "Shock Dur. Mod", flag = "shock", { format = "x {2:output:ShockDurationMod}", + { label = "Shock Duration", flag = "shock", { format = "{2:output:ShockDurationMod}s", + { breakdown = "ShockDurationMod" }, + { label = "Player modifiers", modName = "EnemyShockDuration", cfg = "skill" }, + }, }, + { label = "Shock Effect Mod", flag = "shock", { format = "x {2:output:ShockEffectMod}", { breakdown = "MainHand.ShockDPS" }, { breakdown = "OffHand.ShockDPS" }, { breakdown = "ShockDPS" }, - { label = "Player modifiers", modName = "EnemyShockDuration", cfg = "skill" }, - { label = "Enemy modifiers", modName = "SelfShockDuration", enemy = true }, + { label = "Player modifiers", modName = "EnemyShockEffect", cfg = "skill" }, }, }, { label = "Chance to Freeze", flag = "freeze", { format = "{0:output:FreezeChance}%", { breakdown = "MainHand.FreezeChance" }, From 1b927d04e034eda5d04ed1f35d6cb206016c84b1 Mon Sep 17 00:00:00 2001 From: Artanys Date: Thu, 31 May 2018 22:52:57 -0400 Subject: [PATCH 6/6] Putting self shock duration back in --- Modules/CalcSections-3_0.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/CalcSections-3_0.lua b/Modules/CalcSections-3_0.lua index cfd845c8d..c229e465a 100644 --- a/Modules/CalcSections-3_0.lua +++ b/Modules/CalcSections-3_0.lua @@ -722,6 +722,7 @@ return { { label = "Shock Duration", flag = "shock", { format = "{2:output:ShockDurationMod}s", { breakdown = "ShockDurationMod" }, { label = "Player modifiers", modName = "EnemyShockDuration", cfg = "skill" }, + { label = "Enemy modifiers", modName = "SelfShockDuration", enemy = true }, }, }, { label = "Shock Effect Mod", flag = "shock", { format = "x {2:output:ShockEffectMod}", { breakdown = "MainHand.ShockDPS" },