Add new 3.28 Uniques (#9618)

* Add new 3.28 Uniques

Adds the new uniques and support for some of their mods
Updates the pre-release uniques with their mod rolls

* Desecrated Chalice and Desecrated Chalice flask mods

Adds a new config option to only show if a condition is true already
Moves the flask conditions for HaveAmethystFlask or other base types to CalcSetup as the previous handling in CalcPerform only enabled the condition if the flask was active instead of in the item slot which is what is meant to be for

* Flame of Hope

* Screams of the Desiccated

Adds support for all the shrine mods and also the greater freezing / shocking / skeletal shrine buffs

* Fix while affected by no flasks when using instant flasks

The Screams of the Desiccated belt only grants you the shrine effects when you do not have any active flask effects
Mana and Life flasks with instant effects do not ever count as being under the effect of a flask
Same with having a utility flask but having the Bloodline for utility flasks are disabled
Added support flasks are instant while on low life and made a helper function in CalcPerform as there are 2 different spots where instPerc are used
Tested Vaal Pact and the mana flask mod for effect is instant at end of duration and those both disable the shrine
The life flask mod for additional recovery over x seconds does not count as being under a flask effect however

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: LocalIdentity

src/Classes/ConfigTab.lua

@@ -330,6 +330,18 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
 					return out
 				end))
 			end
