From cf7d428ac6b8f1324dd0ad3962987cbd38d2488e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 6 Mar 2021 18:11:40 -0700 Subject: [PATCH] changes --- code/modules/mob/living/living_active_parry.dm | 2 +- code/modules/mob/living/living_block.dm | 2 +- code/modules/mob/living/living_blocking_parrying.dm | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index a000bbab23..c15b56afe8 100644 --- a/code/modules/mob/living/living_active_parry.dm +++ b/code/modules/mob/living/living_active_parry.dm @@ -234,7 +234,7 @@ var/stage = get_parry_stage() if(stage != PARRY_ACTIVE) // If they're not currently parrying, attempt auto parry - if((stage == NOT_PARRYING) && allow_auto) + if((stage == NOT_PARRYING) && allow_auto && !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) return attempt_auto_parry() return BLOCK_NONE var/datum/block_parry_data/data = get_parry_data() diff --git a/code/modules/mob/living/living_block.dm b/code/modules/mob/living/living_block.dm index 10427c20ec..99e74916da 100644 --- a/code/modules/mob/living/living_block.dm +++ b/code/modules/mob/living/living_block.dm @@ -37,7 +37,7 @@ var/results if(I == active_block_item) results = I.active_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list, attack_direction) - else if(I.can_passive_block()) + else if(I.can_passive_block() && !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) results = I.passive_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list, attack_direction) else results = I.run_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list) diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 0a0ef30f33..1fd2ad2615 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -99,6 +99,10 @@ GLOBAL_LIST_EMPTY(block_parry_data) var/block_automatic_enabled = TRUE /// Directions that you can autoblock in var/block_automatic_directions = BLOCK_DIR_NORTH | BLOCK_DIR_NORTHEAST | BLOCK_DIR_NORTHWEST + /// Effectiveness multiplier for automated block + var/block_automatic_mitigation_multiplier = 0.33 + /// Stamina cost multiplier for automated block + var/block_automatic_stamina_multiplier = 1 /////////// PARRYING //////////// /// Prioriry for [mob/do_run_block()] while we're being used to parry.