shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
silicons
2021-03-06 18:11:40 -07:00
parent c6ba7bfe1f
commit cf7d428ac6
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_active_parry.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/living_block.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/living_blocking_parrying.dm
+4
View File
@@ -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.