diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 32d961d77d..8aac184cee 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -9,6 +9,9 @@ #define TEXT_EAST "[EAST]" #define TEXT_WEST "[WEST]" +/// yeah yeah i'm a lazy asshole who can't debug yeah yeah +#define DEBUG_LINE message_admins("DEBUG: [__FILE__] [__LINE__] executing!") + /// world.icon_size #define PIXELS 32 diff --git a/code/game/objects/items/electrostaff.dm b/code/game/objects/items/electrostaff.dm index 9bb12d18b8..70a25bc9f9 100644 --- a/code/game/objects/items/electrostaff.dm +++ b/code/game/objects/items/electrostaff.dm @@ -49,7 +49,7 @@ parry_time_active = 7 parry_time_spindown = 0 parry_time_spindown_visual_override = 1 - parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING // no attacking while parrying + parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // no attacking while parrying parry_time_perfect = 0 parry_time_perfect_leeway = 0.5 parry_efficiency_perfect = 85 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 6278eb5f36..56b549bae7 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -81,7 +81,8 @@ parry_efficiency_perfect = 100 parry_failed_stagger_duration = 3 SECONDS parry_failed_clickcd_duration = 1 SECONDS - parry_flags = NONE + parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK + parry_automatic_enabled = TRUE /obj/item/melee/sabre/Initialize() . = ..() @@ -194,6 +195,7 @@ parry_efficiency_perfect = 100 parry_stamina_cost = 5 parry_failed_stagger_duration = 2 SECONDS + parry_automatic_enabled = TRUE parry_cooldown = 0 /obj/item/melee/rapier/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text) diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index a673b81203..70e41c0c6a 100644 --- a/code/modules/mob/living/living_active_parry.dm +++ b/code/modules/mob/living/living_active_parry.dm @@ -308,7 +308,7 @@ if(efficiency >= data.parry_efficiency_to_counterattack && pacifist_counter_check && !return_list[BLOCK_RETURN_FORCE_NO_PARRY_COUNTERATTACK] && (!(attacker in successful_parry_counterattacks) && !data.parry_allow_repeated_counterattacks)) effect_text = run_parry_countereffects(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, data) if(data.parry_flags & PARRY_DEFAULT_HANDLE_FEEDBACK) - handle_parry_feedback(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, effect_text) + handle_parry_feedback(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, effect_text, data) /** * Gets the stage of our parry sequence we're currently in. diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index d69b40be16..1ffdc1b9e4 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(block_parry_data) /// Can this data automatically parry? This is off by default because this is something that requires thought to balance. var/parry_automatic_enabled = FALSE /// Hard autoparry cooldown - var/autoparry_cooldown_absolute = 3 SECONDS + var/autoparry_cooldown_absolute = 7.5 SECONDS /// Autoparry : Simulate a parry sequence starting at a certain tick, or simply simulate a single attack parry? var/autoparry_sequence_simulation = FALSE // Single attack simulation: