Skip to content

Fix veiled mod pool on autogenerated unique weapons #4651

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

Merged
merged 2 commits into from
Aug 7, 2022
Merged

Fix veiled mod pool on autogenerated unique weapons #4651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4a705
Fix veiled mod pool on autogenerated unique weapons
Jul 26, 2022
4651265
Fix variant in wrong file
Jul 27, 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
29 changes: 17 additions & 12 deletions src/Data/Uniques/Special/Generated.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ local parseVeiledModName = function(string)
gsub("(%d)", " %1 "))
end

local veiledModIsActive = function(mod, baseType, specificType)
local veiledModIsActive = function(mod, baseType, specificType1, specificType2)
local baseIndex = isValueInTable(mod.weightKey, baseType)
local typeIndex = isValueInTable(mod.weightKey, specificType)
return (typeIndex and mod.weightVal[typeIndex] > 0) or (not typeIndex and baseIndex and mod.weightVal[baseIndex] > 0)
local typeIndex1 = isValueInTable(mod.weightKey, specificType1)
local typeIndex2 = isValueInTable(mod.weightKey, specificType2)
return (typeIndex1 and mod.weightVal[typeIndex1] > 0) or (typeIndex2 and mod.weightVal[typeIndex2] > 0) or (not typeIndex1 and not typeIndex2 and baseIndex and mod.weightVal[baseIndex] > 0)
end

local getVeiledMods = function (baseType, specificType, canHaveCatarinaMod)
local getVeiledMods = function (veiledPool, baseType, specificType1, specificType2)
local veiledMods = { }
for veiledModIndex, veiledMod in pairs(data.veiledMods) do
if veiledModIsActive(veiledMod, baseType, specificType) then
if veiledModIsActive(veiledMod, baseType, specificType1, specificType2) then
local veiledName = parseVeiledModName(veiledModIndex)

veiledName = "("..veiledMod.type..") "..veiledName
Expand All @@ -37,7 +38,11 @@ local getVeiledMods = function (baseType, specificType, canHaveCatarinaMod)
veiled.veiledLines[line] = value
end

if (canHaveCatarinaMod or (veiledMod.affix ~= "Catarina's" and veiledMod.affix ~= "Haku's")) then
if veiledPool == "base" and (veiledMod.affix == "Chosen" or veiledMod.affix == "of the Order") then
table.insert(veiledMods, veiled)
elseif veiledPool == "catarina" and (veiledMod.affix == "Catarina's" or veiledMod.affix == "Chosen" or veiledMod.affix == "of the Order") then
table.insert(veiledMods, veiled)
elseif veiledPool == "all" then
table.insert(veiledMods, veiled)
end
end
Expand All @@ -46,14 +51,14 @@ local getVeiledMods = function (baseType, specificType, canHaveCatarinaMod)
return veiledMods
end

local paradoxicaMods = getVeiledMods("weapon", "one_hand_weapon", false)
local paradoxicaMods = getVeiledMods("base", "weapon", "one_hand_weapon")
local paradoxica = {
"Paradoxica",
"Vaal Rapier",
"League: Betrayal",
"Has Alt Variant: true",
"Selected Variant: 1",
"Selected Alt Variant: 20"
"Selected Variant: 4",
"Selected Alt Variant: 16"
}

for index, mod in pairs(paradoxicaMods) do
Expand All @@ -80,7 +85,7 @@ end
table.insert(paradoxica, "Attacks with this Weapon deal Double Damage")
table.insert(data.uniques.generated, table.concat(paradoxica, "\n"))

local caneOfKulemakMods = getVeiledMods("weapon", "staff", true)
local caneOfKulemakMods = getVeiledMods("catarina", "weapon", "staff", "two_hand_weapon")
local caneOfKulemak = {
"Cane of Kulemak",
"Serpentine Staff",
Expand All @@ -107,7 +112,7 @@ end

table.insert(data.uniques.generated, table.concat(caneOfKulemak, "\n"))

local replicaParadoxicaMods = getVeiledMods("weapon", "one_hand_weapon", true)
local replicaParadoxicaMods = getVeiledMods("all", "weapon", "one_hand_weapon")
local replicaParadoxica = {
"Replica Paradoxica",
"Vaal Rapier",
Expand Down Expand Up @@ -141,7 +146,7 @@ end

table.insert(data.uniques.generated, table.concat(replicaParadoxica, "\n"))

local queensHungerMods = getVeiledMods("body_armour", "int_armour", false)
local queensHungerMods = getVeiledMods("base", "body_armour", "int_armour")
local queensHunger = {
"The Queen's Hunger",
"Vaal Regalia",
Expand Down
1 change: 1 addition & 0 deletions src/Data/Uniques/jewel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1749,6 +1749,7 @@ Requires Level: 20
Limited to: 1 Historic
Has Alt Variant: true
Has Alt Variant Two: true
Selected Variant: 1
Variant: Avarius
Variant: Dominus
Variant: Venarius
Expand Down