diff --git a/Data/Gems/sup_int.lua b/Data/Gems/sup_int.lua index 078dfd0e..2eb09c3f 100644 --- a/Data/Gems/sup_int.lua +++ b/Data/Gems/sup_int.lua @@ -228,40 +228,40 @@ gems["Cast while Channelling"] = { mod("Damage", "INC", 0.5, 0, 0, nil), --"damage_+%" = 0.5 }, levelMods = { - --[1] = "cast_while_channelling_time_ms" + [1] = skill("timeOverride", nil, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"cast_while_channelling_time_ms" [2] = mod("Damage", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"support_cast_while_channelling_triggered_skill_damage_+%_final" }, levels = { - [1] = { 450, 0, }, - [2] = { 440, 0, }, - [3] = { 440, 1, }, - [4] = { 430, 1, }, - [5] = { 430, 2, }, - [6] = { 420, 2, }, - [7] = { 420, 3, }, - [8] = { 410, 3, }, - [9] = { 410, 4, }, - [10] = { 400, 4, }, - [11] = { 400, 5, }, - [12] = { 390, 5, }, - [13] = { 390, 6, }, - [14] = { 380, 6, }, - [15] = { 380, 7, }, - [16] = { 370, 7, }, - [17] = { 370, 8, }, - [18] = { 360, 8, }, - [19] = { 360, 9, }, - [20] = { 350, 9, }, - [21] = { 350, 10, }, - [22] = { 340, 10, }, - [23] = { 340, 11, }, - [24] = { 330, 11, }, - [25] = { 330, 12, }, - [26] = { 320, 12, }, - [27] = { 320, 13, }, - [28] = { 310, 13, }, - [29] = { 310, 14, }, - [30] = { 300, 14, }, + [1] = { 0.45, 0, }, + [2] = { 0.44, 0, }, + [3] = { 0.44, 1, }, + [4] = { 0.43, 1, }, + [5] = { 0.43, 2, }, + [6] = { 0.42, 2, }, + [7] = { 0.42, 3, }, + [8] = { 0.41, 3, }, + [9] = { 0.41, 4, }, + [10] = { 0.4, 4, }, + [11] = { 0.4, 5, }, + [12] = { 0.39, 5, }, + [13] = { 0.39, 6, }, + [14] = { 0.38, 6, }, + [15] = { 0.38, 7, }, + [16] = { 0.37, 7, }, + [17] = { 0.37, 8, }, + [18] = { 0.36, 8, }, + [19] = { 0.36, 9, }, + [20] = { 0.35, 9, }, + [21] = { 0.35, 10, }, + [22] = { 0.34, 10, }, + [23] = { 0.34, 11, }, + [24] = { 0.33, 11, }, + [25] = { 0.33, 12, }, + [26] = { 0.32, 12, }, + [27] = { 0.32, 13, }, + [28] = { 0.31, 13, }, + [29] = { 0.31, 14, }, + [30] = { 0.3, 14, }, }, } gems["Chance to Ignite"] = { diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index ca380f0a..dd1a2898 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -1818,20 +1818,25 @@ local function performCalcs(env) -- Calculate attack/cast speed do local baseSpeed - if isAttack then - if skillData.castTimeOverridesAttackTime then - -- Skill is overriding weapon attack speed - baseSpeed = 1 / skillData.castTime * (1 + (env.weaponData1.AttackSpeedInc or 0) / 100) - else - baseSpeed = env.weaponData1.attackRate or 1 - end + if skillData.timeOverride then + output.Time = skillData.timeOverride + output.Speed = 1 / output.Time else - baseSpeed = 1 / (skillData.castTime or 1) - end - output.Speed = baseSpeed * calcMod(modDB, skillCfg, "Speed") - output.Time = 1 / output.Speed - if breakdown then - simpleBreakdown(baseSpeed, skillCfg, "Speed") + if isAttack then + if skillData.castTimeOverridesAttackTime then + -- Skill is overriding weapon attack speed + baseSpeed = 1 / skillData.castTime * (1 + (env.weaponData1.AttackSpeedInc or 0) / 100) + else + baseSpeed = env.weaponData1.attackRate or 1 + end + else + baseSpeed = 1 / (skillData.castTime or 1) + end + output.Speed = baseSpeed * calcMod(modDB, skillCfg, "Speed") + output.Time = 1 / output.Speed + if breakdown then + simpleBreakdown(baseSpeed, skillCfg, "Speed") + end end end @@ -1992,7 +1997,7 @@ local function performCalcs(env) output.TotalMax = totalMax -- Update enemy hit-by-damage-type conditions - enemyDB.conditions.HitByFireDamage = output.FireAverage > 0 + enemyDB.conditions.HitByFireDamage = output.FireAverage > 0 enemyDB.conditions.HitByColdDamage = output.ColdAverage > 0 enemyDB.conditions.HitByLightningDamage = output.LightningAverage > 0 diff --git a/README.md b/README.md index dfef1f95..49df86fc 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,8 @@ Welcome to Path of Building, an offline build planner for Path of Exile! * Also calculates life/mana reservations * Shows a summary of character stats in the side bar, as well as a detailed calcs breakdown tab which can show you how the stats were derived * Supports most skills, support gems, passives and item modifiers - * Throughout the program, supported modifiers will show in blue and unsupported ones in white + * Throughout the program, supported modifiers will show in blue and unsupported ones in red * Most minion skill are unsupported at present (except for golems, which can provide buffs to you) - * Trigger gems are generally unsupported (Cast on Crit, etc) * No support for flasks yet * Passive skill tree planner: * Support for jewels including most radius/conversion jewels diff --git a/manifest.xml b/manifest.xml index 584c92e8..b49f8276 100644 --- a/manifest.xml +++ b/manifest.xml @@ -44,7 +44,7 @@ - + @@ -61,7 +61,7 @@ - +