From efa4139aff51c0b0f27936a3bc0ff5e43ed823bc Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 20 Mar 2021 14:17:13 -0700 Subject: [PATCH] math fix --- code/game/objects/items/dualsaber.dm | 6 +++--- code/modules/mob/living/living_active_block.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 01e68a6516..5ae79b3c3a 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -41,7 +41,7 @@ /datum/block_parry_data/dual_esword // please run at the man going apeshit with his funny doublesword can_block_directions = BLOCK_DIR_NORTH | BLOCK_DIR_NORTHEAST | BLOCK_DIR_NORTHWEST | BLOCK_DIR_WEST | BLOCK_DIR_EAST - block_damage_absorption = 2 + block_damage_absorption = 5 block_damage_multiplier = 0.15 block_damage_multiplier_override = list( ATTACK_TYPE_MELEE = 0.25 @@ -59,7 +59,7 @@ ) parry_time_windup = 0 - parry_time_active = 8 + parry_time_active = 12 parry_time_spindown = 0 // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing. parry_time_windup_visual_override = 1 @@ -82,7 +82,7 @@ /obj/item/dualsaber/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time) . = ..() if(parry_efficiency >= 90) // perfect parry - block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_RETURN_TO_SENDER + block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT . |= BLOCK_SHOULD_REDIRECT /obj/item/dualsaber/Initialize() diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm index 719fa4bc53..e6f9a569a3 100644 --- a/code/modules/mob/living/living_active_block.dm +++ b/code/modules/mob/living/living_active_block.dm @@ -149,7 +149,7 @@ if(isnull(absorption)) absorption = data.block_damage_absorption if(isnull(efficiency)) - efficiency = data.block_damage_multiplier * (passive? data.block_automatic_mitigation_multiplier : 1) + efficiency = data.block_damage_multiplier * (passive? (1 / data.block_automatic_mitigation_multiplier) : 1) if(isnull(limit)) limit = data.block_damage_limit // now we calculate damage to reduce.