martial arts bug fix (#68028)

This commit is contained in:
Comxy
2022-06-27 23:14:43 +02:00
committed by GitHub
parent 3d6800a997
commit 7e2c6dca6a
3 changed files with 11 additions and 11 deletions
+5 -5
View File
@@ -22,19 +22,19 @@
if(!can_use(A))
return FALSE
if(findtext(streak,SLAM_COMBO))
streak = ""
reset_streak(A)
return Slam(A,D)
if(findtext(streak,KICK_COMBO))
streak = ""
reset_streak(A)
return Kick(A,D)
if(findtext(streak,RESTRAIN_COMBO))
streak = ""
reset_streak(A)
return Restrain(A,D)
if(findtext(streak,PRESSURE_COMBO))
streak = ""
reset_streak(A)
return Pressure(A,D)
if(findtext(streak,CONSECUTIVE_COMBO))
streak = ""
reset_streak(A)
return Consecutive(A,D)
return FALSE
+3 -3
View File
@@ -16,17 +16,17 @@
if(findtext(streak,TORNADO_COMBO))
if(A == D)//helps using apotheosis
return FALSE
streak = ""
reset_streak(A)
Tornado(A,D)
return TRUE
if(findtext(streak,THROWBACK_COMBO))
if(A == D)//helps using apotheosis
return FALSE
streak = ""
reset_streak(A)
Throwback(A,D)
return TRUE
if(findtext(streak,PLASMA_COMBO))
streak = ""
reset_streak(A)
if(A == D && !nobomb)
Apotheosis(A,D)
else
+3 -3
View File
@@ -11,15 +11,15 @@
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/A, mob/living/D)
if(findtext(streak,STRONG_PUNCH_COMBO))
streak = ""
reset_streak(A)
strongPunch(A,D)
return TRUE
if(findtext(streak,LAUNCH_KICK_COMBO))
streak = ""
reset_streak(A)
launchKick(A,D)
return TRUE
if(findtext(streak,DROP_KICK_COMBO))
streak = ""
reset_streak(A)
dropKick(A,D)
return TRUE
return FALSE