attempt 2 at scaling Concoction as Unarmed (#659)

Author: Peechey

src/Data/SkillStatMap.lua

@@ -2379,10 +2379,6 @@ return {
 ["supported_minion_skill_gem_level_+"] = {
 	mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "SkillType", skillType = SkillType.Minion }),
 },
-["base_apply_unarmed_stats_to_offhand"] = {
-	flag("UnarmedOverride")
-},
-
 -- Display only
 ["quality_display_base_additional_arrows_is_gem"] = {
 	-- Display only

src/Data/Skills/other.lua

@@ -193,6 +193,7 @@ skills["BleedingConcoctionPlayer"] = {
 			baseFlags = {
 				attack = true,
 				projectile = true,
+				unarmed = true,
 			},
 			constantStats = {
 				{ "additional_base_critical_strike_chance", 500 },
@@ -1449,6 +1450,7 @@ skills["ExplosiveConcoctionPlayer"] = {
 				attack = true,
 				projectile = true,
 				duration = true,
+				unarmed = true,
 			},
 			constantStats = {
 				{ "additional_base_critical_strike_chance", 500 },
@@ -1586,6 +1588,7 @@ skills["FulminatingConcoctionPlayer"] = {
 				attack = true,
 				projectile = true,
 				duration = true,
+				unarmed = true,
 			},
 			constantStats = {
 				{ "additional_base_critical_strike_chance", 800 },
@@ -2416,6 +2419,7 @@ skills["PoisonousConcoctionPlayer"] = {
 			baseFlags = {
 				attack = true,
 				projectile = true,
+				unarmed = true,
 			},
 			constantStats = {
 				{ "additional_base_critical_strike_chance", 500 },
@@ -2822,6 +2826,7 @@ skills["ShatteringConcoctionPlayer"] = {
 				attack = true,
 				projectile = true,
 				duration = true,
+				unarmed = true,
 			},
 			constantStats = {
 				{ "additional_base_critical_strike_chance", 1100 },

src/Export/Skills/other.txt

@@ -18,7 +18,7 @@ local skills, mod, flag, skill = ...
 #skill BleedingConcoctionPlayer
 #startSets
 #set BleedingConcoctionPlayer
-#flags attack projectile
+#flags attack projectile unarmed
 statMap = {
 	["flask_throw_bleed_effect_+%_final"] = {
 		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Bleed),
@@ -97,7 +97,7 @@ statMap = {
 #skill ExplosiveConcoctionPlayer
 #startSets
 #set ExplosiveConcoctionPlayer
-#flags attack projectile duration
+#flags attack projectile duration unarmed
 statMap = {
 	["flask_throw_fire_exposure_ms"] = {
 		mod("FireExposureChance", "BASE", nil),
@@ -111,7 +111,7 @@ statMap = {
 #skill FulminatingConcoctionPlayer
 #startSets
 #set FulminatingConcoctionPlayer
-#flags attack projectile duration
+#flags attack projectile duration unarmed
 statMap = {
 	["flask_throw_lightning_exposure_ms"] = {
 		mod("LightningExposureChance", "BASE", nil),
@@ -173,7 +173,7 @@ statMap = {
 #skill PoisonousConcoctionPlayer
 #startSets
 #set PoisonousConcoctionPlayer
-#flags attack projectile
+#flags attack projectile unarmed
 statMap = {
 	["flask_throw_poison_effect_+%_final"] = {
 		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Poison),
@@ -210,7 +210,7 @@ statMap = {
 #skill ShatteringConcoctionPlayer
 #startSets
 #set ShatteringConcoctionPlayer
-#flags attack projectile duration
+#flags attack projectile duration unarmed
 statMap = {
 	["flask_throw_cold_exposure_ms"] = {
 		mod("ColdExposureChance", "BASE", nil),

src/Modules/CalcActiveSkill.lua

@@ -347,7 +347,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 		if weapon1Flags then
 			if skillFlags.attack or skillFlags.dotFromAttack then
 				-- Concoction skills ignore weapon flags
-				activeSkill.weapon1Flags = (skillModList:Flag(nil, "UnarmedOverride") and ModFlag.Unarmed) or weapon1Flags
+				activeSkill.weapon1Flags = (skillFlags.unarmed and ModFlag.Unarmed) or weapon1Flags
 				skillFlags.weapon1Attack = true
 				if weapon1Info.melee and skillFlags.melee then
 					skillFlags.projectile = nil
@@ -368,7 +368,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 					skillFlags.disable = true
 					activeSkill.disableReason = activeSkill.disableReason or "Weapon Types Need to be Different"
 				elseif skillFlags.attack or skillFlags.dotFromAttack then
-					activeSkill.weapon2Flags = (skillModList:Flag(nil, "UnarmedOverride") and ModFlag.Unarmed) or weapon2Flags
+					activeSkill.weapon2Flags = (skillFlags.unarmed and ModFlag.Unarmed) or weapon2Flags
 					skillFlags.weapon2Attack = true
 				end
 			elseif (skillTypes[SkillType.DualWieldOnly] or weapon2Info) and not activeSkill.summonSkill then

src/Modules/CalcOffence.lua

@@ -1957,7 +1957,7 @@ function calcs.offence(env, actor, activeSkill)
 			activeSkill.weapon1Cfg.skillStats = output.MainHand
 			local source = copyTable(actor.weaponData1)
 			-- Unarmed override for Concoction skills
-			if skillModList:Flag(nil, "UnarmedOverride") then
+			if skillFlags.unarmed then
 				source = copyTable(data.unarmedWeaponData[env.classId])
 			end
 			if critOverride and source.type and source.type ~= "None" then
@@ -1977,6 +1977,10 @@ function calcs.offence(env, actor, activeSkill)
 			end
 			activeSkill.weapon2Cfg.skillStats = output.OffHand
 			local source = copyTable(actor.weaponData2)
+			-- Unarmed override for Concoction skills
+			if skillFlags.unarmed then
+				source = copyTable(data.unarmedWeaponData[env.classId])
+			end
 			if critOverride and source.type and source.type ~= "None" then
 				source.CritChance = critOverride
 			end