Merge remote-tracking branch 'origin/Close_combat_weapon_types' into dev

Data/3_0/SkillStatMap.lua

@@ -511,7 +511,7 @@ return {
 	mod("ChaosMax", "BASE", nil),
 },
 ["support_slashing_damage_+%_final_from_distance"] = {
-	mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Melee), 0, { type = "MeleeProximity", ramp = {1,0} }) 
+	mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Melee), 0, { type = "MeleeProximity", ramp = {1,0} }, { type = "Condition", varList = { "UsingSword", "UsingAxe" }}, { type = "Condition", varList = { "UsingClaw", "UsingDagger", "UsingMace" }, neg=true} ),
 },
 -- Conversion
 ["physical_damage_%_to_add_as_lightning"] = {