diff --git a/CHANGELOG.md b/CHANGELOG.md index 909faf57..4f90d272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.4.100 - 2018/09/01 + * Consecrated Path and Smite are now correctly affected by Melee modifiers + * Earthquake's Aftershock damage multiplier now works correctly + ### 1.4.99 - 2018/09/01 * Added the new skills for 3.4: * Vaal Ancestral Warchief diff --git a/Data/3_0/Skills/act_str.lua b/Data/3_0/Skills/act_str.lua index 24c57782..555e6c32 100644 --- a/Data/3_0/Skills/act_str.lua +++ b/Data/3_0/Skills/act_str.lua @@ -613,6 +613,7 @@ skills["ConsecratedPath"] = { }, baseFlags = { attack = true, + melee = true, area = true, duration = true, }, @@ -1010,7 +1011,7 @@ skills["Earthquake"] = { skill("castTime", 1), skill("manaCost", 10), skill("duration", 1), --"base_skill_effect_duration" = 1000 - mod("Damage", "MORE", 70, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), 0, { type = "SkillPart", skillPart = 2 }), --"quake_slam_fully_charged_explosion_damage_+%_final" = 70 + mod("Damage", "MORE", 70, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "SkillPart", skillPart = 2 }), --"quake_slam_fully_charged_explosion_damage_+%_final" = 70 --"is_area_damage" = ? skill("showAverage", true, { type = "SkillPart", skillPart = 2 }), skill("radius", 18, { type = "SkillPart", skillPart = 1 }), @@ -1110,7 +1111,7 @@ skills["VaalEarthquake"] = { [1] = skill("levelRequirement", nil), [2] = skill("damageEffectiveness", nil), [3] = skill("baseMultiplier", nil), - [4] = mod("Damage", "MORE", nil, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), 0, { type = "SkillPart", skillPart = 2 }), --"quake_slam_fully_charged_explosion_damage_+%_final" + [4] = mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "SkillPart", skillPart = 2 }), --"quake_slam_fully_charged_explosion_damage_+%_final" }, levels = { [1] = { 28, 0.5, 0.5, 350, }, @@ -3152,6 +3153,7 @@ skills["Smite"] = { }, baseFlags = { attack = true, + melee = true, duration = true, area = true, }, diff --git a/Export/Skills/act_str.txt b/Export/Skills/act_str.txt index 0bc3fe1e..5fd032de 100644 --- a/Export/Skills/act_str.txt +++ b/Export/Skills/act_str.txt @@ -59,7 +59,7 @@ local skills, mod, flag, skill = ... #mods #skill ConsecratedPath -#flags attack area duration +#flags attack melee area duration #mods #skill DecoyTotem @@ -253,7 +253,7 @@ local skills, mod, flag, skill = ... #mods #skill Smite -#flags attack duration area +#flags attack melee duration area #mods #skill StaticStrike diff --git a/Export/Skills/statmap.ini b/Export/Skills/statmap.ini index ffbc02ef..f63b5972 100644 --- a/Export/Skills/statmap.ini +++ b/Export/Skills/statmap.ini @@ -720,7 +720,7 @@ mod = skill("manaLeechPerUse", {val}) mod = mod("Damage", "MORE", {val}, ModFlag.Spell, 0, { type = "Condition", var = "SkillIsTriggered" }) # Earthquake [quake_slam_fully_charged_explosion_damage_+%_final] -mod = mod("Damage", "MORE", {val}, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), 0, { type = "SkillPart", skillPart = 2 }) +mod = mod("Damage", "MORE", {val}, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "SkillPart", skillPart = 2 }) # Enfeeble [enfeeble_damage_+%_final] mod = mod("Damage", "MORE", {val}, 0, 0, { type = "GlobalEffect", effectType = "Curse" }) diff --git a/Modules/Main.lua b/Modules/Main.lua index 99f48a8b..585d799c 100644 --- a/Modules/Main.lua +++ b/Modules/Main.lua @@ -429,7 +429,7 @@ end function main:CallMode(func, ...) local modeTbl = self.modes[self.mode] - if modeTbl[func] then + if modeTbl and modeTbl[func] then return modeTbl[func](modeTbl, ...) end end diff --git a/changelog.txt b/changelog.txt index 4c2a0f45..0403470e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +VERSION[1.4.100][2018/09/01] + * Consecrated Path and Smite are now correctly affected by Melee modifiers + * Earthquake's Aftershock damage multiplier now works correctly VERSION[1.4.99][2018/09/01] * Added the new skills for 3.4: * Vaal Ancestral Warchief diff --git a/manifest.xml b/manifest.xml index 5b028de8..c415f1ed 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -71,7 +71,7 @@ - + @@ -180,7 +180,7 @@ - +