refactor(items): usd OnAttackLanded as a pure damage entry point

ark120202 · Nov 21, 2018 · c70157c · c70157c
1 parent 661087d
commit c70157c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/game/scripts/vscripts/items/item_piercing_blade.lua b/game/scripts/vscripts/items/item_piercing_blade.lua
@@ -13,7 +13,7 @@ modifier_item_piercing_blade = {
 function modifier_item_piercing_blade:DeclareFunctions()
 	return {
 		MODIFIER_PROPERTY_PREATTACK_BONUS_DAMAGE,
-		MODIFIER_EVENT_ON_TAKEDAMAGE,
+		MODIFIER_EVENT_ON_ATTACK_LANDED,
 	}
 end
 
@@ -22,14 +22,13 @@ function modifier_item_piercing_blade:GetModifierPreAttack_BonusDamage()
 end
 
 if IsServer() then
-	function modifier_item_piercing_blade:OnTakeDamage(keys)
+	function modifier_item_piercing_blade:OnAttackLanded(keys)
 		local attacker = keys.attacker
 		if attacker ~= self:GetParent() then return end
-		if keys.damage_type ~= DAMAGE_TYPE_PHYSICAL or keys.inflictor then return end
-
 		local ability = self:GetAbility()
+
 		ApplyDamage({
-			victim = keys.unit,
+			victim = keys.target,
 			attacker = attacker,
 			damage = keys.original_damage * ability:GetSpecialValueFor("attack_damage_to_pure_pct") * 0.01,
 			damage_type = ability:GetAbilityDamageType(),

diff --git a/game/scripts/vscripts/items/item_soulcutter.lua b/game/scripts/vscripts/items/item_soulcutter.lua
@@ -20,7 +20,6 @@ function modifier_item_soulcutter:DeclareFunctions()
 	return {
 		MODIFIER_PROPERTY_PREATTACK_BONUS_DAMAGE,
 		MODIFIER_PROPERTY_ATTACKSPEED_BONUS_CONSTANT,
-		MODIFIER_EVENT_ON_TAKEDAMAGE,
 		MODIFIER_EVENT_ON_ATTACK_LANDED,
 	}
 end
@@ -34,30 +33,23 @@ function modifier_item_soulcutter:GetModifierAttackSpeedBonus_Constant()
 end
 
 if IsServer() then
-	function modifier_item_soulcutter:OnTakeDamage(keys)
+	function modifier_item_soulcutter:OnAttackLanded(keys)
 		local attacker = keys.attacker
 		if attacker ~= self:GetParent() then return end
-		if keys.damage_type ~= DAMAGE_TYPE_PHYSICAL or keys.inflictor then return end
-
 		local ability = self:GetAbility()
+		local target = keys.target
+
 		ApplyDamage({
-			victim = keys.unit,
+			victim = target,
 			attacker = attacker,
 			damage = keys.original_damage * ability:GetSpecialValueFor("attack_damage_to_pure_pct") * 0.01,
 			damage_type = ability:GetAbilityDamageType(),
 			damage_flags = DOTA_DAMAGE_FLAG_NO_SPELL_AMPLIFICATION,
 		})
-	end
 
-	function modifier_item_soulcutter:OnAttackLanded(keys)
-		local attacker = keys.attacker
-		if attacker ~= self:GetParent() then return end
-		local target = keys.target
 		if target:IsBoss() then return end
-		local ability = self:GetAbility()
 
 		ParticleManager:CreateParticle("particles/arena/items_fx/dark_flow_explosion.vpcf", PATTACH_ABSORIGIN_FOLLOW, target)
-
 		target:AddNewModifier(
 			target,
 			ability,