finish the warrior and do some stuff

warrior will now suicide on you when they are blocked

resolve minor bug caused by the merge lately in the day