Merge pull request #3 from deathbeam/deep-cssds

Fix Deep Cuts, Deadly Poison and ailment source damage

Author: LocalIdentity

src/Data/Skills/sup_dex.lua

@@ -559,7 +559,7 @@ skills["SupportDeadlyPoisonPlayer"] = {
 			statDescriptionScope = "gem_stat_descriptions",
 			statMap = {
 				["support_deadly_poison_hit_damage_+%_final"] = {
-					mod("Damage", "MORE", nil, ModFlag.Hit, KeywordFlag.Poison),
+					mod("Damage", "MORE", nil, ModFlag.Hit),
 				},
 				["support_deadly_poison_poison_effect_+%_final"] = {
 					mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Poison),
@@ -1936,4 +1936,4 @@ skills["SupportWindowOfOpportunityPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_str.lua

@@ -450,7 +450,7 @@ skills["SupportDeepCutsPlayer"] = {
 					mod("Damage", "MORE", nil, ModFlag.Hit),
 				},
 				["support_deep_cuts_bleeding_effect_+%_final"] = {
-					mod("BleedMagnitude", "MORE", nil),
+					mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Bleed),
 				},
 			},
 			baseFlags = {
@@ -2090,4 +2090,4 @@ skills["SupportVitalityPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Export/Skills/sup_dex.txt

@@ -149,7 +149,7 @@ statMap = {
 #set SupportDeadlyPoisonPlayer
 statMap = {
 	["support_deadly_poison_hit_damage_+%_final"] = {
-		mod("Damage", "MORE", nil, ModFlag.Hit, KeywordFlag.Poison),
+		mod("Damage", "MORE", nil, ModFlag.Hit),
 	},
 	["support_deadly_poison_poison_effect_+%_final"] = {
 		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Poison),
@@ -492,4 +492,4 @@ statMap = {
 	},
 },
 #mods
-#skillEnd
+#skillEnd

src/Export/Skills/sup_str.txt

@@ -127,7 +127,7 @@ statMap = {
 		mod("Damage", "MORE", nil, ModFlag.Hit),
 	},
 	["support_deep_cuts_bleeding_effect_+%_final"] = {
-		mod("BleedMagnitude", "MORE", nil),
+		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Bleed),
 	},
 },
 #mods
@@ -582,4 +582,4 @@ statMap = {
 	},
 },
 #mods
-#skillEnd
+#skillEnd

src/Modules/CalcOffence.lua

@@ -3908,19 +3908,21 @@ function calcs.offence(env, actor, activeSkill)
 		-- Calculates damage to be used in damaging ailment calculations
 		local function calcAilmentSourceDamage(ailment, defaultDamageTypes)
 			local canCrit = not skillModList:Flag(cfg, "AilmentsAreNeverFromCrit")
-			local hitMin, hitMax = 0, 0, 0
-			local critMin, critMax = 0, 0, 0
+			local hitMin, hitMax = 0, 0
+			local critMin, critMax = 0, 0
 			for _, damageType in ipairs(dmgTypeList) do
 				if canDoAilment(ailment, damageType, defaultDamageTypes) then
 					local override = skillModList:Override(cfg, ailment .. damageType .. "HitDamage")
-					hitMin = hitMin + (override or output[damageType.."StoredHitMin"])
-					hitMax = hitMax + (override or output[damageType.."StoredHitMax"])
-					output[ailment .. damageType .. "Min"] = (override or output[damageType.."StoredHitMin"])
-					output[ailment .. damageType .. "Max"] = (override or output[damageType.."StoredHitMin"])
+					local ailmentHitMin = override or output[damageType.."StoredHitMin"] or 0
+					local ailmentHitMax = override or output[damageType.."StoredHitMax"] or 0
+					hitMin = hitMin + ailmentHitMin
+					hitMax = hitMax + ailmentHitMax
+					output[ailment .. damageType .. "Min"] = ailmentHitMin
+					output[ailment .. damageType .. "Max"] = ailmentHitMax
 					if canCrit then
-						local override = skillModList:Override(cfg, ailment .. damageType .. "CritDamage")
-						critMin = critMin + (override or output[damageType.."StoredCritMin"])
-						critMax = critMax + (override or output[damageType.."StoredCritMax"])
+						override = skillModList:Override(cfg, ailment .. damageType .. "CritDamage")
+						critMin = critMin + (override or output[damageType.."StoredCritMin"] or 0)
+						critMax = critMax + (override or output[damageType.."StoredCritMax"] or 0)
 					end
 				end
 			end