fix catapults and attack in time of peace by Armando

1.- return of the troops after an attack in time of peace
2.- Fix catapults