Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Kingmaker, fixed Fortify mods to use "Fortified" condition #3928

Merged
merged 3 commits into from
Jan 30, 2022
Merged

Updated Kingmaker, fixed Fortify mods to use "Fortified" condition #3928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb460f
feat: Updating Kingmaker to 3.16, changing legacy fortify mods to use…
Wires77 Jan 20, 2022
2ffe9b3
Merge branch 'dev' into kingmaker_fortify
LocalIdentity Jan 30, 2022
2df00f0
Fix regression
Jan 30, 2022
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
12 changes: 7 additions & 5 deletions src/Data/Uniques/axe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,20 +256,22 @@ Source: Vendor recipe
Variant: Pre 2.6.0
Variant: Pre 3.6.0
Variant: Pre 3.11.0
Variant: Pre 3.16.0
Variant: Current
Requires Level 66, 140 Str, 86 Dex
{variant:1,2}(200-250)% increased Physical Damage
{variant:3}(250-285)% increased Physical Damage
{variant:4}(170-200)% increased Physical Damage
{variant:5}(190-240)% increased Physical Damage
(7-12)% increased Attack Speed
{variant:2,3,4}(30-40)% increased Critical Strike Chance
{variant:2,3,4,5}(30-40)% increased Critical Strike Chance
{variant:1}+(100-150) to maximum Mana
Nearby Allies have 30% increased Item Rarity
{variant:1}Nearby Allies' spells have Culling Strike
{variant:2,3,4}Nearby Allies have Culling Strike
{variant:2,3,4}Insufficient Mana doesn't prevent your Melee Attacks
{variant:3,4}Nearby Allies have +50% to Critical Strike Multiplier
{variant:3,4}Nearby Allies have Fortify
{variant:2,3,4,5}Nearby Allies have Culling Strike
{variant:2,3,4,5}Insufficient Mana doesn't prevent your Melee Attacks
{variant:3,4,5}Nearby Allies have +50% to Critical Strike Multiplier
{variant:3,4,5}Nearby Allies have +10 Fortification
]],[[
Kitava's Feast
Void Axe
Expand Down
3 changes: 2 additions & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,8 @@ local function doActorMisc(env, actor)
if env.player.mainSkill.baseSkillModList:Flag(nil, "Cruelty") then
modDB.multipliers["Cruelty"] = modDB:Override(nil, "Cruelty") or 40
end
if modDB:Flag(nil, "Fortified") then
-- Fortify from a mod, or minions getting stacks from Kingmaker
if modDB:Flag(nil, "Fortified") or modDB:Sum("BASE", nil, "Multiplier:Fortification") > 0 then
local maxStacks = modDB:Override(nil, "MaximumFortification") or modDB:Sum("BASE", skillCfg, "MaximumFortification")
local stacks = modDB:Override(nil, "FortificationStacks") or maxStacks
output.FortificationStacks = stacks
Expand Down
12 changes: 6 additions & 6 deletions src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ local modNameList = {
-- Buffs
["onslaught effect"] = "OnslaughtEffect",
["adrenaline duration"] = "AdrenalineDuration",
["effect of fortify on you"] = "FortifyEffectOnSelf",
["effect of tailwind on you"] = "TailwindEffectOnSelf",
["elusive effect"] = "ElusiveEffect",
["effect of elusive on you"] = "ElusiveEffect",
Expand Down Expand Up @@ -1197,7 +1196,7 @@ local modTagList = {
["while you have at least (%d+) total endurance, frenzy and power charges"] = function(num) return { tag = { type = "MultiplierThreshold", var = "TotalCharges", threshold = num } } end,
["while you have a totem"] = { tag = { type = "Condition", var = "HaveTotem" } },
["while you have at least one nearby ally"] = { tag = { type = "MultiplierThreshold", var = "NearbyAlly", threshold = 1 } },
["while you have fortify"] = { tag = { type = "Condition", var = "Fortify" } },
["while you have fortify"] = { tag = { type = "Condition", var = "Fortified" } },
["while you have phasing"] = { tag = { type = "Condition", var = "Phasing" } },
["while you have elusive"] = { tag = { type = "Condition", var = "Elusive" } },
["while physical aegis is depleted"] = { tag = { type = "Condition", var = "PhysicalAegisDepleted" } },
Expand Down Expand Up @@ -1664,9 +1663,9 @@ local specialModList = {
},
["exerted attacks deal (%d+)%% more damage if a warcry sacrificed rage recently"] = function(num) return { mod("ExertIncrease", "MORE", num, nil, ModFlag.Attack, 0) } end,
-- Champion
["cannot be stunned while you have fortify"] = { mod("AvoidStun", "BASE", 100, { type = "Condition", var = "Fortify" }) },
["cannot be stunned while you have fortify"] = { mod("AvoidStun", "BASE", 100, { type = "Condition", var = "Fortified" }) },
["cannot be stunned while fortified"] = { mod("AvoidStun", "BASE", 100, { type = "Condition", var = "Fortified" }) },
["fortify"] = { flag("Condition:Fortify") },
["fortify"] = { flag("Condition:Fortified") },
["you have (%d+) fortification"] = function(num) return {
flag("Condition:Fortified")
} end,
Expand Down Expand Up @@ -3312,7 +3311,7 @@ local regenTypes = {
local flagTypes = {
["phasing"] = "Condition:Phasing",
["onslaught"] = "Condition:Onslaught",
["fortify"] = "Condition:Fortify",
["fortify"] = "Condition:Fortified",
["fortified"] = "Condition:Fortified",
["unholy might"] = "Condition:UnholyMight",
["tailwind"] = "Condition:Tailwind",
Expand Down Expand Up @@ -3612,7 +3611,8 @@ local jewelThresholdFuncs = {
["With at least 40 Strength in Radius, Heavy Strike has a 20% chance to deal Double Damage"] = getThreshold("Str", "DoubleDamageChance", "BASE", 20, { type = "SkillName", skillName = "Heavy Strike" }),
["With at least 40 Strength in Radius, Heavy Strike has a 20% chance to deal Double Damage."] = getThreshold("Str", "DoubleDamageChance", "BASE", 20, { type = "SkillName", skillName = "Heavy Strike" }),
["With at least 40 Strength in Radius, Cleave has +1 to Radius per Nearby Enemy, up to +10"] = getThreshold("Str", "AreaOfEffect", "BASE", 1, { type = "Multiplier", var = "NearbyEnemies", limit = 10 }, { type = "SkillName", skillName = "Cleave" }),
["With at least 40 Strength in Radius, Cleave grants Fortify on Hit"] = getThreshold("Str", "ExtraSkillMod", "LIST", { mod = flag("Condition:Fortify") }, { type = "SkillName", skillName = "Cleave" }),
["With at least 40 Strength in Radius, Cleave grants Fortify on Hit"] = getThreshold("Str", "ExtraSkillMod", "LIST", { mod = flag("Condition:Fortified") }, { type = "SkillName", skillName = "Cleave" }),
["With at least 40 Strength in Radius, Hits with Cleave Fortify"] = getThreshold("Str", "ExtraSkillMod", "LIST", { mod = flag("Condition:Fortified") }, { type = "SkillName", skillName = "Cleave" }),
["With at least 40 Dexterity in Radius, Dual Strike has a 20% chance to deal Double Damage with the Main-Hand Weapon"] = getThreshold("Dex", "DoubleDamageChance", "BASE", 20, { type = "SkillName", skillName = "Dual Strike" }, { type = "Condition", var = "MainHandAttack" }),
["With at least 40 Dexterity in Radius, Dual Strike has (%d+)%% increased Attack Speed while wielding a Claw"] = function(num) return getThreshold("Dex", "Speed", "INC", num, { type = "SkillName", skillName = "Dual Strike" }, { type = "Condition", var = "UsingClaw" }) end,
["With at least 40 Dexterity in Radius, Dual Strike has %+(%d+)%% to Critical Strike Multiplier while wielding a Dagger"] = function(num) return getThreshold("Dex", "CritMultiplier", "BASE", num, { type = "SkillName", skillName = "Dual Strike" }, { type = "Condition", var = "UsingDagger" }) end,
Expand Down