Merge remote-tracking branch 'Wires77/viridis_veil' into dev

src/Modules/CalcSetup.lua

@@ -661,6 +661,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 						key = "NormalItem"
 					end
 					env.itemModDB.multipliers[key] = (env.itemModDB.multipliers[key] or 0) + 1
+					env.itemModDB.conditions[key .. "In" .. slotName] = true
 					if item.corrupted then
 						env.itemModDB.multipliers.CorruptedItem = (env.itemModDB.multipliers.CorruptedItem or 0) + 1
 					else

src/Modules/ModParser.lua

@@ -87,6 +87,7 @@ local formList = {
 	["adds (%d+) to (%d+) (%a+) damage to hits"] = "DMGBOTH",
 	["adds (%d+)%-(%d+) (%a+) damage to hits"] = "DMGBOTH",
 	["^you have "] = "FLAG",
+	["^you are "] = "FLAG",
 	["^are "] = "FLAG",
 }
 
@@ -1046,6 +1047,7 @@ local modTagList = {
 	["with this weapon"] = { tagList = { { type = "Condition", var = "{Hand}Attack" }, { type = "SkillType", skillType = SkillType.Attack } } },
 	["if your other ring is a shaper item"] = { tag = { type = "Condition", var = "ShaperItemInRing {OtherSlotNum}" } },
 	["if your other ring is an elder item"] = { tag = { type = "Condition", var = "ElderItemInRing {OtherSlotNum}" } },
+	["if you have a (%a+) (%a+) in (%a+) slot"] = function(_, rarity, item, slot) return { tag = { type = "Condition", var = rarity:gsub("^%l", string.upper).."ItemIn"..item:gsub("^%l", string.upper).." "..(slot == "right" and 2 or slot == "left" and 1) } } end,
 	-- Equipment conditions
 	["while holding a shield"] = { tag = { type = "Condition", var = "UsingShield" } },
 	["while your off hand is empty"] = { tag = { type = "Condition", var = "OffHandIsEmpty" } },
@@ -2972,6 +2974,7 @@ local flagTypes = {
 	["chilled"] = "Condition:Chilled",
 	["blinded"] = "Condition:Blinded",
 	["no life regeneration"] = "NoLifeRegen",
+	["hexproof"] = { name = "AvoidCurse", value = 100, type = "BASE" },
 	["hindered, with 25% reduced movement speed"] = "Condition:Hindered",
 }
 
@@ -3523,9 +3526,9 @@ local function parseMod(line, order)
 		modName = { damageType.."Min", damageType.."Max" }
 		modFlag = modFlag or { keywordFlags = bor(KeywordFlag.Attack, KeywordFlag.Spell) }
 	elseif modForm == "FLAG" then
-		modName = modValue
-		modValue = true
-		modType = "FLAG"
+		modName = type(modValue) == "table" and modValue.name or modValue
+		modType = type(modValue) == "table" and modValue.type or "FLAG"
+		modValue = type(modValue) == "table" and modValue.value or true
 	end
 	if not modName then
 		return { }, line