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

yanderedev

Browse Source
This commit is contained in:
kevinz000
2020-05-29 18:47:58 -07:00
parent 1f337ac65e
commit 809de27ffe
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_active_parry.dm
+12 -8
View File
@@ -141,14 +141,18 @@
var/windup_end = data.parry_time_windup var/windup_end = data.parry_time_windup
var/active_end = windup_end + data.parry_time_active var/active_end = windup_end + data.parry_time_active
var/spindown_end = active_end + data.parry_time_spindown var/spindown_end = active_end + data.parry_time_spindown
switch(get_parry_time()) var/current_time = get_parry_time()
if(0 to windup_end) // Not a switch statement because byond switch statements don't support floats at time of writing with "to" keyword.
return PARRY_WINDUP if(current_time < 0)
if(windup_end to active_end) return NOT_PARRYING
return PARRY_ACTIVE else if(current_time < windup_end)
if(active_end to spindown_end) return PARRY_WINDUP
return PARRY_SPINDOWN else if(current_time <= active_end) // this uses <= on purpose, give a slight bit of advantage because time is rounded to world.tick_lag
return NOT_PARRYING return PARRY_ACTIVE
else if(current_time <= spindown_end)
return PARRY_SPINDOWN
else
return NOT_PARRYING
/** /**
* Gets the percentage efficiency of our parry. * Gets the percentage efficiency of our parry.