GDD: combat updated