More resist refactoring

Reorganizes resist a bit more to allow for cleaner inheritance.
This commit is contained in:
mwerezak
2015-05-01 15:13:07 -04:00
parent 8b32d2356e
commit 3509178aa8
3 changed files with 16 additions and 10 deletions
+1 -5
View File
@@ -1,9 +1,5 @@
/mob/living/carbon/resist()
//need to allow !canmove, or otherwise neck grabs can't be resisted
//so just check weakened instead.
if(stat || weakened || next_move > world.time)
return
/mob/living/carbon/process_resist()
//drop && roll
if(on_fire)
+11 -4
View File
@@ -460,13 +460,20 @@
set name = "Resist"
set category = "IC"
if(can_resist())
next_move = world.time + 20
process_resist()
/mob/living/proc/can_resist()
//need to allow !canmove, or otherwise neck grabs can't be resisted
//so just check weakened instead.
if(stat || weakened || next_move > world.time)
return
next_move = world.time + 20
if(stat || weakened)
return 0
if(next_move > world.time)
return 0
return 1
/mob/living/proc/process_resist()
//Getting out of someone's inventory.
if(istype(src.loc, /obj/item/weapon/holder))
escape_inventory(src.loc)
@@ -34,7 +34,10 @@
/mob/living/captive_brain/emote(var/message)
return
/mob/living/captive_brain/resist()
/mob/living/captive_brain/can_resist()
return !(stat || next_move > world.time)
/mob/living/captive_brain/process_resist()
//Resisting control by an alien mind.
if(istype(src.loc,/mob/living/simple_animal/borer))
var/mob/living/simple_animal/borer/B = src.loc