Changed Warrior's color to be more different to worker's
Reworked combat and patrolling (works... sometimes -- most times)