finalized combat system

got all the bug that i know,
if you guys find out any
let me know