Merge pull request #6407 from Scoppio/feat/acar-formations-reintroduced

Feat/acar formations reintroduced

megamek/i18n/megamek/client/acs-report-messages.properties

@@ -16,8 +16,10 @@
 ################################################################################
 acar.header=<h1>Abstract Combat Auto Resolution</h1>
 acar.header.startingScenario=<h2>\u25ce Starting Scenario Phase</h2>
-acar.header.teamFormations=Team {0} Formations:
-acar.startingScenario.numberOfUnits={0} has {1} units.
+acar.header.teamFormationsHeader=Team {0} Formations
+acar.header.teamFormations={0} has {1} formations
+acar.startingScenario.formation.numberOfUnits={0} has {1} units.
+acar.startingScenario.unit.numberOfElements={0} has {1} elements.
 acar.startingScenario.unitStats={0}, Armor: {1}, Structure: {2}, Crew: {3}, Hits: {4}
 acar.shortBlurb=short blurb
 
@@ -99,14 +101,13 @@ acar.firingPhase.noInternalDamage=Took no internal damage.
 ## End Phase
 ################################################################################
 acar.endPhase.header=<h2>\u25cf End Phase</h2>
-acar.endPhase.destroyedHeader=<h3>Destroyed Units</h3>
-acar.endPhase.withdrawAnnouncement=[Withdraw] {0} attempts to withdraw under {1} conditions.
-acar.endPhase.withdrawThreshold=[Withdraw] Needs {0}+ to successfully withdraw <i>\u27e8{1}\u27e9</i>.
-acar.endPhase.withdrawRoll=[Withdraw] {0} rolled {1} for withdrawal.
+acar.endPhase.withdrawAnnouncement=[Withdraw] {0} will withdraw. Reason: {1}
 acar.endPhase.withdrawSuccess=[Withdraw] The {0} has withdrawn from the battlefield.
-acar.endPhase.withdrawFail=[Withdraw] The withdrawal attempt fails.
+acar.endPhase.withdrawMotive.crippled=crippled
+acar.endPhase.withdrawMotive.metOrderCondition=met order condition
 acar.endPhase.crewDeath=[Crew] {0} has succumbed from his wounds \u2620
 acar.endPhase.crewAlive=[Crew] {0} is still alive ({1} hits) \u263a
+acar.endPhase.unitDestroyed=[Destroyed] {0} was destroyed, lost elements: {1}.
 acar.endPhase.devastated=[Devastated] {0} has been devastated, there is nothing left of it.
 acar.endPhase.destroyedPilot=[Destroyed] {0} was destroyed by the pilot ejection.
 acar.endPhase.destroyedOffBoard=[Destroyed] {0} was destroyed after being pushed off the combat envelope.
@@ -132,7 +133,7 @@ acar.morale.checkFail=[Morale] {0} fails its morale check! Morale worsens from {
 ## End of Combat
 ################################################################################
 acar.endOfCombat.header=<h2>\u25d9 End of Combat</h2>
-acar.endOfCombat.teamReportHeader=<h3>Team {0} Report:</h3>
+acar.endOfCombat.teamReportHeader=<h2>Team {0} Report:</h2>
 acar.endOfCombat.teamRemainingUnits=<h3>{0} has {1} units remaining.</h3>
 acar.endOfCombat.teamUnitStats={0}, Armor remaining: {1}, Structure remaining: {2}, Crew: {3}, Hits: {4}
 acar.endOfCombat.teamUnitStatsShort={0} - Armor remaining: {1}, Structure remaining: {2}

megamek/i18n/megamek/common/messages.properties

@@ -772,6 +772,8 @@ AutoResolveDialog.messageScenarioPlayer=Player {0} won the scenario.
 AutoResolveDialog.messageScenarioDraw=The scenario ended in a draw.
 AutoResolveDialog.message.victory=Your forces won the scenario. Did your side control the battlefield at the end of the scenario?
 AutoResolveDialog.message.defeat=Your forces lost the scenario. Do you want to declare your side as controlling the battlefield at the end of the scenario?
+AutoResolveDialog.messageScenarioError.text=There was an error during the execution of the simulation. If sentry isn't enabled open an issue with the developers.
+AutoResolveDialog.messageScenarioError.title=Error during the simulation
 AutoResolveDialog.victory=Victory!
 AutoResolveDialog.defeat=Defeat!
 ResolveDialog.control.title=Control of Battlefield?