add: combat and rest, need to be refactored