combat system pretty much done