Yeah, the battle system is definitely something that needs to be gradually and carefully planned out. Hard to do in a 2 week game jam though.