Skip to content

Commit 0dd1bc8

Browse files
michelrtmLocalIdentity
andauthored
fix(9413): Changed mods available for The Queen's Hunger and changed veiled mods to display as crafted. (#9455)
* fix(9413): Changed mods available for The Queen's Hunger and changed veiled mods to display as crafted. * chore: Changed spaces to tabs in lookup function. * Use existing function * Formatting --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent b4b76a1 commit 0dd1bc8

2 files changed

Lines changed: 62 additions & 12 deletions

File tree

src/Data/ModCache.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,6 @@ c["+188 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShi
573573
c["+19 to Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="BASE",value=19}},nil}
574574
c["+19 to Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",type="BASE",value=19}},nil}
575575
c["+19 to all Attributes"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=19},[2]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=19},[3]={flags=0,keywordFlags=0,name="Int",type="BASE",value=19},[4]={flags=0,keywordFlags=0,name="All",type="BASE",value=19}},nil}
576-
c["+19 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=19}},nil}
577576
c["+19% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=19}},nil}
578577
c["+190 to Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type="BASE",value=190}},nil}
579578
c["+190 to Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="BASE",value=190}},nil}
@@ -1279,7 +1278,6 @@ c["+325 to Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type=
12791278
c["+325 to Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="BASE",value=325}},nil}
12801279
c["+33 to Maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=33}},nil}
12811280
c["+33 to Strength and Dexterity"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=33},[2]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=33},[3]={flags=0,keywordFlags=0,name="StrDex",type="BASE",value=33}},nil}
1282-
c["+33 to Strength and Intelligence"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=33},[2]={flags=0,keywordFlags=0,name="Int",type="BASE",value=33},[3]={flags=0,keywordFlags=0,name="StrInt",type="BASE",value=33}},nil}
12831281
c["+33 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=33}},nil}
12841282
c["+33 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=33}},nil}
12851283
c["+33% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=33}},nil}
@@ -5033,8 +5031,6 @@ c["320% increased Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",
50335031
c["320% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=320}},nil}
50345032
c["325% Increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamage",type="INC",value=325}},nil}
50355033
c["325% increased Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="INC",value=325}},nil}
5036-
c["33% chance to Avoid Elemental Ailments"]={{[1]={flags=0,keywordFlags=0,name="AvoidElementalAilments",type="BASE",value=33}},nil}
5037-
c["33% chance to Avoid being Stunned"]={{[1]={flags=0,keywordFlags=0,name="AvoidStun",type="BASE",value=33}},nil}
50385034
c["33% chance to Blind nearby Enemies when gaining Her Blessing"]={{}," to Blind nearby Enemies when gaining Her Blessing "}
50395035
c["33% chance to Blind nearby Enemies when gaining Her Blessing 100% chance to Avoid being Ignited, Chilled or Frozen with Her Blessing"]={{[1]={flags=0,keywordFlags=0,name="AvoidIgnite",type="BASE",value=33}}," to Blind nearby Enemies when gaining Her Blessing 100% chance , Chilled or Frozen with Her Blessing "}
50405036
c["33% chance to gain a Frenzy Charge on Kill"]={nil,"a Frenzy Charge "}
@@ -10623,6 +10619,7 @@ c["Regenerate 175 Life per Second while in Blood Stance"]={{[1]={[1]={type="Cond
1062310619
c["Regenerate 2 Mana per Second per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="ManaRegen",type="BASE",value=2}},nil}
1062410620
c["Regenerate 2 Mana per second"]={{[1]={flags=0,keywordFlags=0,name="ManaRegen",type="BASE",value=2}},nil}
1062510621
c["Regenerate 2% of Energy Shield per second"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=2}},nil}
10622+
c["Regenerate 2% of Energy Shield per second if you've Consumed a Corpse Recently"]={{[1]={[1]={type="Condition",var="ConsumedCorpseRecently"},flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=2}},nil}
1062610623
c["Regenerate 2% of Energy Shield per second if you've Killed an Enemy Recently"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=2}},nil}
1062710624
c["Regenerate 2% of Energy Shield per second while on Low Life"]={{[1]={[1]={type="Condition",var="LowLife"},flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=2}},nil}
1062810625
c["Regenerate 2% of Life per Second for each Trap Triggered Recently, up to 10% per second"]={{[1]={[1]={limit=10,limitTotal=true,type="Multiplier",var="TrapTriggeredRecently"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=2}},nil}
@@ -10639,6 +10636,7 @@ c["Regenerate 2% of Life per second on Chilled Ground"]={{[1]={[1]={type="Condit
1063910636
c["Regenerate 2% of Life per second while affected by Vitality"]={{[1]={[1]={type="Condition",var="AffectedByVitality"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=2}},nil}
1064010637
c["Regenerate 2% of Life per second while stationary"]={{[1]={[1]={type="Condition",var="Stationary"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=2}},nil}
1064110638
c["Regenerate 2% of Life per second with at least 400 Strength"]={{[1]={[1]={stat="Str",threshold=400,type="StatThreshold"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=2}},nil}
10639+
c["Regenerate 2% of Mana per second if you've Consumed a corpse Recently"]={{[1]={[1]={type="Condition",var="ConsumedCorpseRecently"},flags=0,keywordFlags=0,name="ManaRegenPercent",type="BASE",value=2}},nil}
1064210640
c["Regenerate 2.5% of Energy Shield per Second while affected by Discipline"]={{[1]={[1]={type="Condition",var="AffectedByDiscipline"},flags=0,keywordFlags=0,name="EnergyShieldRegenPercent",type="BASE",value=2.5}},nil}
1064310641
c["Regenerate 2.5% of Life per Second if you've Detonated a Mine Recently"]={{[1]={[1]={type="Condition",var="DetonatedMinesRecently"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=2.5}},nil}
1064410642
c["Regenerate 20 Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegen",type="BASE",value=20}},nil}
@@ -12420,6 +12418,8 @@ c["You can have an Offering of each type"]={nil,"You can have an Offering of eac
1242012418
c["You can have an Offering of each type Offering Skills have 50% reduced Duration"]={nil,"You can have an Offering of each type Offering Skills have 50% reduced Duration "}
1242112419
c["You can have an additional Brand Attached to an Enemy"]={{[1]={flags=0,keywordFlags=0,name="BrandsAttachedLimit",type="BASE",value=1}},nil}
1242212420
c["You can have an additional Tincture active"]={{[1]={flags=0,keywordFlags=0,name="TinctureLimit",type="BASE",value=1}},nil}
12421+
c["You can have two Offerings of different types"]={nil,"You can have two Offerings of different types "}
12422+
c["You can have two Offerings of different types 35% chance to Avoid Elemental Ailments"]={nil,"You can have two Offerings of different types 35% chance to Avoid Elemental Ailments "}
1242312423
c["You can have two different Banners at the same time"]={{},nil}
1242412424
c["You can inflict Bleeding on an Enemy up to 8 times"]={{[1]={flags=0,keywordFlags=0,name="BleedStacksMax",type="OVERRIDE",value=8},[2]={flags=0,keywordFlags=0,name="Condition:HaveCrimsonDance",type="FLAG",value=true}},nil}
1242512425
c["You can inflict an additional Ignite on an Enemy"]={{[1]={flags=0,keywordFlags=0,name="IgniteCanStack",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="IgniteStacks",type="BASE",value=1}},nil}

src/Data/Uniques/Special/Generated.lua

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,24 @@ local getVeiledMods = function (veiledPool, baseType, specificType1, specificTyp
5151
return veiledMods
5252
end
5353

54+
local getVeiledModsByName = function (modNames)
55+
local veiledMods = { }
56+
for veiledModIndex, veiledMod in pairs(data.veiledMods) do
57+
local veiledName = parseVeiledModName(veiledModIndex)
58+
if isValueInArray(modNames, veiledName) or isValueInArray(modNames, veiledModIndex) then
59+
veiledName = "("..veiledMod.type..") "..veiledName
60+
local veiled = { veiledName = veiledName, veiledLines = { } }
61+
for line, value in ipairs(veiledMod) do
62+
veiled.veiledLines[line] = value
63+
end
64+
table.insert(veiledMods, veiled)
65+
end
66+
end
67+
table.sort(veiledMods, function (m1, m2) return m1.veiledName < m2.veiledName end )
68+
return veiledMods
69+
end
70+
71+
5472
local paradoxicaMods = getVeiledMods("base", "weapon", "one_hand_weapon")
5573
local paradoxica = {
5674
"Paradoxica",
@@ -155,7 +173,39 @@ end
155173

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

158-
local queensHungerMods = getVeiledMods("base", "body_armour", "int_armour")
176+
local queensHungerMods = getVeiledModsByName({
177+
-- "Chosen" Veiled Prefixes
178+
"JunMasterVeiledLocalIncreasedEnergyShieldAndLifeHigh",
179+
"JunMasterVeiledPhysicalDamageReductionRatingDuringSoulGainPrevention",
180+
"JunMasterVeiledPercentageLifeAndMana",
181+
"JunMasterVeiledBlockPercent",
182+
"JunMasterVeiledAvoidStunAndElementalStatusAilments",
183+
"JunMasterVeiledSpellBlockPercent____",
184+
-- "Catarina's" Veiled Prefixes
185+
"JunMasterVeiledOfferingEffect",
186+
"JunMasterVeiledLifeRegenerationRatePercentageIfCorpseConsumedRecently",
187+
"JunMasterVeiledManaRegenerationRatePercentageIfCorpseConsumedRecently",
188+
"JunMasterVeiledEnergyShieldRegenerationRatePercentageIfCorpseConsumedRecently",
189+
"JunMasterVeiledAllow2Offerings",
190+
"JunMasterVeiledOfferingDuration",
191+
-- "of the Order" Veiled Suffixes
192+
"JunMasterVeiledStrengthAndDexterity",
193+
"JunMasterVeiledDexterityAndIntelligence",
194+
"JunMasterVeiledStrengthAndIntelligence",
195+
"JunMasterVeiledAvoidElementalDamageChanceDuringSoulGainPrevention",
196+
"JunMasterVeiledEnergyShieldRegenerationRatePerMinuteIfRareOrUniqueEnemyNearby",
197+
"JunMasterVeiledLifeRegenerationPerEvasionDuringFocus",
198+
"JunMasterVeiledRestoreManaAndEnergyShieldOnFocus",
199+
"JunMasterVeiledFortifyEffectWhileFocused_",
200+
"JunMasterVeiledDamageRemovedFromManaBeforeLifeWhileFocused",
201+
"JunMasterVeiledFireAndChaosDamageResistance",
202+
"JunMasterVeiledLightningAndChaosDamageResistance",
203+
"JunMasterVeiledColdAndChaosDamageResistance",
204+
"JunMasterVeiledStrengthAndAvoidIgnite",
205+
"JunMasterVeiledDexterityAndAvoidFreeze",
206+
"JunMasterVeiledIntelligenceAndAvoidShock"
207+
})
208+
159209
local queensHunger = {
160210
"The Queen's Hunger",
161211
"Vaal Regalia",
@@ -179,7 +229,7 @@ table.insert(queensHunger, "(6-10)% increased maximum Life")
179229

180230
for index, mod in pairs(queensHungerMods) do
181231
for _, value in pairs(mod.veiledLines) do
182-
table.insert(queensHunger, "{variant:"..index.."}"..value.."")
232+
table.insert(queensHunger, "{variant:"..index.."}{crafted}"..value.."")
183233
end
184234
end
185235

@@ -905,12 +955,12 @@ for _, gem in pairs(data.gems) do
905955
end
906956

907957
local replicaDragonfangsFlight = {
908-
[[Replica Dragonfang's Flight
909-
Onyx Amulet
910-
Selected Variant: 2
911-
Has Alt Variant: true
912-
Selected Alt Variant: 3
913-
LevelReq: 56
958+
[[Replica Dragonfang's Flight
959+
Onyx Amulet
960+
Selected Variant: 2
961+
Has Alt Variant: true
962+
Selected Alt Variant: 3
963+
LevelReq: 56
914964
]]
915965
}
916966

0 commit comments

Comments
 (0)