+			if varData.ifCondTrue then
+				t_insert(shownFuncs, listOrSingleIfOption(varData.ifCondTrue, function(ifOption)
+					return self.build.calcsTab.mainEnv.player.modDB.conditions[ifOption]
+				end))
+				t_insert(tooltipFuncs, listOrSingleIfTooltip(varData.ifCondTrue, function(ifOption)
+					if not launch.devModeAlt then
+						return
+					end
+					local out = "Condition state: " .. ifOption .. "=" .. tostring(self.build.calcsTab.mainEnv.player.modDB.conditions[ifOption])
+					return out
+				end))
+			end
 			if varData.ifMult then
 				t_insert(shownFuncs, listOrSingleIfOption(varData.ifMult, function(ifOption)
 					if implyCond(varData) then

src/Classes/Item.lua

@@ -1568,6 +1568,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		if self.base.flask.life or self.base.flask.mana then
 			-- Recovery flask
 			flaskData.instantPerc = calcLocal(modList, "FlaskInstantRecovery", "BASE", 0)
+			flaskData.instantLowLifePerc = calcLocal(modList, "FlaskLowLifeInstantRecovery", "BASE", 0)
 			local recoveryMod = 1 + calcLocal(modList, "FlaskRecovery", "INC", 0) / 100
 			local rateMod = 1 + calcLocal(modList, "FlaskRecoveryRate", "INC", 0) / 100
 			flaskData.duration = round(self.base.flask.duration * (1 + durationInc / 100) / rateMod * durationMore, 1)

src/Data/ModCache.lua

@@ -6171,12 +6171,6 @@ skills["HolyStrike"] = {
 		["Staff"] = true,
 		["Two Handed Mace"] = true,
 	},
-	statMap = {
-		["skill_physical_damage_%_to_convert_to_lightning"] = {
-			mod("SkillPhysicalDamageConvertToLightning", "BASE", nil),
-			mod("MinionModifier", "LIST", { mod = mod("SkillPhysicalDamageConvertToLightning", "BASE", nil, 0, 0) })
-		},
-	},
 	statDescriptionScope = "minion_attack_skill_stat_descriptions",
 	castTime = 1,
 	minionList = {
@@ -6185,6 +6179,12 @@ skills["HolyStrike"] = {
 	minionUses = {
 		["Weapon 1"] = true,
 	},
+	statMap = {
+		["skill_physical_damage_%_to_convert_to_lightning"] = {
+			mod("SkillPhysicalDamageConvertToLightning", "BASE", nil),
+			mod("MinionModifier", "LIST", { mod = mod("SkillPhysicalDamageConvertToLightning", "BASE", nil, 0, 0) })
+		},
+	},
 	baseFlags = {
 		attack = true,
 		minion = true,

src/Data/Skills/act_str.lua

@@ -704,6 +704,38 @@ skills["CeaselessFleshUnique"] = {
 		[25] = { 80, levelRequirement = 72, statInterpolation = { 1, }, },
 	},
 }
+skills["ResentmentUniqueSkill"] = {
+	name = "Cinders",
+	hidden = true,
+	color = 2,
+	description = "While active, your bow attacks inflict Cinderflame. Cinderflame deals fire damage over time, and can stack up to ten times. This skill cannot be cast by Totems.",
+	skillTypes = { [SkillType.Spell] = true, [SkillType.Buff] = true, [SkillType.Duration] = true, [SkillType.Triggerable] = true, [SkillType.Triggered] = true, [SkillType.Instant] = true, [SkillType.Cooldown] = true, [SkillType.DamageOverTime] = true, [SkillType.Fire] = true, [SkillType.CausesBurning] = true, },
+	statDescriptionScope = "skill_stat_descriptions",
+	castTime = 0,
+	fromItem = true,
+	statMap = {
+		["base_fire_damage_to_deal_per_minute"] = {
+			skill("FireDot", nil, { type = "Multiplier", var = "CinderflameStacks", limit = 10 }),
+			div = 60,
+		},
+	},
+	baseFlags = {
+		spell = true,
+		duration = true,
+	},
+	constantStats = {
+		{ "base_skill_effect_duration", 3000 },
+		{ "base_fire_damage_to_deal_per_minute", 20000 },
+	},
+	stats = {
+		"cast_on_gain_skill",
+		"spell_uncastable_if_triggerable",
+		"no_cost",
+	},
+	levels = {
+		[20] = { cooldown = 1, levelRequirement = 0, storedUses = 1, },
+	},
+}
 skills["ColdAegis"] = {
 	name = "Cold Aegis",
 	hidden = true,

src/Data/Skills/other.lua

@@ -5,84 +5,176 @@
 data.uniques.new = {
 -- New
 [[
-Screams of the desiccated
-Leather Belt
-LevelReq: 56
-Implicits: 1
-{tags:life}+(25-40) to maximum Life
-You have Diamond Shrine Buff while affected by no Flasks
-You have Resistance Shrine Buff while affected by no Flasks
-+30 to Intelligence
-+28% to Chaos Resistance
-]],
-[[
-Skysunder
+Fleshrender
 Exquisite Blade
 League: Mirage
 Source: Obtained by using a Coin of Restoration on unique{Fleshrender}
 Implicits: 1
-+50% to global critical strike chance
-(130-160)% increased Physical Damage
++50% to Global Critical Strike Multiplier
+(180-240)% increased Physical Damage
 +(20-40)% to Damage over Time Multiplier
 (20-40)% increased Critical Strike Chance
-100% of Physical Damage Converted to Fire Damage
-Ignites you cause are reflected back to you
-50% less Duration of Ignites you inflict
-Ignites you inflict with this weapon spread to other Enemies within 2.8 metres
-Unaffected by Ignite
-]],
-[[
-The Sands of Time
-Tyrant's Sekhem
-Requires Level 58, 99 Str, 99 Int
-Implicits: 1
-26% increased Elemental Damage
-Trigger level 20 Suspend in Time on Casting a Spell
-60% increased Spell Damage
-65% increased Mana Regeneration Rate
-10% increased Cooldown Recovery Rate
-10% increased Cast Speed for each different Non-Instant Spell you've Cast Recently
+Cannot Poison Enemies with at least 12 Poisons on them
+Inflict (2-3) additional Poisons on the same Target
+when you inflict Poison with this weapon
+Wither on Hit with this weapon against Enemies with at least 12 Poisons on them
 ]],
 [[
 Khatal's Geyser
 Lapis Amulet
+League: Mirage
+Source: Obtained by using a Coin of Restoration on unique{Khatal's Weeping}
 LevelReq: 56
 Implicits: 1
 {tags:jewellery_attribute}+(20-30) to Intelligence
 Can't use Life Flasks
-+65 to maximum Mana
-Increases and Reductions to Effect of Flasks applied to you also applies to Effect of Arcane Surge on you at 210% of their value
++(55-70) to maximum Mana
+Increases and Reductions to Effect of Flasks applied to you also applies to Effect of Arcane Surge on you at (200-250)% of their value
 You have Arcane Surge during Effect of any Mana Flask
 Mana Flask Effects are not removed when Unreserved Mana is Filled
 Mana Flask Effects do not Queue
 ]],
 [[
+Khatal's Weeping
+Lapis Amulet
+League: Mirage
+Source: Drops from Mirage encounter
+LevelReq: 56
+Implicits: 1
+{tags:jewellery_attribute}+(20-30) to Intelligence
+{tags:life}+(80-100) to maximum Life
+Can't use Mana Flasks
+On non-channelling Attack, set a Life Flask with greater than 50% of maximum Charges remaining to 50%
+For each Charge removed this way, that Attack gains +2% to Damage over time Multiplier
+{tags:life}While on Low Life, Life Flasks gain (3-6) Charges every 3 seconds
+]],
+[[
 Replica Gifts from Above
+League: Heist
+Source: Steal from a unique{Curio Display} during a Grand Heist
 Diamond Ring
 Requires Level 28
 Implicits: 1
 {tags:critical}(20-30)% increased Global Critical Strike Chance
 Trigger level 10 Consecrate when you deal a Critical Strike
-31% increased Global Critical Strike Chance
-14% increased Light Radius
-47% increased Rarity of Items Dropped by Enemies killed with a Critical Strike
+{tags:critical}(30-35)% increased Global Critical Strike Chance
+(10-15)% increased Light Radius
+{tags:critical}(40-50)% increased Rarity of Items Dropped by Enemies killed with a Critical Strike
 Inflict Hallowing Flame on Hit while on Consecrated Ground
 ]],
 [[
-Khatal's Weeping
-Lapis Amulet
+Saresh's Darkness
+Chain Belt
+League: Mirage
+Source: Drops from unique{Saresh, of the Weeping Black}
+LevelReq: 24
+Implicits: 1
+{tags:jewellery_defense}+(9-20) to maximum Energy Shield
+{tags:jewellery_resistance}+(23-37)% to Chaos Resistance
+(10-25)% increased Poison Duration
+Enemies Poisoned by you cannot deal Critical Strikes
+Grants Level 20 Caustic Retribution
+]],
+[[
+Screams of the Desiccated
+Leather Belt
+League: Mirage
+Source: Drops from unique{Saresh, of the Weeping Black}
+Has Alt Variant: true
+Selected Variant: 1
+Selected Alt Variant: 1
+Variant: Acceleration
+Variant: Brutal
+Variant: Diamond
+Variant: Echoing
+Variant: Gloom
+Variant: Greater Freezing
+Variant: Greater Shocking
+Variant: Greater Skeletal
+Variant: Impenetrable
+Variant: Massive
+Variant: Replenishing
+Variant: Resistance
+Variant: Resonating
 LevelReq: 56
 Implicits: 1
-{tags:jewellery_attribute}+(20-30) to Intelligence
-+89 to maximum Life
-Can't use Mana Flasks
-On non-channelling Attack, set a Life Flask with greater than 50% of maximum Charges remaining to 50%
-For each Charge removed this way, that Attack gains +2% to Damage over time Multiplier
-While on Low Life, Life Flasks gain 4 Charges every 3 seconds
+{tags:life}+(25-40) to maximum Life
+{tags:jewellery_attribute}+(23-32) to Intelligence
+{tags:jewellery_resistance}+(23-37)% to Chaos Resistance
+{variant:1}You have Acceleration Shrine Buff while affected by no Flasks
+{variant:2}You have Brutal Shrine Buff while affected by no Flasks
+{variant:3}You have Diamond Shrine Buff while affected by no Flasks
+{variant:4}You have Echoing Shrine Buff while affected by no Flasks
+{variant:5}You have Gloom Shrine Buff while affected by no Flasks
+{variant:6}You have Greater Freezing Shrine Buff while affected by no Flasks
+{variant:6}(15—20)% increased Effect of Shrine Buffs on you
+{variant:7}You have Greater Shocking Shrine Buff while affected by no Flasks
+{variant:7}(15—20)% increased Effect of Shrine Buffs on you
+{variant:8}You have Greater Skeletal Shrine Buff while affected by no Flasks
+{variant:8}(15—20)% increased Effect of Shrine Buffs on you
+{variant:9}You have Impenetrable Shrine Buff while affected by no Flasks
+{variant:10}You have Massive Shrine Buff while affected by no Flasks
+{variant:11}You have Replenishing Shrine Buff while affected by no Flasks
+{variant:12}You have Resistance Shrine Buff while affected by no Flasks
+{variant:13}You have Resonating Shrine Buff while affected by no Flasks
+]],
+[[
+Skysunder
+Exquisite Blade
+League: Mirage
+Source: Obtained by using a Coin of Restoration on unique{Fleshrender}
+Implicits: 1
++50% to Global Critical Strike Multiplier
+(130-160)% increased Physical Damage
++(20-40)% to Damage over Time Multiplier
+(20-40)% increased Critical Strike Chance
+100% of Physical Damage Converted to Fire Damage
+Ignites you cause are reflected back to you
+50% less Duration of Ignites you inflict
+Ignites you inflict with this weapon spread to other Enemies within 2.8 metres
+Unaffected by Ignite
+]],
+[[
+Solerai's Radiance
+Chain Belt
+League: Mirage
+Source: Obtained by using a Coin of Restoration on unique{Saresh's Darkness}
+LevelReq: 24
+Implicits: 1
+{tags:jewellery_defense}+(9-20) to maximum Energy Shield
+{tags:jewellery_resistance}+(35-50)% to Fire Resistance
+(10-25)% increased Ignite Duration on Enemies
+Enemies Blinded by you cannot inflict Damaging Ailments
+Grants Level 20 Blazing Glare
+]],
+[[
+The Bandit Lord's Band
+Gold Ring
+League: Settlers
+Source: Drops from unique{Sasan, the Bandit Lord}
+Requires Level 44
+Implicits: 1
+(6-15)% increased Rarity of Items found
+(25-35)% increased Quantity of Gold Dropped by Slain Enemies
+]],
+[[
+The Bane of Hope
+Maraketh Bow
+League: Mirage
+Source: Drops from Mirage encounter
+Requires Level 71
+Implicits: 1
+10% increased Movement Speed
+(90-130)% increased Physical Damage
++(28-35)% to Physical Damage over Time Multiplier
+Adds (20-30) to (40-50) Physical Damage
+(15-30)% chance to Impale Enemies on Hit with Attacks
+Trigger Level 20 Tears of Rot when Equipped
 ]],
 [[
 The Broken Elegy
 Foul Staff
+League: Mirage
 Source: Drops from unique{Saresh, of the Weeping Black}
 LevelReq: 64
 Implicits: 1
@@ -92,5 +184,61 @@ Minions deal (113-157)% increased Damage
 (17-31)% increased Minion Duration
 When a nearby Minion dies, gain Rotten Bulwark equal to (7-9)% of its maximum Life
 Minions gain (59-83)% of Physical Damage as Extra Chaos Damage
+]],
+[[
+The Desecrated Chalice
+Coronal Maul
+League: Mirage
+Source: Drops from Mirage encounter
+Requires Level 69
+Implicits: 1
+20% increased Area of Effect
+(120-160)% increased Physical Damage
+(20-30)% increased Critical Strike Chance
+(0.4-0.5)% of Chaos Damage Leeched as Life
+Gain a Flask Charge when you deal a Critical Strike
+Gain (40-75)% of Physical Damage as Extra Chaos Damage if you've used an Amethyst Flask Recently
+]],
+[[
+The Flame of Hope
+Maraketh Bow
+League: Mirage
+Source: Obtained by using a Coin of Restoration on unique{The Bane of Hope}
+Requires Level 71
+Implicits: 1
+10% increased Movement Speed
+(90-110)% increased Fire Damage
+Adds (180-230) to (310-360) Fire Damage
+(14-18)% increased Attack Speed
+Inflict Fire Exposure on Hit against Enemies with 5 Cinderflame, applying -25% to Fire Resistance
+Trigger Level 20 Cinders when Equipped
+]],
+[[
+The Sacred Chalice
+Coronal Maul
+League: Mirage
+Source: Obtained by using a Coin of Restoration on unique{The Desecrated Chalice}
+Requires Level 69
+Implicits: 1
+20% increased Area of Effect
+(120-160)% increased Physical Damage
+(20-30)% increased Critical Strike Chance
+Gain a Flask Charge when you deal a Critical Strike
+Gain (20-40)% of Physical Damage as Extra Cold Damage if you've used a Sapphire Flask Recently
+Gain (20-40)% of Physical Damage as Extra Lightning Damage if you've used a Topaz Flask Recently
+]],
+[[
+The Sands of Time
+Tyrant's Sekhem
+League: Mirage
+Source: Drops from unique{Saresh, of the Weeping Black}
+Requires Level 58, 99 Str, 99 Int
+Implicits: 1
+26% increased Elemental Damage
+Trigger level 20 Suspend in Time on Casting a Spell
+(60-80)% increased Spell Damage
+(60-80)% increased Mana Regeneration Rate
+(10-15)% increased Cooldown Recovery Rate
+10% increased Cast Speed for each different Non-Instant Spell you've Cast Recently
 ]]
 }

src/Data/Uniques/Special/New.lua

@@ -246,6 +246,17 @@ local skills, mod, flag, skill = ...
 	},
 #mods
 
+#skill ResentmentUniqueSkill
+#flags spell duration
+	fromItem = true,
+	statMap = {
+		["base_fire_damage_to_deal_per_minute"] = {
+			skill("FireDot", nil, { type = "Multiplier", var = "CinderflameStacks", limit = 10 }),
+			div = 60,
+		},
+	},
+#mods
+
 #skill ColdAegis
 #flags spell
 	fromItem = true,