From 4456e0624397c1c6915b97b90e6f913a441060e4 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 15:06:27 -0500 Subject: [PATCH 01/22] Updated Engage Scenario Briefings & Objectives Modified the detailed briefing text for "Engage" and "Engage - Heavy" scenarios to include destroying 75% of the opposing force. --- .../data/scenariotemplates/Engage - Heavy.xml | 30 +++++++++++++++++-- MekHQ/data/scenariotemplates/Engage.xml | 30 +++++++++++++++++-- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Engage - Heavy.xml b/MekHQ/data/scenariotemplates/Engage - Heavy.xml index e96e98d364..07bc8594bc 100644 --- a/MekHQ/data/scenariotemplates/Engage - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Engage - Heavy.xml @@ -2,8 +2,7 @@ Engage - Heavy Engage enemy force. - Engage enemy force with weapons fire or physical attacks for the specified - duration. + Engage enemy forces for the specified duration, or defeat 75% of the opposing force. false @@ -114,5 +113,32 @@ 2 ScaledToPrimaryUnitCount + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 0 + + + + Destroy or rout 75% of the following force(s) and unit(s): + NONE + ForceWithdraw + 75 + true + None + diff --git a/MekHQ/data/scenariotemplates/Engage.xml b/MekHQ/data/scenariotemplates/Engage.xml index 8b24cd5501..5f8bfee38d 100644 --- a/MekHQ/data/scenariotemplates/Engage.xml +++ b/MekHQ/data/scenariotemplates/Engage.xml @@ -2,8 +2,7 @@ Engage Engage enemy force. - Engage enemy force with weapons fire or physical attacks for the specified - duration. + Engage enemy forces for the specified duration, or defeat 75% of the opposing force. false @@ -114,5 +113,32 @@ 2 ScaledToPrimaryUnitCount + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 0 + + + + Destroy or rout 75% of the following force(s) and unit(s): + NONE + ForceWithdraw + 75 + true + None + From 0f4270075a4c1a60f947ddb0ec063005f7e887f9 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 17:39:57 -0500 Subject: [PATCH 02/22] Rename and Updated Scenario Templates Renamed multiple scenarios to better reflect their missions and objectives. Adjusted success and failure effects, added new objectives focusing on preserving forces, and corrected weight classes for balanced gameplay. --- .../FacilityHostileCapture.xml | 1 - .../FacilityHostileCaptureNonWin.xml | 1 - MekHQ/data/scenariotemplates/Air Support.xml | 29 ++- ...vy.xml => Allied Facility - Frontline.xml} | 33 +++- .../scenariotemplates/Allied Facility.xml | 29 ++- ...ssinate.xml => Assassinate - Frontier.xml} | 4 +- ... - Assault.xml => Assassinate - Heavy.xml} | 4 +- ...age - Heavy.xml => Battle - Frontline.xml} | 33 ++-- .../data/scenariotemplates/Battle - Heavy.xml | 116 ------------ .../scenariotemplates/Battle - Skirmish.xml | 143 +++++++++++++++ MekHQ/data/scenariotemplates/Battle.xml | 116 ------------ ...Heavy.xml => Breakthrough - Frontline.xml} | 28 +-- ...ugh.xml => Breakthrough - Picket Line.xml} | 24 +-- .../{Capture.xml => Capture - Frontier.xml} | 62 ++++++- ...re - Heavy.xml => Capture - Frontline.xml} | 62 ++++++- ...Heavy.xml => Convoy Attack - Critical.xml} | 39 +++- ...ack.xml => Convoy Attack - Disruption.xml} | 39 +++- ...Heavy.xml => Convoy Escort - Critical.xml} | 35 +++- ...scort.xml => Convoy Escort - Frontier.xml} | 33 +++- .../scenariotemplates/Decoy - Diversion.xml | 171 ++++++++++++++++++ .../Decoy - Interception.xml | 171 ++++++++++++++++++ ... Defend Grounded Dropship - Deep Raid.xml} | 41 ++++- ...fend Grounded Dropship - Interception.xml} | 39 +++- .../Destroy Grounded Dropship - Heavy.xml | 42 ++++- ...troy Grounded Dropship - Interception.xml} | 40 +++- ...sion - Heavy.xml => Diversion - Decoy.xml} | 38 ++-- ...rsion.xml => Diversion - Interception.xml} | 35 ++-- ...ass - Heavy.xml => Harass - Frontline.xml} | 31 +++- .../{Harass.xml => Harass - Skirmish.xml} | 29 ++- ...y.xml => Hostile Facility - Frontline.xml} | 36 +++- .../scenariotemplates/Hostile Facility.xml | 32 +++- ...es.xml => Irregular Forces - Frontier.xml} | 37 +++- ...y.xml => Irregular Forces - Frontline.xml} | 35 +++- .../Low Atmo - Destroy Dropship.xml | 27 +++ .../scenariotemplates/Low Atmo - Escort.xml | 27 +++ .../Low Atmo - Interception.xml | 27 +++ .../{Engage.xml => Pivotal Battle.xml} | 33 ++-- .../Prevent Breakthrough.xml | 29 ++- .../data/scenariotemplates/Prevent Recon.xml | 27 +++ .../data/scenariotemplates/Recon - Heavy.xml | 56 +++++- MekHQ/data/scenariotemplates/Recon.xml | 54 ++++++ .../scenariotemplates/ScenarioManifest.xml | 56 +++--- .../Space - Blockade Run Escort.xml | 27 +++ .../Space - Blockade Run.xml | 58 +++++- .../Space - Interception.xml | 27 +++ 45 files changed, 1622 insertions(+), 434 deletions(-) rename MekHQ/data/scenariotemplates/{Allied Facility - Heavy.xml => Allied Facility - Frontline.xml} (85%) rename MekHQ/data/scenariotemplates/{Assassinate.xml => Assassinate - Frontier.xml} (98%) rename MekHQ/data/scenariotemplates/{Assassinate - Assault.xml => Assassinate - Heavy.xml} (98%) rename MekHQ/data/scenariotemplates/{Engage - Heavy.xml => Battle - Frontline.xml} (85%) delete mode 100644 MekHQ/data/scenariotemplates/Battle - Heavy.xml create mode 100644 MekHQ/data/scenariotemplates/Battle - Skirmish.xml delete mode 100644 MekHQ/data/scenariotemplates/Battle.xml rename MekHQ/data/scenariotemplates/{Breakthrough - Heavy.xml => Breakthrough - Frontline.xml} (97%) rename MekHQ/data/scenariotemplates/{Breakthrough.xml => Breakthrough - Picket Line.xml} (98%) rename MekHQ/data/scenariotemplates/{Capture.xml => Capture - Frontier.xml} (75%) rename MekHQ/data/scenariotemplates/{Capture - Heavy.xml => Capture - Frontline.xml} (75%) rename MekHQ/data/scenariotemplates/{Convoy Attack - Heavy.xml => Convoy Attack - Critical.xml} (85%) rename MekHQ/data/scenariotemplates/{Convoy Attack.xml => Convoy Attack - Disruption.xml} (85%) rename MekHQ/data/scenariotemplates/{Convoy Escort - Heavy.xml => Convoy Escort - Critical.xml} (87%) rename MekHQ/data/scenariotemplates/{Convoy Escort.xml => Convoy Escort - Frontier.xml} (88%) create mode 100644 MekHQ/data/scenariotemplates/Decoy - Diversion.xml create mode 100644 MekHQ/data/scenariotemplates/Decoy - Interception.xml rename MekHQ/data/scenariotemplates/{Defend Grounded Dropship - Heavy.xml => Defend Grounded Dropship - Deep Raid.xml} (84%) rename MekHQ/data/scenariotemplates/{Defend Grounded Dropship.xml => Defend Grounded Dropship - Interception.xml} (84%) rename MekHQ/data/scenariotemplates/{Destroy Grounded Dropship.xml => Destroy Grounded Dropship - Interception.xml} (87%) rename MekHQ/data/scenariotemplates/{Diversion - Heavy.xml => Diversion - Decoy.xml} (87%) rename MekHQ/data/scenariotemplates/{Diversion.xml => Diversion - Interception.xml} (89%) rename MekHQ/data/scenariotemplates/{Harass - Heavy.xml => Harass - Frontline.xml} (83%) rename MekHQ/data/scenariotemplates/{Harass.xml => Harass - Skirmish.xml} (84%) rename MekHQ/data/scenariotemplates/{Hostile Facility - Heavy.xml => Hostile Facility - Frontline.xml} (83%) rename MekHQ/data/scenariotemplates/{Irregular Forces.xml => Irregular Forces - Frontier.xml} (85%) rename MekHQ/data/scenariotemplates/{Irregular Forces - Heavy.xml => Irregular Forces - Frontline.xml} (85%) rename MekHQ/data/scenariotemplates/{Engage.xml => Pivotal Battle.xml} (87%) diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml index 61a1b02250..fbf524e6ff 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml @@ -49,7 +49,6 @@ Primary Opfor - Base Turrets diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml index 907789c92a..8c706742ac 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml @@ -39,7 +39,6 @@ Primary Opfor - Base Turrets diff --git a/MekHQ/data/scenariotemplates/Air Support.xml b/MekHQ/data/scenariotemplates/Air Support.xml index c653f3e1ab..88a1b23c60 100644 --- a/MekHQ/data/scenariotemplates/Air Support.xml +++ b/MekHQ/data/scenariotemplates/Air Support.xml @@ -132,7 +132,34 @@ ScenarioVictory Fixed - 2 + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 diff --git a/MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml b/MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml rename to MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml index 19d643b36d..5285c33f67 100644 --- a/MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml @@ -1,6 +1,6 @@ - Allied Facility - Heavy + Allied Facility - Frontline Allied facility An allied facility has come under attack. false @@ -123,7 +123,7 @@ 1 5 4 - 3 + 2 50 0 @@ -142,7 +142,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -160,5 +160,32 @@ true None + + + Base Turrets + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 25% of the following force(s) and unit(s): + NONE + Preserve + 25 + true + None + diff --git a/MekHQ/data/scenariotemplates/Allied Facility.xml b/MekHQ/data/scenariotemplates/Allied Facility.xml index 5c74a48a1b..232f7d7e9e 100644 --- a/MekHQ/data/scenariotemplates/Allied Facility.xml +++ b/MekHQ/data/scenariotemplates/Allied Facility.xml @@ -142,7 +142,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -160,5 +160,32 @@ true None + + + Base Turrets + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 25% of the following force(s) and unit(s): + NONE + Preserve + 25 + true + None + diff --git a/MekHQ/data/scenariotemplates/Assassinate.xml b/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml similarity index 98% rename from MekHQ/data/scenariotemplates/Assassinate.xml rename to MekHQ/data/scenariotemplates/Assassinate - Frontier.xml index ee5363a1a0..13aaa1f6a4 100644 --- a/MekHQ/data/scenariotemplates/Assassinate.xml +++ b/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml @@ -1,6 +1,6 @@ - Assassinate + Assassinate - Frontier Eliminate the designated target. Destroy the designated target, or disable it while routing any escorts. The target cannot be allowed to leave the battlefield. @@ -105,7 +105,7 @@ 3 5 4 - 1 + 3 50 0 false diff --git a/MekHQ/data/scenariotemplates/Assassinate - Assault.xml b/MekHQ/data/scenariotemplates/Assassinate - Heavy.xml similarity index 98% rename from MekHQ/data/scenariotemplates/Assassinate - Assault.xml rename to MekHQ/data/scenariotemplates/Assassinate - Heavy.xml index 3c88e28db6..f7c13098f9 100644 --- a/MekHQ/data/scenariotemplates/Assassinate - Assault.xml +++ b/MekHQ/data/scenariotemplates/Assassinate - Heavy.xml @@ -1,6 +1,6 @@ - Assassinate - Assault + Assassinate - Heavy Eliminate the designated target. Destroy the designated target, or disable it while routing any escorts. The target cannot be allowed to leave the battlefield. @@ -76,7 +76,7 @@ 1 5 4 - 3 + 2 50 0 OppositeEdge diff --git a/MekHQ/data/scenariotemplates/Engage - Heavy.xml b/MekHQ/data/scenariotemplates/Battle - Frontline.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Engage - Heavy.xml rename to MekHQ/data/scenariotemplates/Battle - Frontline.xml index 07bc8594bc..1b63801e28 100644 --- a/MekHQ/data/scenariotemplates/Engage - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Battle - Frontline.xml @@ -1,8 +1,8 @@ - Engage - Heavy - Engage enemy force. - Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + Battle - Frontline + Stand-up fight + Engage and destroy or rout any enemy forces present. false @@ -70,12 +70,12 @@ 5 0 2 - 1.25 + 1.0 Primary Opfor 1 5 4 - 3 + 2 50 0 OppositeEdge @@ -105,38 +105,37 @@ - Engage the following enemy unit(s) and force(s): + Destroy or rout 50% of the following force(s) and unit(s): NONE - Custom - 1 - false - 2 - ScaledToPrimaryUnitCount + ForceWithdraw + 50 + true + None - Primary Opfor + Player ScenarioVictory Fixed - 2 + 1 ScenarioDefeat Fixed - 0 + 1 - Destroy or rout 75% of the following force(s) and unit(s): + Preserve 50% of the following force(s) and unit(s): NONE - ForceWithdraw - 75 + Preserve + 50 true None diff --git a/MekHQ/data/scenariotemplates/Battle - Heavy.xml b/MekHQ/data/scenariotemplates/Battle - Heavy.xml deleted file mode 100644 index 33ad75e387..0000000000 --- a/MekHQ/data/scenariotemplates/Battle - Heavy.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - Battle - Heavy - Stand-up fight - Engage and destroy or rout any enemy forces present. - - - false - 0 - 0 - 5 - AllGroundTerrain - true - 5 - - - - Player - - -1 - false - -2 - 0 - true - true - true - true - false - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - 5 - 0 - 0 - 1.0 - Player - 0 - 1 - 4 - 0 - 50 - 0 - None - false - - - - Primary Opfor - - -1 - false - -2 - 0 - true - false - true - false - false - - 5 - 0 - 2 - 1.0 - Primary Opfor - 1 - 5 - 4 - 3 - 50 - 0 - OppositeEdge - Player - false - - - - - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy or rout 50% of the following force(s) and unit(s): - NONE - ForceWithdraw - 50 - true - None - - - diff --git a/MekHQ/data/scenariotemplates/Battle - Skirmish.xml b/MekHQ/data/scenariotemplates/Battle - Skirmish.xml new file mode 100644 index 0000000000..0467389186 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Battle - Skirmish.xml @@ -0,0 +1,143 @@ + + + Battle - Skirmish + Stand-up fight + Engage and destroy or rout any enemy forces present. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.0 + Primary Opfor + 1 + 5 + 3 + 1 + 50 + 0 + OppositeEdge + Player + false + + + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Battle.xml b/MekHQ/data/scenariotemplates/Battle.xml deleted file mode 100644 index 2a0e7602a3..0000000000 --- a/MekHQ/data/scenariotemplates/Battle.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - Battle - Stand-up fight - Engage and destroy or rout any enemy forces present. - - - false - 0 - 0 - 5 - AllGroundTerrain - true - 5 - - - - Player - - -1 - false - -2 - 0 - true - true - true - true - false - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - 5 - 0 - 0 - 1.0 - Player - 0 - 1 - 4 - 0 - 50 - 0 - None - false - - - - Primary Opfor - - -1 - false - -2 - 0 - true - false - true - false - false - - 5 - 0 - 2 - 1.0 - Primary Opfor - 1 - 5 - 4 - 1 - 50 - 0 - OppositeEdge - Player - false - - - - - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy or rout 50% of the following force(s) and unit(s): - NONE - ForceWithdraw - 50 - true - None - - - diff --git a/MekHQ/data/scenariotemplates/Breakthrough - Heavy.xml b/MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml similarity index 97% rename from MekHQ/data/scenariotemplates/Breakthrough - Heavy.xml rename to MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml index 4ddffa6801..ece671ada1 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml @@ -1,6 +1,6 @@ - Breakthrough - Heavy + Breakthrough - Frontline Break through blocking hostile force. Break through to the opposite edge of the map or rout the hostile force. @@ -68,7 +68,7 @@ 1 5 4 - 3 + 2 50 0 @@ -97,7 +97,7 @@ 0 1 4 - 0 + 2 50 0 @@ -110,7 +110,7 @@ - Primary Opfor + Player @@ -124,13 +124,15 @@ ScenarioDefeat Fixed - 1 + 2 - - Destroy or rout 50% the following force(s) and unit(s): + + Crippled units do not count towards this objective. + + Reach the destination edge with 50% of the following force(s) and unit(s): NONE - Destroy + ReachMapEdge 50 0 true @@ -138,7 +140,7 @@ - Player + Primary Opfor @@ -155,12 +157,10 @@ 1 - - Crippled units do not count towards this objective. - - Reach the destination edge with 50% of the following force(s) and unit(s): + + Destroy or rout 50% the following force(s) and unit(s): NONE - ReachMapEdge + Destroy 50 0 true diff --git a/MekHQ/data/scenariotemplates/Breakthrough.xml b/MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml similarity index 98% rename from MekHQ/data/scenariotemplates/Breakthrough.xml rename to MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml index dc1cc817dc..6b42663789 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml @@ -1,6 +1,6 @@ - Breakthrough + Breakthrough - Picket Line Break through blocking hostile force. Break through to the opposite edge of the map or rout the hostile force. @@ -97,7 +97,7 @@ 0 1 4 - 0 + 1 50 0 @@ -110,7 +110,7 @@ - Primary Opfor + Player @@ -127,10 +127,12 @@ 1 - - Destroy or rout 50% the following force(s) and unit(s): + + Crippled units do not count towards this objective. + + Reach the destination edge with 50% of the following force(s) and unit(s): NONE - Destroy + ReachMapEdge 50 0 true @@ -138,7 +140,7 @@ - Player + Primary Opfor @@ -155,12 +157,10 @@ 1 - - Crippled units do not count towards this objective. - - Reach the destination edge with 50% of the following force(s) and unit(s): + + Destroy or rout 50% the following force(s) and unit(s): NONE - ReachMapEdge + Destroy 50 0 true diff --git a/MekHQ/data/scenariotemplates/Capture.xml b/MekHQ/data/scenariotemplates/Capture - Frontier.xml similarity index 75% rename from MekHQ/data/scenariotemplates/Capture.xml rename to MekHQ/data/scenariotemplates/Capture - Frontier.xml index 5d45de9d1f..03c30a2035 100644 --- a/MekHQ/data/scenariotemplates/Capture.xml +++ b/MekHQ/data/scenariotemplates/Capture - Frontier.xml @@ -1,6 +1,6 @@ - Capture + Capture - Frontier Capture the designated target. Capture the designated target by disabling their unit and routing their escorts or by forcing an ejection and picking up the ejected individual. The capture target @@ -106,7 +106,7 @@ 3 5 4 - 1 + 3 50 0 false @@ -126,14 +126,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -145,4 +145,58 @@ None + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Capture - Heavy.xml b/MekHQ/data/scenariotemplates/Capture - Frontline.xml similarity index 75% rename from MekHQ/data/scenariotemplates/Capture - Heavy.xml rename to MekHQ/data/scenariotemplates/Capture - Frontline.xml index 91c4f1cdcd..8f2ffcea9e 100644 --- a/MekHQ/data/scenariotemplates/Capture - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Capture - Frontline.xml @@ -77,7 +77,7 @@ 1 5 4 - 3 + 2 50 0 OppositeEdge @@ -106,7 +106,7 @@ 3 5 4 - 4 + 3 50 0 false @@ -126,14 +126,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -145,4 +145,58 @@ None + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Convoy Attack - Heavy.xml b/MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Convoy Attack - Heavy.xml rename to MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml index b4fa3030ac..3a23f789af 100644 --- a/MekHQ/data/scenariotemplates/Convoy Attack - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml @@ -1,6 +1,6 @@ - Convoy Attack - Heavy + Convoy Attack - Critical Attack on an enemy supply convoy. Prevent 50% of the convoy units from crossing the far edge of the map. The convoy will surrender if 50% of the escorts are destroyed or routed. @@ -118,14 +118,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -171,7 +171,11 @@ 1 - + + ScenarioDefeat + Fixed + 1 + Destroy or rout 50% of the following force(s) and unit(s) to force convoy surrender: @@ -181,5 +185,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Convoy Attack.xml b/MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Convoy Attack.xml rename to MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml index f86b053881..30708e830e 100644 --- a/MekHQ/data/scenariotemplates/Convoy Attack.xml +++ b/MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml @@ -1,6 +1,6 @@ - Convoy Attack + Convoy Attack - Disruption Attack on an enemy supply convoy. Prevent 50% of the convoy units from crossing the far edge of the map. The convoy will surrender if 50% of the escorts are destroyed or routed. @@ -118,14 +118,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -171,7 +171,11 @@ 1 - + + ScenarioDefeat + Fixed + 1 + Destroy or rout 50% of the following force(s) and unit(s) to force convoy surrender: @@ -181,5 +185,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Convoy Escort - Heavy.xml b/MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml similarity index 87% rename from MekHQ/data/scenariotemplates/Convoy Escort - Heavy.xml rename to MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml index c356db68a2..f7ebb732f8 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml @@ -1,6 +1,6 @@ - Convoy Escort - Heavy + Convoy Escort - Critical Protect an allied supply convoy. Escort the allied convoy across the map or rout the attacking force. false @@ -67,7 +67,7 @@ 1 5 4 - 3 + 2 50 0 @@ -128,7 +128,7 @@ ScenarioDefeat Fixed - 1 + 2 @@ -173,7 +173,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -192,5 +192,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Convoy Escort.xml b/MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml similarity index 88% rename from MekHQ/data/scenariotemplates/Convoy Escort.xml rename to MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml index 8100e97402..3972f54c71 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml @@ -1,6 +1,6 @@ - Convoy Escort + Convoy Escort - Frontier Protect an allied supply convoy. Escort the allied convoy across the map or rout the attacking force. false @@ -128,7 +128,7 @@ ScenarioDefeat Fixed - 1 + 2 @@ -173,7 +173,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -192,5 +192,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Decoy - Diversion.xml b/MekHQ/data/scenariotemplates/Decoy - Diversion.xml new file mode 100644 index 0000000000..d424c34a69 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Decoy - Diversion.xml @@ -0,0 +1,171 @@ + + + Decoy - Diversion + Engage enemy force. + Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.25 + Primary Opfor + 1 + 5 + 4 + 2 + 50 + 0 + OppositeEdge + Player + false + + + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Engage the following enemy unit(s) and force(s): + NONE + Custom + 1 + false + 2 + ScaledToPrimaryUnitCount + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 75% of the following force(s) and unit(s): + NONE + ForceWithdraw + 75 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Decoy - Interception.xml b/MekHQ/data/scenariotemplates/Decoy - Interception.xml new file mode 100644 index 0000000000..347c46cbf9 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Decoy - Interception.xml @@ -0,0 +1,171 @@ + + + Decoy - Interception + Engage enemy force. + Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.25 + Primary Opfor + 1 + 5 + 4 + 1 + 50 + 0 + OppositeEdge + Player + false + + + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Engage the following enemy unit(s) and force(s): + NONE + Custom + 1 + false + 2 + ScaledToPrimaryUnitCount + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 75% of the following force(s) and unit(s): + NONE + ForceWithdraw + 75 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Heavy.xml b/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml similarity index 84% rename from MekHQ/data/scenariotemplates/Defend Grounded Dropship - Heavy.xml rename to MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml index 4843d6d537..0f6533a69e 100644 --- a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml @@ -1,6 +1,6 @@ - Defend Grounded Dropship - Heavy + Defend Grounded Dropship - Deep Raid Defend grounded dropship. Prevent a grounded dropship from becoming crippled. You have 30 turns to do so before it lifts off. @@ -26,7 +26,7 @@ ScenarioVictory Fixed - 1 + 2 @@ -59,7 +59,13 @@ 1 - + + + ScenarioDefeat + Fixed + 1 + + Destroy, cripple or force to withdraw 50% of the following force(s) and unit(s): @@ -69,6 +75,33 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + @@ -141,7 +174,7 @@ 1 5 4 - 3 + 2 50 0 diff --git a/MekHQ/data/scenariotemplates/Defend Grounded Dropship.xml b/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml similarity index 84% rename from MekHQ/data/scenariotemplates/Defend Grounded Dropship.xml rename to MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml index ba790434cf..6cf2de5629 100644 --- a/MekHQ/data/scenariotemplates/Defend Grounded Dropship.xml +++ b/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml @@ -1,6 +1,6 @@ - Defend Grounded Dropship + Defend Grounded Dropship - Interception Defend grounded dropship. Prevent a grounded dropship from becoming crippled. You have 30 turns to do so before it lifts off. @@ -26,7 +26,7 @@ ScenarioVictory Fixed - 1 + 2 @@ -59,7 +59,13 @@ 1 - + + + ScenarioDefeat + Fixed + 1 + + Destroy, cripple or force to withdraw 50% of the following force(s) and unit(s): @@ -69,6 +75,33 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml index 9b85088501..10dc9faba8 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml @@ -1,6 +1,6 @@ - Destroy Grounded Dropship - Heavy + Destroy Grounded Dropship - Deep Raid Destroy grounded hostile dropship. Destroy or cripple a grounded enemy dropship. You have 30 turns to do so before it lifts off. @@ -79,7 +79,7 @@ 1 5 4 - 3 + 2 50 0 @@ -130,14 +130,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -154,7 +154,6 @@ Primary Opfor - Dropship @@ -168,12 +167,10 @@ ScenarioDefeat Fixed - 2 + 1 - - - + Destroy, cripple or force to withdraw 50% of the following force(s) and unit(s): NONE @@ -182,5 +179,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship.xml b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml similarity index 87% rename from MekHQ/data/scenariotemplates/Destroy Grounded Dropship.xml rename to MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml index de7a2d7645..ea9736b17b 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship.xml +++ b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml @@ -1,6 +1,6 @@ - Destroy Grounded Dropship + Destroy Grounded Dropship - Interception Destroy grounded hostile dropship. Destroy or cripple a grounded enemy dropship. You have 30 turns to do so before it lifts off. @@ -130,14 +130,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -154,7 +154,6 @@ Primary Opfor - Dropship @@ -168,12 +167,10 @@ ScenarioDefeat Fixed - 2 + 1 - - - + Destroy, cripple or force to withdraw 50% of the following force(s) and unit(s): NONE @@ -182,5 +179,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Diversion - Heavy.xml b/MekHQ/data/scenariotemplates/Diversion - Decoy.xml similarity index 87% rename from MekHQ/data/scenariotemplates/Diversion - Heavy.xml rename to MekHQ/data/scenariotemplates/Diversion - Decoy.xml index 85406076ca..e832633f8a 100644 --- a/MekHQ/data/scenariotemplates/Diversion - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Diversion - Decoy.xml @@ -1,9 +1,8 @@ - Diversion - Heavy + Diversion - Decoy Hostile force - A hostile force is attempting to delay your force from its objective. Destroy - or bypass them quickly. + A hostile force is attempting to delay your force from its objective. Destroy or bypass them quickly. false @@ -69,7 +68,7 @@ 1 5 4 - 3 + 1 50 0 OppositeEdge @@ -81,7 +80,7 @@ - Primary Opfor + Player @@ -95,21 +94,23 @@ ScenarioDefeat Fixed - 1 + 2 - - Destroy or rout 50% of the following enemy force(s) and unit(s): + + Crippled units do not count towards this objective. + + Reach the destination edge with 50% of the following force(s) and unit(s): NONE - ForceWithdraw + ReachMapEdge 50 + 0 true - 2 - ScaledToPrimaryUnitCount + None - Player + Primary Opfor @@ -126,17 +127,14 @@ 1 - - Crippled units do not count towards this objective. - - Move at least 50% of the following force(s) and unit(s) to the destination - edge and leave the battlefield: + + Destroy or rout 50% the following force(s) and unit(s): NONE - ReachMapEdge + Destroy 50 + 0 true - 2 - ScaledToPrimaryUnitCount + None diff --git a/MekHQ/data/scenariotemplates/Diversion.xml b/MekHQ/data/scenariotemplates/Diversion - Interception.xml similarity index 89% rename from MekHQ/data/scenariotemplates/Diversion.xml rename to MekHQ/data/scenariotemplates/Diversion - Interception.xml index 6ef2c691be..83309e34ce 100644 --- a/MekHQ/data/scenariotemplates/Diversion.xml +++ b/MekHQ/data/scenariotemplates/Diversion - Interception.xml @@ -1,6 +1,6 @@ - Diversion + Diversion - Interception Hostile force A hostile force is attempting to delay your force from its objective. Destroy or bypass them quickly. @@ -69,7 +69,7 @@ 1 5 4 - 1 + 2 50 0 OppositeEdge @@ -81,7 +81,7 @@ - Primary Opfor + Player @@ -95,21 +95,23 @@ ScenarioDefeat Fixed - 1 + 2 - - Destroy or rout 50% of the following enemy force(s) and unit(s): + + Crippled units do not count towards this objective. + + Reach the destination edge with 50% of the following force(s) and unit(s): NONE - ForceWithdraw + ReachMapEdge 50 + 0 true - 2 - ScaledToPrimaryUnitCount + None - Player + Primary Opfor @@ -126,17 +128,14 @@ 1 - - Crippled units do not count towards this objective. - - Move at least 50% of the following force(s) and unit(s) to the destination - edge and leave the battlefield: + + Destroy or rout 50% the following force(s) and unit(s): NONE - ReachMapEdge + Destroy 50 + 0 true - 2 - ScaledToPrimaryUnitCount + None diff --git a/MekHQ/data/scenariotemplates/Harass - Heavy.xml b/MekHQ/data/scenariotemplates/Harass - Frontline.xml similarity index 83% rename from MekHQ/data/scenariotemplates/Harass - Heavy.xml rename to MekHQ/data/scenariotemplates/Harass - Frontline.xml index b19851b512..29e5797995 100644 --- a/MekHQ/data/scenariotemplates/Harass - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Harass - Frontline.xml @@ -1,6 +1,6 @@ - Harass - Heavy + Harass - Frontline Harass a superior enemy force. Prevent 50% of the hostile force from reaching the opposite map edge. false @@ -68,7 +68,7 @@ 1 5 4 - 3 + 2 50 0 @@ -139,5 +139,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Harass.xml b/MekHQ/data/scenariotemplates/Harass - Skirmish.xml similarity index 84% rename from MekHQ/data/scenariotemplates/Harass.xml rename to MekHQ/data/scenariotemplates/Harass - Skirmish.xml index e29bcbdde8..14f02244db 100644 --- a/MekHQ/data/scenariotemplates/Harass.xml +++ b/MekHQ/data/scenariotemplates/Harass - Skirmish.xml @@ -1,6 +1,6 @@ - Harass + Harass - Skirmish Harass a superior enemy force. Prevent 50% of the hostile force from reaching the opposite map edge. false @@ -139,5 +139,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml b/MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml similarity index 83% rename from MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml rename to MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml index ede0c5d1f1..232ccf359c 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml @@ -1,6 +1,6 @@ - Hostile Facility - Heavy + Hostile Facility - Frontline Hostile facility A hostile-controlled facility has been located. true @@ -112,7 +112,7 @@ 1 5 4 - 3 + 2 50 0 @@ -124,7 +124,6 @@ - Base Turrets Primary Opfor @@ -132,7 +131,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -143,12 +142,39 @@ - Destroy or rout 75% of all hostile units present: + Destroy or rout 75% of the defending force(s): NONE ForceWithdraw 75 true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index a0433e1430..5219a5af75 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -124,7 +124,6 @@ - Base Turrets Primary Opfor @@ -132,7 +131,7 @@ ScenarioVictory Fixed - 2 + 1 @@ -143,12 +142,39 @@ - Destroy or rout 75% of all hostile units present: + Destroy or rout 75% of the defending force(s): NONE ForceWithdraw 75 true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Irregular Forces.xml b/MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Irregular Forces.xml rename to MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml index 636a2ceaa0..6a36ea12d0 100644 --- a/MekHQ/data/scenariotemplates/Irregular Forces.xml +++ b/MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml @@ -1,6 +1,6 @@ - Irregular Forces + Irregular Forces - Frontier Destroy enemy infantry and irregular forces, and their support. Hostile infantry and irregular forces are being supported by military units. Engage and destroy. @@ -78,7 +78,7 @@ 2 1.0 Primary Opfor - 2 + 1 5 4 0 @@ -168,7 +168,11 @@ 1 - + + ScenarioDefeat + Fixed + 1 + Destroy, cripple or force the withdrawal of 50% of the following forces and units: @@ -178,5 +182,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml b/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml rename to MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml index cf72cf6385..1e86b0ebf2 100644 --- a/MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml @@ -81,7 +81,7 @@ 1 5 4 - 3 + 2 50 0 @@ -168,7 +168,11 @@ 1 - + + ScenarioDefeat + Fixed + 1 + Destroy, cripple or force the withdrawal of 50% of the following forces and units: @@ -178,5 +182,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml b/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml index 411f9b45c6..c22fa632d8 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml +++ b/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml @@ -139,4 +139,31 @@ None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml b/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml index 1bcc322a59..a4c6905f0c 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml +++ b/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml @@ -77,6 +77,33 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml b/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml index 3fe265a598..4d28c8847b 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml +++ b/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml @@ -112,5 +112,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Engage.xml b/MekHQ/data/scenariotemplates/Pivotal Battle.xml similarity index 87% rename from MekHQ/data/scenariotemplates/Engage.xml rename to MekHQ/data/scenariotemplates/Pivotal Battle.xml index 5f8bfee38d..ea8286c75f 100644 --- a/MekHQ/data/scenariotemplates/Engage.xml +++ b/MekHQ/data/scenariotemplates/Pivotal Battle.xml @@ -1,8 +1,8 @@ - Engage - Engage enemy force. - Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + Pivotal Battle + Stand-up fight + Engage and destroy or rout any enemy forces present. false @@ -70,12 +70,12 @@ 5 0 2 - 1.25 + 1.0 Primary Opfor 1 5 4 - 1 + 2 50 0 OppositeEdge @@ -105,38 +105,37 @@ - Engage the following enemy unit(s) and force(s): + Destroy or rout 75% of the following force(s) and unit(s): NONE - Custom - 1 - false - 2 - ScaledToPrimaryUnitCount + ForceWithdraw + 75 + true + None - Primary Opfor + Player ScenarioVictory Fixed - 2 + 1 ScenarioDefeat Fixed - 0 + 1 - Destroy or rout 75% of the following force(s) and unit(s): + Preserve 25% of the following force(s) and unit(s): NONE - ForceWithdraw - 75 + Preserve + 25 true None diff --git a/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml b/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml index 64dfc06b50..8c0405ab13 100644 --- a/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml @@ -1,7 +1,7 @@ Prevent Breakthrough - Prevent hostile breakthrough. + Prevent a hostile breakthrough. Prevent enemy units from crossing the far edge of the map. false false @@ -140,5 +140,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Prevent Recon.xml b/MekHQ/data/scenariotemplates/Prevent Recon.xml index f61ad9d913..a6bb54c719 100644 --- a/MekHQ/data/scenariotemplates/Prevent Recon.xml +++ b/MekHQ/data/scenariotemplates/Prevent Recon.xml @@ -117,5 +117,32 @@ 2 ScaledToPrimaryUnitCount + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Recon - Heavy.xml b/MekHQ/data/scenariotemplates/Recon - Heavy.xml index 47e671f50f..abc3153665 100644 --- a/MekHQ/data/scenariotemplates/Recon - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Recon - Heavy.xml @@ -78,7 +78,7 @@ 1 5 4 - 3 + 2 25 0 @@ -123,5 +123,59 @@ true None + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Recon.xml b/MekHQ/data/scenariotemplates/Recon.xml index c5ee2392f1..8e0782ea1a 100644 --- a/MekHQ/data/scenariotemplates/Recon.xml +++ b/MekHQ/data/scenariotemplates/Recon.xml @@ -123,5 +123,59 @@ true None + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/ScenarioManifest.xml b/MekHQ/data/scenariotemplates/ScenarioManifest.xml index c0f2c9010f..206aed9ec5 100644 --- a/MekHQ/data/scenariotemplates/ScenarioManifest.xml +++ b/MekHQ/data/scenariotemplates/ScenarioManifest.xml @@ -2,19 +2,19 @@ 0 - Battle.xml + Battle - Skirmish.xml 1 - Capture.xml + Capture - Frontier.xml 2 - Assassinate.xml + Assassinate - Frontier.xml 3 - Convoy Attack.xml + Convoy Attack - Disruption.xml 4 @@ -22,11 +22,11 @@ 5 - Engage.xml + Decoy - Interception.xml 6 - Diversion.xml + Diversion - Decoy.xml 7 @@ -34,7 +34,7 @@ 8 - Breakthrough.xml + Breakthrough - Picket Line.xml 9 @@ -46,23 +46,23 @@ 11 - Harass.xml + Harass - Skirmish.xml 12 - Convoy Escort.xml + Convoy Escort - Frontier.xml 13 - Irregular Forces.xml + Irregular Forces - Frontier.xml 14 - Defend Grounded Dropship.xml + Defend Grounded Dropship - Interception.xml 15 - Destroy Grounded Dropship.xml + Destroy Grounded Dropship - Interception.xml 16 @@ -102,63 +102,67 @@ 25 - Allied Facility - Heavy.xml + Allied Facility - Frontline.xml 26 - Assassinate - Assault.xml + Assassinate - Frontline.xml 27 - Battle - Heavy.xml + Battle - Frontline.xml 28 - Breakthrough - Heavy.xml + Breakthrough - Frontline.xml 29 - Capture - Heavy.xml + Capture - Frontline.xml 30 - Convoy Attack - Heavy.xml + Convoy Attack - Critical.xml 31 - Convoy Escort - Heavy.xml + Convoy Escort - Critical .xml 32 - Defend Grounded Dropship - Heavy.xml + Defend Grounded Dropship - Deep Raid.xml 33 - Destroy Grounded Dropship - Heavy.xml + Destroy Grounded Dropship - Deep Raid.xml 34 - Diversion - Heavy.xml + Diversion - Interception.xml 35 - Engage - Heavy.xml + Decoy - Diversion.xml 36 - Harass - Heavy.xml + Harass - Frontline.xml 37 - Hostile Facility - Heavy.xml + Hostile Facility - Frontline.xml 38 - Irregular Forces - Heavy.xml + Irregular Forces - Frontline.xml 39 Recon - Heavy.xml + + 40 + Pivotal Battle.xml + diff --git a/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml b/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml index 247233b02a..1512be5aa6 100644 --- a/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml +++ b/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml @@ -77,6 +77,33 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Space - Blockade Run.xml b/MekHQ/data/scenariotemplates/Space - Blockade Run.xml index f4dcff203f..dd97a4ccf2 100644 --- a/MekHQ/data/scenariotemplates/Space - Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space - Blockade Run.xml @@ -25,14 +25,14 @@ ScenarioVictory Fixed - 1 + 2 ScenarioDefeat Fixed - 1 + 2 @@ -43,6 +43,60 @@ true None + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Space - Interception.xml b/MekHQ/data/scenariotemplates/Space - Interception.xml index d94b153a33..19ed1946f1 100644 --- a/MekHQ/data/scenariotemplates/Space - Interception.xml +++ b/MekHQ/data/scenariotemplates/Space - Interception.xml @@ -116,5 +116,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + From 1b101fa8e322d1d243835b320ac5a4b4e3de624f Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 18:34:42 -0500 Subject: [PATCH 03/22] Rename scenario templates and update objectives Renamed scenario template files for consistency and clarity. Updated "contributesToBV" and "generationMethod" fields, and added new objectives to "Assassinate - Heavy Escort" and "Assassinate - Frontier" scenarios. --- .../Assassinate - Frontier.xml | 27 +++++++++++++++++ ...avy.xml => Assassinate - Heavy Escort.xml} | 29 ++++++++++++++++++- .../scenariotemplates/Capture - Frontline.xml | 2 +- ...Destroy Grounded Dropship - Deep Raid.xml} | 4 +-- ...stroy Grounded Dropship - Interception.xml | 7 ++--- .../Irregular Forces - Frontline.xml | 2 +- .../scenariotemplates/ScenarioManifest.xml | 2 +- 7 files changed, 63 insertions(+), 10 deletions(-) rename MekHQ/data/scenariotemplates/{Assassinate - Heavy.xml => Assassinate - Heavy Escort.xml} (85%) rename MekHQ/data/scenariotemplates/{Destroy Grounded Dropship - Heavy.xml => Destroy Grounded Dropship - Deep Raid.xml} (98%) diff --git a/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml b/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml index 13aaa1f6a4..f158c73144 100644 --- a/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml +++ b/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml @@ -143,5 +143,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Assassinate - Heavy.xml b/MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml similarity index 85% rename from MekHQ/data/scenariotemplates/Assassinate - Heavy.xml rename to MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml index f7c13098f9..43caa3ebc3 100644 --- a/MekHQ/data/scenariotemplates/Assassinate - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml @@ -1,6 +1,6 @@ - Assassinate - Heavy + Assassinate - Heavy Escort Eliminate the designated target. Destroy the designated target, or disable it while routing any escorts. The target cannot be allowed to leave the battlefield. @@ -143,5 +143,32 @@ true None + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + diff --git a/MekHQ/data/scenariotemplates/Capture - Frontline.xml b/MekHQ/data/scenariotemplates/Capture - Frontline.xml index 8f2ffcea9e..b6d942adcd 100644 --- a/MekHQ/data/scenariotemplates/Capture - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Capture - Frontline.xml @@ -1,6 +1,6 @@ - Capture - Heavy + Capture - Frontline Capture the designated target. Capture the designated target by disabling their unit and routing their escorts or by forcing an ejection and picking up the ejected individual. The capture target diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml similarity index 98% rename from MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml rename to MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml index 10dc9faba8..ef29feb0af 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml @@ -95,7 +95,7 @@ 11 0 false - false + true true false false @@ -107,7 +107,7 @@ 2 1.0 Dropship - 3 + 2 3 4 0 diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml index ea9736b17b..8d26d8f156 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml +++ b/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml @@ -2,8 +2,7 @@ Destroy Grounded Dropship - Interception Destroy grounded hostile dropship. - Destroy or cripple a grounded enemy dropship. You have 30 turns to do so - before it lifts off. + Destroy or cripple a grounded enemy dropship. You have 30 turns to do so 9,before it lifts off. false false @@ -95,7 +94,7 @@ 11 0 false - false + true true false false @@ -107,7 +106,7 @@ 2 1.0 Dropship - 3 + 2 3 4 0 diff --git a/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml b/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml index 1e86b0ebf2..6acf1e31ca 100644 --- a/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml @@ -1,6 +1,6 @@ - Irregular Forces - Heavy + Irregular Forces - Frontline Destroy enemy infantry and irregular forces, and their support. Hostile infantry and irregular forces are being supported by military units. Engage and destroy. diff --git a/MekHQ/data/scenariotemplates/ScenarioManifest.xml b/MekHQ/data/scenariotemplates/ScenarioManifest.xml index 206aed9ec5..11af73ebef 100644 --- a/MekHQ/data/scenariotemplates/ScenarioManifest.xml +++ b/MekHQ/data/scenariotemplates/ScenarioManifest.xml @@ -106,7 +106,7 @@ 26 - Assassinate - Frontline.xml + Assassinate - Heavy Escort.xml 27 From 67c3fd16bb59e521018ad07bcf0136ff0e7e2f1c Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 21:53:19 -0500 Subject: [PATCH 04/22] Delete outdated scenario templates and update existing ones Removed outdated scenario templates, including "Allied Facility" and "Recon." Updated names and descriptions for existing templates to improve clarity and match current mission objectives. Improved detailed briefings for better mission guidance. --- .../scenariotemplates/Allied Facility.xml | 191 ----------------- MekHQ/data/scenariotemplates/Annihilation.xml | 116 ++++++++++ ...inate - Frontier.xml => Assassination.xml} | 11 +- ...ility - Frontline.xml => Base Defense.xml} | 6 +- ...ugh - Picket Line.xml => Breakthrough.xml} | 36 +--- ...{Air Support.xml => Close Air Support.xml} | 7 +- ...scort - Frontier.xml => Convoy Escort.xml} | 6 +- ...- Critical.xml => Convoy Interdiction.xml} | 7 +- ...ttack - Disruption.xml => Convoy Raid.xml} | 7 +- ...e - Heavy Escort.xml => Covert Strike.xml} | 7 +- ...ritical.xml => Critical Convoy Escort.xml} | 6 +- ...y - Diversion.xml => Decoy Engagement.xml} | 33 +-- ...nterception.xml => Decoy Interception.xml} | 6 +- ... - Deep Raid.xml => Deep Raid Defense.xml} | 7 +- ...Dropship - Deep Raid.xml => Deep Raid.xml} | 39 +--- .../scenariotemplates/Diversion - Decoy.xml | 10 +- .../Diversion - Interception.xml | 7 +- ...p - Interception.xml => DropShip Raid.xml} | 38 +--- ...ontline.xml => Frontier Assassination.xml} | 97 ++++----- ...ontline.xml => Frontline Breakthrough.xml} | 36 +--- ...Frontline.xml => Frontline Disruption.xml} | 6 +- ...Frontline.xml => Frontline Engagement.xml} | 6 +- ...rontline.xml => Frontline VIP Capture.xml} | 8 +- ...on - Heavy.xml => Heavy Recon Evasion.xml} | 6 +- .../scenariotemplates/Hostile Facility.xml | 6 +- ...akthrough.xml => Interception Defense.xml} | 6 +- ...ntline.xml => Irregular Force Assault.xml} | 7 +- ...er.xml => Irregular Force Suppression.xml} | 7 +- ...tion.xml => Isolated DropShip Defense.xml} | 7 +- ...n.xml => Low-Atmosphere Air Intercept.xml} | 6 +- ...ml => Low-Atmosphere DropShip Assault.xml} | 6 +- ...xml => Low-Atmosphere DropShip Escort.xml} | 6 +- ...le - Skirmish.xml => Minor Engagement.xml} | 6 +- .../Picket Line Breakthrough.xml | 140 ++++++++++++ .../data/scenariotemplates/Pivotal Battle.xml | 6 +- .../data/scenariotemplates/Recon Evasion.xml | 121 +++++++++++ MekHQ/data/scenariotemplates/Recon.xml | 181 ---------------- ...on.xml => Reconnaissance Interdiction.xml} | 9 +- .../scenariotemplates/Remote VIP Capture.xml | 200 ++++++++++++++++++ ...- Skirmish.xml => Skirmish Disruption.xml} | 6 +- MekHQ/data/scenariotemplates/Skirmish.xml | 143 +++++++++++++ ...tion.xml => Space Aerospace Intercept.xml} | 6 +- ... Run Escort.xml => Space Blockade Run.xml} | 6 +- ...e Run.xml => Space DropShip Intercept.xml} | 6 +- .../{Pursuit.xml => Tactical Withdrawal.xml} | 6 +- ...Capture - Frontier.xml => VIP Capture.xml} | 8 +- 46 files changed, 888 insertions(+), 706 deletions(-) delete mode 100644 MekHQ/data/scenariotemplates/Allied Facility.xml create mode 100644 MekHQ/data/scenariotemplates/Annihilation.xml rename MekHQ/data/scenariotemplates/{Assassinate - Frontier.xml => Assassination.xml} (94%) rename MekHQ/data/scenariotemplates/{Allied Facility - Frontline.xml => Base Defense.xml} (95%) rename MekHQ/data/scenariotemplates/{Breakthrough - Picket Line.xml => Breakthrough.xml} (78%) rename MekHQ/data/scenariotemplates/{Air Support.xml => Close Air Support.xml} (95%) rename MekHQ/data/scenariotemplates/{Convoy Escort - Frontier.xml => Convoy Escort.xml} (95%) rename MekHQ/data/scenariotemplates/{Convoy Attack - Critical.xml => Convoy Interdiction.xml} (95%) rename MekHQ/data/scenariotemplates/{Convoy Attack - Disruption.xml => Convoy Raid.xml} (95%) rename MekHQ/data/scenariotemplates/{Assassinate - Heavy Escort.xml => Covert Strike.xml} (94%) rename MekHQ/data/scenariotemplates/{Convoy Escort - Critical.xml => Critical Convoy Escort.xml} (95%) rename MekHQ/data/scenariotemplates/{Decoy - Diversion.xml => Decoy Engagement.xml} (83%) rename MekHQ/data/scenariotemplates/{Decoy - Interception.xml => Decoy Interception.xml} (95%) rename MekHQ/data/scenariotemplates/{Defend Grounded Dropship - Deep Raid.xml => Deep Raid Defense.xml} (96%) rename MekHQ/data/scenariotemplates/{Destroy Grounded Dropship - Deep Raid.xml => Deep Raid.xml} (84%) rename MekHQ/data/scenariotemplates/{Destroy Grounded Dropship - Interception.xml => DropShip Raid.xml} (84%) rename MekHQ/data/scenariotemplates/{Hostile Facility - Frontline.xml => Frontier Assassination.xml} (79%) rename MekHQ/data/scenariotemplates/{Breakthrough - Frontline.xml => Frontline Breakthrough.xml} (78%) rename MekHQ/data/scenariotemplates/{Harass - Frontline.xml => Frontline Disruption.xml} (94%) rename MekHQ/data/scenariotemplates/{Battle - Frontline.xml => Frontline Engagement.xml} (93%) rename MekHQ/data/scenariotemplates/{Capture - Frontline.xml => Frontline VIP Capture.xml} (95%) rename MekHQ/data/scenariotemplates/{Recon - Heavy.xml => Heavy Recon Evasion.xml} (95%) rename MekHQ/data/scenariotemplates/{Prevent Breakthrough.xml => Interception Defense.xml} (96%) rename MekHQ/data/scenariotemplates/{Irregular Forces - Frontline.xml => Irregular Force Assault.xml} (96%) rename MekHQ/data/scenariotemplates/{Irregular Forces - Frontier.xml => Irregular Force Suppression.xml} (96%) rename MekHQ/data/scenariotemplates/{Defend Grounded Dropship - Interception.xml => Isolated DropShip Defense.xml} (95%) rename MekHQ/data/scenariotemplates/{Low Atmo - Interception.xml => Low-Atmosphere Air Intercept.xml} (94%) rename MekHQ/data/scenariotemplates/{Low Atmo - Destroy Dropship.xml => Low-Atmosphere DropShip Assault.xml} (95%) rename MekHQ/data/scenariotemplates/{Low Atmo - Escort.xml => Low-Atmosphere DropShip Escort.xml} (96%) rename MekHQ/data/scenariotemplates/{Battle - Skirmish.xml => Minor Engagement.xml} (94%) create mode 100644 MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml create mode 100644 MekHQ/data/scenariotemplates/Recon Evasion.xml delete mode 100644 MekHQ/data/scenariotemplates/Recon.xml rename MekHQ/data/scenariotemplates/{Prevent Recon.xml => Reconnaissance Interdiction.xml} (93%) create mode 100644 MekHQ/data/scenariotemplates/Remote VIP Capture.xml rename MekHQ/data/scenariotemplates/{Harass - Skirmish.xml => Skirmish Disruption.xml} (95%) create mode 100644 MekHQ/data/scenariotemplates/Skirmish.xml rename MekHQ/data/scenariotemplates/{Space - Interception.xml => Space Aerospace Intercept.xml} (94%) rename MekHQ/data/scenariotemplates/{Space - Blockade Run Escort.xml => Space Blockade Run.xml} (95%) rename MekHQ/data/scenariotemplates/{Space - Blockade Run.xml => Space DropShip Intercept.xml} (95%) rename MekHQ/data/scenariotemplates/{Pursuit.xml => Tactical Withdrawal.xml} (95%) rename MekHQ/data/scenariotemplates/{Capture - Frontier.xml => VIP Capture.xml} (95%) diff --git a/MekHQ/data/scenariotemplates/Allied Facility.xml b/MekHQ/data/scenariotemplates/Allied Facility.xml deleted file mode 100644 index 232f7d7e9e..0000000000 --- a/MekHQ/data/scenariotemplates/Allied Facility.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - Allied Facility - Allied facility - An allied facility has come under attack. - false - true - - - ColdFacility - HotFacility - TemperateFacility - - false - 0 - 0 - 5 - SpecificGroundTerrain - true - 5 - - - - Base Turrets - - -1 - false - 7 - 0 - false - true - true - true - false - - 10 - - 5 - 0 - 1 - 1.0 - Base Turrets - 2 - 4 - 4 - 0 - - 50 - 0 - None - false - - - - Player - - -1 - false - -2 - 0 - true - true - true - true - false - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - 5 - 0 - 0 - 1.0 - Player - 0 - 1 - 4 - 0 - - 50 - 0 - None - false - - - - Primary Opfor - - -1 - false - -2 - 0 - true - false - true - false - false - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - - 5 - 0 - 2 - 1.0 - Primary Opfor - 1 - 5 - 4 - 1 - - 50 - 0 - None - false - - - - - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy or rout 50% of the attacking force(s): - NONE - ForceWithdraw - 50 - true - None - - - - Base Turrets - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 25% of the following force(s) and unit(s): - NONE - Preserve - 25 - true - None - - - diff --git a/MekHQ/data/scenariotemplates/Annihilation.xml b/MekHQ/data/scenariotemplates/Annihilation.xml new file mode 100644 index 0000000000..51f9feb88b --- /dev/null +++ b/MekHQ/data/scenariotemplates/Annihilation.xml @@ -0,0 +1,116 @@ + + + Annihilation + Obliterate the enemy force. + The mission objective is total destruction. Eliminate 95% of enemy forces to secure victory. Your casualties are not a factor in this high-intensity engagement. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.0 + Primary Opfor + 1 + 5 + 4 + 2 + 50 + 0 + OppositeEdge + Player + false + + + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 95% of the following force(s) and unit(s): + NONE + ForceWithdraw + 95 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml b/MekHQ/data/scenariotemplates/Assassination.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Assassinate - Frontier.xml rename to MekHQ/data/scenariotemplates/Assassination.xml index f158c73144..802b823383 100644 --- a/MekHQ/data/scenariotemplates/Assassinate - Frontier.xml +++ b/MekHQ/data/scenariotemplates/Assassination.xml @@ -1,9 +1,8 @@ - Assassinate - Frontier - Eliminate the designated target. - Destroy the designated target, or disable it while routing any escorts. The - target cannot be allowed to leave the battlefield. + Assassination + Eliminate VIP, minimize own losses. + A high-value enemy target is attempting to escape the battlefield. Your mission is to locate and destroy the VIP before they can flee. Ensure that at least 50% of your forces remain operational while carrying out the assassination. false @@ -85,7 +84,7 @@ - Designated Target + VIP -1 false @@ -118,7 +117,7 @@ - Designated Target + VIP diff --git a/MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml b/MekHQ/data/scenariotemplates/Base Defense.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml rename to MekHQ/data/scenariotemplates/Base Defense.xml index 5285c33f67..d30a9ecfb5 100644 --- a/MekHQ/data/scenariotemplates/Allied Facility - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Base Defense.xml @@ -1,8 +1,8 @@ - Allied Facility - Frontline - Allied facility - An allied facility has come under attack. + Base Defense + Defend allied facility, minimize damage. + An allied facility is under heavy assault. Your mission is to defend the base and prevent it from falling. Preserve at least 25% of the base infrastructure while neutralizing enemy forces. Success requires destroying at least 50% of the attacking enemy units. false true diff --git a/MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml b/MekHQ/data/scenariotemplates/Breakthrough.xml similarity index 78% rename from MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml rename to MekHQ/data/scenariotemplates/Breakthrough.xml index 6b42663789..95a3c6e815 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough - Picket Line.xml +++ b/MekHQ/data/scenariotemplates/Breakthrough.xml @@ -1,8 +1,8 @@ - Breakthrough - Picket Line - Break through blocking hostile force. - Break through to the opposite edge of the map or rout the hostile force. + Breakthrough + Break through or destroy enemy. + The objective is to break through enemy lines and reach the opposite edge of the map. At least 50% of your forces must reach the destination, with only fully operational units counting. Alternatively, destroy at least 50% of the enemy forces to complete the mission. true @@ -76,36 +76,6 @@ false - - Reinforcements - - -1 - false - -2 - -3 - true - false - false - false - false - - 5 - 0 - 0 - 1.0 - Reinforcements - 0 - 1 - 4 - 1 - - 50 - 0 - OppositeEdge - Player - false - - diff --git a/MekHQ/data/scenariotemplates/Air Support.xml b/MekHQ/data/scenariotemplates/Close Air Support.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Air Support.xml rename to MekHQ/data/scenariotemplates/Close Air Support.xml index 88a1b23c60..82b81eea36 100644 --- a/MekHQ/data/scenariotemplates/Air Support.xml +++ b/MekHQ/data/scenariotemplates/Close Air Support.xml @@ -1,9 +1,8 @@ - Air Support - Provide air support. - Provide air support for allied ground units. Keep at least half of the allied - units alive. + Close Air Support + Provide air support, minimize losses. + Provide air support to allied ground forces under heavy attack. Prioritize minimizing casualties while neutralizing enemy units. Expect anti-air defenses. Success depends on keeping at least 50% of allies alive and destroying half of the enemy force. false diff --git a/MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml b/MekHQ/data/scenariotemplates/Convoy Escort.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml rename to MekHQ/data/scenariotemplates/Convoy Escort.xml index 3972f54c71..8bc7c1282e 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort - Frontier.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort.xml @@ -1,8 +1,8 @@ - Convoy Escort - Frontier - Protect an allied supply convoy. - Escort the allied convoy across the map or rout the attacking force. + Convoy Escort + Escort supply convoy or defeat attackers. + An allied convoy carrying standard supplies must be escorted through hostile territory. Ensure that at least 50% of the convoy reaches its destination. Crippled units only count if the enemy force is routed. Alternatively, destroy 50% of enemy forces while preserving 50% of friendly forces. false false diff --git a/MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml rename to MekHQ/data/scenariotemplates/Convoy Interdiction.xml index 3a23f789af..204f0061d3 100644 --- a/MekHQ/data/scenariotemplates/Convoy Attack - Critical.xml +++ b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml @@ -1,9 +1,8 @@ - Convoy Attack - Critical - Attack on an enemy supply convoy. - Prevent 50% of the convoy units from crossing the far edge of the map. The - convoy will surrender if 50% of the escorts are destroyed or routed. + Convoy Interdiction + Intercept and neutralize enemy convoy. + An enemy convoy transporting critical supplies must be stopped. At least 50% of the convoy units must be prevented from reaching the far edge of the map. The convoy will surrender if 50% of its escorts are destroyed or routed. At least 50% of friendly forces must remain operational. false diff --git a/MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml rename to MekHQ/data/scenariotemplates/Convoy Raid.xml index 30708e830e..8f7b5dd672 100644 --- a/MekHQ/data/scenariotemplates/Convoy Attack - Disruption.xml +++ b/MekHQ/data/scenariotemplates/Convoy Raid.xml @@ -1,9 +1,8 @@ - Convoy Attack - Disruption - Attack on an enemy supply convoy. - Prevent 50% of the convoy units from crossing the far edge of the map. The - convoy will surrender if 50% of the escorts are destroyed or routed. + Convoy Raid + Intercept and disrupt enemy convoy. + An enemy convoy carrying standard supplies is moving through the area. The objective is to prevent at least 50% of the convoy units from reaching the far edge of the map. The convoy will surrender if 50% of its escorts are destroyed or routed. Preserve 50% of friendly forces. false diff --git a/MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml b/MekHQ/data/scenariotemplates/Covert Strike.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml rename to MekHQ/data/scenariotemplates/Covert Strike.xml index 43caa3ebc3..66bc6f6f83 100644 --- a/MekHQ/data/scenariotemplates/Assassinate - Heavy Escort.xml +++ b/MekHQ/data/scenariotemplates/Covert Strike.xml @@ -1,9 +1,8 @@ - Assassinate - Heavy Escort - Eliminate the designated target. - Destroy the designated target, or disable it while routing any escorts. The - target cannot be allowed to leave the battlefield. + Covert Strike + Eliminate VIP behind enemy lines. + A high-value enemy target, heavily guarded by an elite escort, has been identified deep behind enemy lines. The objective is to break through their defenses and eliminate the VIP before they escape. Expect strong resistance, and ensure 50% of your forces survive to complete the mission. false diff --git a/MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml rename to MekHQ/data/scenariotemplates/Critical Convoy Escort.xml index f7ebb732f8..a6d18b58b7 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort - Critical.xml +++ b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml @@ -1,8 +1,8 @@ - Convoy Escort - Critical - Protect an allied supply convoy. - Escort the allied convoy across the map or rout the attacking force. + Critical Convoy Escort + Escort critical convoy or defeat attackers. + A convoy carrying vital supplies must be escorted through hostile territory. Ensure that at least 50% of the convoy reaches its destination. Crippled units only count if the enemy force is routed. Alternatively, destroy 50% of enemy forces while preserving 50% of friendly forces. false false diff --git a/MekHQ/data/scenariotemplates/Decoy - Diversion.xml b/MekHQ/data/scenariotemplates/Decoy Engagement.xml similarity index 83% rename from MekHQ/data/scenariotemplates/Decoy - Diversion.xml rename to MekHQ/data/scenariotemplates/Decoy Engagement.xml index d424c34a69..e1999f4d82 100644 --- a/MekHQ/data/scenariotemplates/Decoy - Diversion.xml +++ b/MekHQ/data/scenariotemplates/Decoy Engagement.xml @@ -1,8 +1,8 @@ - Decoy - Diversion - Engage enemy force. - Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + Decoy Engagement + Engage enemy, act as decoy. + Engage enemy forces for the specified duration to distract them. Alternatively, victory can be achieved by defeating 75% of the opposing force. Your losses are not a concern in this mission, as the primary objective is to serve as a decoy and occupy enemy attention. false @@ -140,32 +140,5 @@ true None - - - Player - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - true - None - diff --git a/MekHQ/data/scenariotemplates/Decoy - Interception.xml b/MekHQ/data/scenariotemplates/Decoy Interception.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Decoy - Interception.xml rename to MekHQ/data/scenariotemplates/Decoy Interception.xml index 347c46cbf9..82d67f9982 100644 --- a/MekHQ/data/scenariotemplates/Decoy - Interception.xml +++ b/MekHQ/data/scenariotemplates/Decoy Interception.xml @@ -1,8 +1,8 @@ - Decoy - Interception - Engage enemy force. - Engage enemy forces for the specified duration, or defeat 75% of the opposing force. + Decoy Interception + Intercept enemy, act as decoy. + Intercept enemy forces to draw them away from their objective. Maintain engagement for the specified duration or defeat 75% of the opposing force. Your losses are not a factor, as the mission's goal is to act as a decoy and divert the enemy's attention. false diff --git a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml similarity index 96% rename from MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml rename to MekHQ/data/scenariotemplates/Deep Raid Defense.xml index 0f6533a69e..7764908527 100644 --- a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml @@ -1,9 +1,8 @@ - Defend Grounded Dropship - Deep Raid - Defend grounded dropship. - Prevent a grounded dropship from becoming crippled. You have 30 turns to do so - before it lifts off. + Deep Raid Defense + Defend grounded DropShip from raid. + An enemy raid deep behind friendly lines is targeting a grounded DropShip. Protect it for 30 turns until liftoff, ensuring it does not become crippled. Defeat at least 50% of the enemy raiders while preserving 50% of your forces during the defense. false false diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml similarity index 84% rename from MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml rename to MekHQ/data/scenariotemplates/Deep Raid.xml index ef29feb0af..c37e65877a 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -1,9 +1,8 @@ - Destroy Grounded Dropship - Deep Raid - Destroy grounded hostile dropship. - Destroy or cripple a grounded enemy dropship. You have 30 turns to do so - before it lifts off. + Deep Raid + Destroy or cripple enemy DropShip. + A grounded enemy DropShip must be destroyed or crippled within 30 turns before it lifts off. This raid takes place deep behind enemy lines, and the DropShip’s defenders are not important. Preserve 50% of your forces during the operation to ensure mission success. false false @@ -130,14 +129,14 @@ ScenarioVictory Fixed - 2 + 1 ScenarioDefeat Fixed - 2 + 1 @@ -151,34 +150,6 @@ true Fixed - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy, cripple or force to withdraw 50% of the following force(s) and - unit(s): - NONE - ForceWithdraw - 50 - true - None - Player diff --git a/MekHQ/data/scenariotemplates/Diversion - Decoy.xml b/MekHQ/data/scenariotemplates/Diversion - Decoy.xml index e832633f8a..58b9861315 100644 --- a/MekHQ/data/scenariotemplates/Diversion - Decoy.xml +++ b/MekHQ/data/scenariotemplates/Diversion - Decoy.xml @@ -1,8 +1,8 @@ - Diversion - Decoy - Hostile force - A hostile force is attempting to delay your force from its objective. Destroy or bypass them quickly. + Diversion Engagement + Bypass or destroy diversionary force. + An enemy diversionary force is attempting to delay your advance to draw attention away from their main objective. Destroy or bypass them quickly. Ensure that at least 50% of your forces reach the destination edge, or destroy 75% of the enemy forces to complete the mission. false @@ -128,10 +128,10 @@ - Destroy or rout 50% the following force(s) and unit(s): + Destroy or rout 75% the following force(s) and unit(s): NONE Destroy - 50 + 75 0 true None diff --git a/MekHQ/data/scenariotemplates/Diversion - Interception.xml b/MekHQ/data/scenariotemplates/Diversion - Interception.xml index 83309e34ce..0aae07acb8 100644 --- a/MekHQ/data/scenariotemplates/Diversion - Interception.xml +++ b/MekHQ/data/scenariotemplates/Diversion - Interception.xml @@ -1,9 +1,8 @@ - Diversion - Interception - Hostile force - A hostile force is attempting to delay your force from its objective. Destroy - or bypass them quickly. + Intercept Engagement + Break through or destroy intercepting force. + An enemy force has intercepted your unit, attempting to block your advance. You must either break through or destroy them quickly. Ensure that at least 50% of your forces reach the destination edge, or destroy 75% of the enemy forces to complete the mission. false diff --git a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml similarity index 84% rename from MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml rename to MekHQ/data/scenariotemplates/DropShip Raid.xml index 8d26d8f156..3bfc99d3db 100644 --- a/MekHQ/data/scenariotemplates/Destroy Grounded Dropship - Interception.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -1,8 +1,8 @@ - Destroy Grounded Dropship - Interception - Destroy grounded hostile dropship. - Destroy or cripple a grounded enemy dropship. You have 30 turns to do so 9,before it lifts off. + DropShip Raid + Destroy or cripple enemy DropShip. + An enemy dropship has been intercepted shortly after landing. You have 30 turns to destroy or cripple it before it can lift off. The defenders are not the priority. Preserve 50% of your forces to ensure mission success. false false @@ -129,14 +129,14 @@ ScenarioVictory Fixed - 2 + 1 ScenarioDefeat Fixed - 2 + 1 @@ -150,34 +150,6 @@ true Fixed - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy, cripple or force to withdraw 50% of the following force(s) and - unit(s): - NONE - ForceWithdraw - 50 - true - None - Player diff --git a/MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml b/MekHQ/data/scenariotemplates/Frontier Assassination.xml similarity index 79% rename from MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml rename to MekHQ/data/scenariotemplates/Frontier Assassination.xml index 232ccf359c..34111daab5 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Frontier Assassination.xml @@ -1,55 +1,19 @@ - Hostile Facility - Frontline - Hostile facility - A hostile-controlled facility has been located. - true + Frontier Assassination + Eliminate VIP, minimize own losses. + A remote, high-value enemy target is attempting to escape. With limited reinforcements, you must locate and destroy the VIP before they can vanish into the wilderness. Ensure that at least 50% of your forces remain intact during the mission. - - ColdFacility - HotFacility - TemperateFacility - + false 0 0 5 - SpecificGroundTerrain + AllGroundTerrain true 5 - - Base Turrets - - -1 - false - 7 - 0 - false - false - false - false - false - - 10 - - 5 - 0 - 2 - 1.0 - Base Turrets - 2 - 5 - 4 - 0 - - 50 - 0 - None - false - - Player @@ -63,6 +27,7 @@ true false + 0 1 2 3 @@ -72,6 +37,7 @@ 7 8 9 + 10 5 0 @@ -82,7 +48,6 @@ 1 4 0 - 50 0 None @@ -101,9 +66,7 @@ true false false - - 10 - + 5 0 2 @@ -111,12 +74,42 @@ Primary Opfor 1 5 + 3 + 1 + 50 + 0 + OppositeEdge + Player + false + + + + VIP + + -1 + false + -2 + 0 + true + false + false + false + false + + 5 + 1 + 2 + 1.0 + Designated Target + 3 + 5 4 - 2 - + 3 50 0 - None + false + OppositeEdge + Player false @@ -124,7 +117,7 @@ - Primary Opfor + VIP @@ -142,10 +135,10 @@ - Destroy or rout 75% of the defending force(s): + Destroy the following force(s) and unit(s): NONE - ForceWithdraw - 75 + Destroy + 100 true None diff --git a/MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml similarity index 78% rename from MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml rename to MekHQ/data/scenariotemplates/Frontline Breakthrough.xml index ece671ada1..fbf661287e 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml @@ -1,8 +1,8 @@ - Breakthrough - Frontline - Break through blocking hostile force. - Break through to the opposite edge of the map or rout the hostile force. + Frontline Breakthrough + Break through enemy battlelines. + The mission is to penetrate the main enemy battlelines and reach the opposite edge of the battlefield. At least 50% of your units, fully operational, must break through. Alternatively, victory can be achieved by destroying at least 50% of the enemy forces defending the line. true @@ -76,36 +76,6 @@ false - - Reinforcements - - -1 - false - -2 - -3 - true - false - false - false - false - - 5 - 0 - 0 - 1.0 - Reinforcements - 0 - 1 - 4 - 2 - - 50 - 0 - OppositeEdge - Player - false - - diff --git a/MekHQ/data/scenariotemplates/Harass - Frontline.xml b/MekHQ/data/scenariotemplates/Frontline Disruption.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Harass - Frontline.xml rename to MekHQ/data/scenariotemplates/Frontline Disruption.xml index 29e5797995..ad310a078c 100644 --- a/MekHQ/data/scenariotemplates/Harass - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Frontline Disruption.xml @@ -1,8 +1,8 @@ - Harass - Frontline - Harass a superior enemy force. - Prevent 50% of the hostile force from reaching the opposite map edge. + Frontline Disruption + Disrupt and delay frontline force. + A superior enemy force is advancing toward a critical objective. Your mission is to disrupt their advance, preventing at least 50% of their units from reaching the opposite map edge. Preserve at least 50% of your forces to ensure the success of this operation. false false diff --git a/MekHQ/data/scenariotemplates/Battle - Frontline.xml b/MekHQ/data/scenariotemplates/Frontline Engagement.xml similarity index 93% rename from MekHQ/data/scenariotemplates/Battle - Frontline.xml rename to MekHQ/data/scenariotemplates/Frontline Engagement.xml index 1b63801e28..dec15838ef 100644 --- a/MekHQ/data/scenariotemplates/Battle - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Frontline Engagement.xml @@ -1,8 +1,8 @@ - Battle - Frontline - Stand-up fight - Engage and destroy or rout any enemy forces present. + Frontline Engagement + Engage and destroy enemy at the front. + Enemy forces are actively engaging along the frontline. The objective is to either destroy or force them to retreat. At least 50% of the enemy must be neutralized, while maintaining 50% of friendly forces to hold the line and secure the frontline position. false diff --git a/MekHQ/data/scenariotemplates/Capture - Frontline.xml b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Capture - Frontline.xml rename to MekHQ/data/scenariotemplates/Frontline VIP Capture.xml index b6d942adcd..3954974673 100644 --- a/MekHQ/data/scenariotemplates/Capture - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml @@ -1,10 +1,8 @@ - Capture - Frontline - Capture the designated target. - Capture the designated target by disabling their unit and routing their - escorts or by forcing an ejection and picking up the ejected individual. The capture target - must remain alive and cannot be allowed to escape the battlefield. + Frontline VIP Capture + Capture VIP in a frontline location. + The VIP is stationed in a heavily defended frontline position. Your objective is to capture them by disabling their unit or forcing an ejection, then securing the individual. The VIP cannot be allowed to escape. Preserve 50% of your forces and destroy at least 50% of the VIP’s bodyguards. false diff --git a/MekHQ/data/scenariotemplates/Recon - Heavy.xml b/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Recon - Heavy.xml rename to MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml index abc3153665..1a4a4123a1 100644 --- a/MekHQ/data/scenariotemplates/Recon - Heavy.xml +++ b/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml @@ -1,8 +1,8 @@ - Recon - Heavy - Identify enemy units. - Conduct detailed scans on all enemy units present on the battlefield. + Heavy Recon Evasion + Evade patrols while scanning enemy heavies. + Enemy patrols are active, and your mission is to scan the enemy’s heavy units. Survive for the duration of the scan without being detected. Preserve at least 50% of your forces until the turn limit is reached to ensure mission success. false false diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index 5219a5af75..1abb905f83 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -1,8 +1,8 @@ - Hostile Facility - Hostile facility - A hostile-controlled facility has been located. + Facility Assault + Assault and weaken enemy-held facility. + An enemy-controlled facility has been located, and your mission is to assault it. Destroy at least 75% of the defending forces while preserving at least 50% of your own forces to weaken the facility’s defenses and secure the area. true diff --git a/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml b/MekHQ/data/scenariotemplates/Interception Defense.xml similarity index 96% rename from MekHQ/data/scenariotemplates/Prevent Breakthrough.xml rename to MekHQ/data/scenariotemplates/Interception Defense.xml index 8c0405ab13..05e5091260 100644 --- a/MekHQ/data/scenariotemplates/Prevent Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Interception Defense.xml @@ -1,8 +1,8 @@ - Prevent Breakthrough - Prevent a hostile breakthrough. - Prevent enemy units from crossing the far edge of the map. + Interception Defense + Stop enemy from reaching the edge. + Prevent enemy units from crossing the far edge of the map. Destroy at least 50% of their forces before they can reach the target board edge. Preserve 50% of your own forces to ensure a successful defense. false false diff --git a/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml similarity index 96% rename from MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml rename to MekHQ/data/scenariotemplates/Irregular Force Assault.xml index 6acf1e31ca..5db66f5b28 100644 --- a/MekHQ/data/scenariotemplates/Irregular Forces - Frontline.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml @@ -1,9 +1,8 @@ - Irregular Forces - Frontline - Destroy enemy infantry and irregular forces, and their support. - Hostile infantry and irregular forces are being supported by military units. - Engage and destroy. + Irregular Force Assault + Engage infantry supported by frontline forces. + Hostile infantry and irregular forces are receiving support from frontline military units. Your mission is to engage and destroy at least 50% of the combined enemy forces. Preserve at least 50% of your own forces to achieve mission success. false false diff --git a/MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml similarity index 96% rename from MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml rename to MekHQ/data/scenariotemplates/Irregular Force Suppression.xml index 6a36ea12d0..7aeb61b765 100644 --- a/MekHQ/data/scenariotemplates/Irregular Forces - Frontier.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml @@ -1,9 +1,8 @@ - Irregular Forces - Frontier - Destroy enemy infantry and irregular forces, and their support. - Hostile infantry and irregular forces are being supported by military units. - Engage and destroy. + Irregular Force Suppression + Engage and defeat irregular-supported force. + Hostile irregular forces are being supported by military units in the area. Your mission is to engage and defeat at least 50% of the combined enemy forces. Preserve at least 50% of your own forces to ensure a successful operation. false false diff --git a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml rename to MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index 6cf2de5629..c4c566522d 100644 --- a/MekHQ/data/scenariotemplates/Defend Grounded Dropship - Interception.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -1,9 +1,8 @@ - Defend Grounded Dropship - Interception - Defend grounded dropship. - Prevent a grounded dropship from becoming crippled. You have 30 turns to do so - before it lifts off. + Isolated DropShip Defense + Defend isolated DropShip from interception. + A DropShip has been intercepted shortly after landing and is isolated behind enemy lines. Defend it for 30 turns until it can lift off, preventing it from being crippled. Defeat at least 50% of the attacking forces while preserving 50% of your own units during the engagement. false false diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Low Atmo - Interception.xml rename to MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml index 4d28c8847b..99d79ca5e1 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Interception.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml @@ -1,8 +1,8 @@ - Low Atmo - Interception - Hostile aircraft on approach. Intercept and destroy. - Destroy or cripple 50% of hostile aircraft. + Low-Atmosphere Air Intercept + Intercept and destroy hostile air forces. + Hostile air units are on approach in low atmosphere. Intercept and destroy at least 50% of the enemy force while preserving 50% of your own units. Swift action is essential to prevent the enemy from achieving their objective. false diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml rename to MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml index c22fa632d8..9e49683b5c 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Destroy Dropship.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml @@ -1,8 +1,8 @@ - Low Atmo - Destroy Dropship - Enemy dropship detected. Destroy it before it escapes. - Destroy the hostile dropship before it is able to escape. + Low-Atmosphere DropShip Assault + Destroy DropShip before it escape. + A hostile DropShip is attempting to escape in low atmosphere. Your mission is to destroy the DropShip before it can break free. Preserve at least 50% of your forces to ensure operational integrity during the assault. false diff --git a/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml similarity index 96% rename from MekHQ/data/scenariotemplates/Low Atmo - Escort.xml rename to MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index a4c6905f0c..454a03a449 100644 --- a/MekHQ/data/scenariotemplates/Low Atmo - Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -1,8 +1,8 @@ - Low Atmo - Escort - Escort allied dropship. - Escort designated dropship to its destination. + Low-Atmosphere DropShip Escort + Escort DropShip, defeat enemy forces. + Escort the designated DropShip to its destination through low atmosphere. Ensure the DropShip survives while defeating at least 50% of enemy forces. Preserve 50% of your own forces to secure mission success. false false diff --git a/MekHQ/data/scenariotemplates/Battle - Skirmish.xml b/MekHQ/data/scenariotemplates/Minor Engagement.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Battle - Skirmish.xml rename to MekHQ/data/scenariotemplates/Minor Engagement.xml index 0467389186..afb5477854 100644 --- a/MekHQ/data/scenariotemplates/Battle - Skirmish.xml +++ b/MekHQ/data/scenariotemplates/Minor Engagement.xml @@ -1,8 +1,8 @@ - Battle - Skirmish - Stand-up fight - Engage and destroy or rout any enemy forces present. + Minor Engagement + Engage and destroy enemy forces. + Enemy forces are present in the area. The mission objective is to engage and either destroy or rout them. A minimum of 50% of the enemy forces must be eliminated, while at least 50% of friendly forces must remain combat-effective to achieve success. false diff --git a/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml b/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml new file mode 100644 index 0000000000..8cb83ebd27 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml @@ -0,0 +1,140 @@ + + + Picket Line Breakthrough + Break through enemy picket line. + The objective is to breach the enemy's picket line and reach the far side of the battlefield. At least 50% of your operational units must make it through. Alternatively, you can secure victory by destroying at least 50% of the enemy forces holding the picket line. + + + true + 50 + 17 + 0 + AllGroundTerrain + false + 1 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 11 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + false + false + true + false + false + + 10 + + 5 + 0 + 2 + 1.5 + Primary Opfor + 1 + 5 + 3 + 1 + + 50 + 0 + None + false + + + + + + + Player + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Crippled units do not count towards this objective. + + Reach the destination edge with 50% of the following force(s) and unit(s): + NONE + ReachMapEdge + 50 + 0 + true + None + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% the following force(s) and unit(s): + NONE + Destroy + 50 + 0 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Pivotal Battle.xml b/MekHQ/data/scenariotemplates/Pivotal Battle.xml index ea8286c75f..836bcd52d7 100644 --- a/MekHQ/data/scenariotemplates/Pivotal Battle.xml +++ b/MekHQ/data/scenariotemplates/Pivotal Battle.xml @@ -1,8 +1,8 @@ - Pivotal Battle - Stand-up fight - Engage and destroy or rout any enemy forces present. + Pivotal Engagement + Decisive battle—defeat enemy forces. + This is a pivotal battle. The objective is to defeat 75% of enemy units while keeping at least 25% of your forces operational. Success in this critical engagement is essential for the overall campaign. false diff --git a/MekHQ/data/scenariotemplates/Recon Evasion.xml b/MekHQ/data/scenariotemplates/Recon Evasion.xml new file mode 100644 index 0000000000..be1abd4b93 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Recon Evasion.xml @@ -0,0 +1,121 @@ + + + Recon Evasion + Evade patrols until scan is complete. + Enemy patrols are sweeping the area, and your forces need to evade detection until scans of the enemy are complete. Survive for the turn limit while preserving at least 50% of your forces to ensure success. + false + false + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.5 + Primary Opfor + 1 + 5 + 2 + 1 + + 25 + 0 + OppositeEdge + Player + false + + + + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + false + 2 + ScaledToPrimaryUnitCount + + + diff --git a/MekHQ/data/scenariotemplates/Recon.xml b/MekHQ/data/scenariotemplates/Recon.xml deleted file mode 100644 index 8e0782ea1a..0000000000 --- a/MekHQ/data/scenariotemplates/Recon.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - Recon - Identify enemy units. - Conduct detailed scans on all enemy units present on the battlefield. - false - false - - - false - 0 - 0 - 5 - AllGroundTerrain - true - 5 - - - - Player - - -1 - false - -2 - 0 - true - true - true - true - false - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - 5 - 0 - 0 - 1.0 - Player - 0 - 1 - 4 - 0 - - 50 - 0 - None - false - - - - Primary Opfor - - -1 - false - -2 - 0 - true - false - true - false - false - - 5 - 0 - 2 - 1.0 - Primary Opfor - 1 - 5 - 4 - 1 - - 25 - 0 - OppositeEdge - Player - false - - - - - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Scans may be conducted by moving a unit within three hexes of the - target and foregoing all attacks. - Any kind of probe, improved sensors quirk or sensor geek SPA - extends the range to five hexes, and the unit may attack as normal. - Note: This objective should be tracked manually outside of - MegaMek. - - Scan the following enemy unit(s) and force(s): - NONE - Custom - 100 - true - None - - - - Primary Opfor - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Destroy or rout 50% of the following force(s) and unit(s): - NONE - ForceWithdraw - 50 - true - None - - - - Player - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - true - None - - - diff --git a/MekHQ/data/scenariotemplates/Prevent Recon.xml b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml similarity index 93% rename from MekHQ/data/scenariotemplates/Prevent Recon.xml rename to MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml index a6bb54c719..4af989f234 100644 --- a/MekHQ/data/scenariotemplates/Prevent Recon.xml +++ b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml @@ -1,8 +1,8 @@ - Prevent Recon + Reconnaissance Interdiction Prevent hostile reconnaissance. - Destroy or rout 50% of the opposing force within the specified duration. + Hostile reconnaissance units are attempting to gather critical intelligence. Destroy or rout 50% of the opposing force within the specified time frame. Preserve at least 50% of your own forces to ensure the mission's success. false false @@ -109,13 +109,12 @@ - Destroy or rout the following enemy force(s) and unit(s): + Destroy or rout 50% of the following force(s) and unit(s): NONE ForceWithdraw 50 true - 2 - ScaledToPrimaryUnitCount + None diff --git a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml new file mode 100644 index 0000000000..708f787326 --- /dev/null +++ b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml @@ -0,0 +1,200 @@ + + + Remote VIP Capture + Capture VIP in remote area. + The VIP target is located in a remote area. Your mission is to capture them by disabling their unit or forcing an ejection, then securing the individual. The target must not escape. Preserve 50% of your forces and eliminate at least 50% of the VIP’s bodyguards. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.0 + Primary Opfor + 1 + 5 + 3 + 1 + 50 + 0 + OppositeEdge + Player + false + + + + Designated Target + + -1 + false + -2 + 0 + true + false + false + false + false + + 5 + 1 + 2 + 1.0 + Designated Target + 3 + 5 + 4 + 3 + 50 + 0 + false + OppositeEdge + Player + false + + + + + + + Designated Target + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 2 + + + + Capture the following force(s) and unit(s): + NONE + Capture + 100 + true + None + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + diff --git a/MekHQ/data/scenariotemplates/Harass - Skirmish.xml b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Harass - Skirmish.xml rename to MekHQ/data/scenariotemplates/Skirmish Disruption.xml index 14f02244db..66ddaca648 100644 --- a/MekHQ/data/scenariotemplates/Harass - Skirmish.xml +++ b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml @@ -1,8 +1,8 @@ - Harass - Skirmish - Harass a superior enemy force. - Prevent 50% of the hostile force from reaching the opposite map edge. + Skirmish Disruption + Disrupt and delay superior force. + A superior enemy force is advancing across the battlefield. Your mission is to disrupt their progress, preventing at least 50% of their units from reaching the opposite map edge. Preserve at least 50% of your forces to ensure a successful disruption. false false diff --git a/MekHQ/data/scenariotemplates/Skirmish.xml b/MekHQ/data/scenariotemplates/Skirmish.xml new file mode 100644 index 0000000000..eb9da1de9b --- /dev/null +++ b/MekHQ/data/scenariotemplates/Skirmish.xml @@ -0,0 +1,143 @@ + + + Minor Engagement + Skirmish with enemy forces. + Engage the enemy in a skirmish, focusing on inflicting damage while avoiding heavy losses. Defeat at least 25% of enemy forces while preserving 75% of your own. This is not a decisive battle, so maintaining force strength is critical. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + Primary Opfor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.0 + Primary Opfor + 1 + 5 + 3 + 1 + 50 + 0 + OppositeEdge + Player + false + + + + + + + Primary Opfor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 25% of the following force(s) and unit(s): + NONE + ForceWithdraw + 25 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 75% of the following force(s) and unit(s): + NONE + Preserve + 75 + true + None + + + diff --git a/MekHQ/data/scenariotemplates/Space - Interception.xml b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml similarity index 94% rename from MekHQ/data/scenariotemplates/Space - Interception.xml rename to MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml index 19ed1946f1..92ec93becd 100644 --- a/MekHQ/data/scenariotemplates/Space - Interception.xml +++ b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml @@ -1,8 +1,8 @@ - Space - Interception - Hostile aircraft on approach. Intercept and destroy. - Destroy or cripple 50% of hostile aircraft. + Space Aerospace Intercept + Intercept and destroy incoming aerospace units. + Hostile aerospace units are on approach in space. Your mission is to intercept and destroy at least 50% of the enemy forces. Preserve at least 50% of your own forces to ensure success in this space engagement. false false diff --git a/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml rename to MekHQ/data/scenariotemplates/Space Blockade Run.xml index 1512be5aa6..ae7d1beb5a 100644 --- a/MekHQ/data/scenariotemplates/Space - Blockade Run Escort.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -1,8 +1,8 @@ - Space - Blockade Run Escort - Break enemy blockade. - Escort an allied dropship attempting to run an enemy blockade. + Space Blockade Run + Break enemy blockade, escort allied DropShip. + An allied DropShip is attempting to run an enemy blockade in space. Your mission is to ensure the DropShip survives the run. Either destroy 50% of the enemy forces or break through the blockade while preserving 50% of your own forces. false false diff --git a/MekHQ/data/scenariotemplates/Space - Blockade Run.xml b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Space - Blockade Run.xml rename to MekHQ/data/scenariotemplates/Space DropShip Intercept.xml index dd97a4ccf2..4b70cb06c6 100644 --- a/MekHQ/data/scenariotemplates/Space - Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml @@ -1,8 +1,8 @@ - Space - Blockade Run - Enemy dropship detected. Prevent it from escaping. - Destroy or cripple the hostile dropship before it escapes. + Space DropShip Intercept + Prevent enemy DropShip escape. + An enemy DropShip has been detected in space, attempting to escape. Your mission is to destroy or severely damage the DropShip before it can flee. Preserve at least 50% of your forces during the engagement to ensure success. false false diff --git a/MekHQ/data/scenariotemplates/Pursuit.xml b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Pursuit.xml rename to MekHQ/data/scenariotemplates/Tactical Withdrawal.xml index a0edd2a6f0..e1642499a9 100644 --- a/MekHQ/data/scenariotemplates/Pursuit.xml +++ b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml @@ -1,8 +1,8 @@ - Pursuit - Escape superior pursuing enemy force. - Reach the far edge of the map or destroy 50% of the pursuing force. + Tactical Withdrawal + Escape superior enemy force. + A superior enemy force is in pursuit. Reach the far edge of the map with at least 50% of your fully functional units; critically damaged units do not count. Alternatively, destroy 50% of the pursuing force to secure your escape. false false diff --git a/MekHQ/data/scenariotemplates/Capture - Frontier.xml b/MekHQ/data/scenariotemplates/VIP Capture.xml similarity index 95% rename from MekHQ/data/scenariotemplates/Capture - Frontier.xml rename to MekHQ/data/scenariotemplates/VIP Capture.xml index 03c30a2035..d2af153efd 100644 --- a/MekHQ/data/scenariotemplates/Capture - Frontier.xml +++ b/MekHQ/data/scenariotemplates/VIP Capture.xml @@ -1,10 +1,8 @@ - Capture - Frontier - Capture the designated target. - Capture the designated target by disabling their unit and routing their - escorts or by forcing an ejection and picking up the ejected individual. The capture target - must remain alive and cannot be allowed to escape the battlefield. + VIP Capture + Capture VIP, disable or force ejection. + The objective is to capture a high-value target by disabling their unit or forcing an ejection, then securing the ejected individual. The target must remain alive and cannot escape the battlefield. Preserve 50% of your forces, and destroy at least 50% of the VIP’s bodyguards. false From 57dcb7f2ba8672658d86929b07fdbb3ffed5e3b2 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 22:13:50 -0500 Subject: [PATCH 05/22] Update scenario names and definitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revised scenario names for clarity and consistency, including renaming "Designated Target" to "VIP" in various XML files. Added new scenarios to contract definitions to diversify objectives. These changes aim to improve readability and maintainability of the game’s contract and scenario structure. --- MekHQ/data/scenariotemplates/Assassination.xml | 2 +- MekHQ/data/scenariotemplates/Covert Strike.xml | 6 +++--- .../{Diversion - Decoy.xml => Diversion Engagement.xml} | 0 MekHQ/data/scenariotemplates/Frontier Assassination.xml | 2 +- MekHQ/data/scenariotemplates/Frontline VIP Capture.xml | 6 +++--- ...rsion - Interception.xml => Intercept Engagement.xml} | 0 MekHQ/data/scenariotemplates/Remote VIP Capture.xml | 6 +++--- MekHQ/data/scenariotemplates/VIP Capture.xml | 6 +++--- .../data/stratconcontractdefinitions/ExtractionRaid.xml | 9 +++++++-- MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml | 7 +++++-- MekHQ/data/stratconcontractdefinitions/PirateHunting.xml | 5 +++-- MekHQ/data/stratconcontractdefinitions/ReconRaid.xml | 2 +- MekHQ/data/stratconcontractdefinitions/RiotDuty.xml | 3 ++- MekHQ/src/mekhq/MHQConstants.java | 2 +- 14 files changed, 33 insertions(+), 23 deletions(-) rename MekHQ/data/scenariotemplates/{Diversion - Decoy.xml => Diversion Engagement.xml} (100%) rename MekHQ/data/scenariotemplates/{Diversion - Interception.xml => Intercept Engagement.xml} (100%) diff --git a/MekHQ/data/scenariotemplates/Assassination.xml b/MekHQ/data/scenariotemplates/Assassination.xml index 802b823383..a6408c8861 100644 --- a/MekHQ/data/scenariotemplates/Assassination.xml +++ b/MekHQ/data/scenariotemplates/Assassination.xml @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 diff --git a/MekHQ/data/scenariotemplates/Covert Strike.xml b/MekHQ/data/scenariotemplates/Covert Strike.xml index 66bc6f6f83..8a39d80889 100644 --- a/MekHQ/data/scenariotemplates/Covert Strike.xml +++ b/MekHQ/data/scenariotemplates/Covert Strike.xml @@ -84,7 +84,7 @@ - Designated Target + VIP -1 false @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 @@ -117,7 +117,7 @@ - Designated Target + VIP diff --git a/MekHQ/data/scenariotemplates/Diversion - Decoy.xml b/MekHQ/data/scenariotemplates/Diversion Engagement.xml similarity index 100% rename from MekHQ/data/scenariotemplates/Diversion - Decoy.xml rename to MekHQ/data/scenariotemplates/Diversion Engagement.xml diff --git a/MekHQ/data/scenariotemplates/Frontier Assassination.xml b/MekHQ/data/scenariotemplates/Frontier Assassination.xml index 34111daab5..05feec2f83 100644 --- a/MekHQ/data/scenariotemplates/Frontier Assassination.xml +++ b/MekHQ/data/scenariotemplates/Frontier Assassination.xml @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 diff --git a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml index 3954974673..fc16ad77e0 100644 --- a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml @@ -84,7 +84,7 @@ - Designated Target + VIP -1 false @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 @@ -117,7 +117,7 @@ - Designated Target + VIP diff --git a/MekHQ/data/scenariotemplates/Diversion - Interception.xml b/MekHQ/data/scenariotemplates/Intercept Engagement.xml similarity index 100% rename from MekHQ/data/scenariotemplates/Diversion - Interception.xml rename to MekHQ/data/scenariotemplates/Intercept Engagement.xml diff --git a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml index 708f787326..ed4ee6c13f 100644 --- a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml @@ -84,7 +84,7 @@ - Designated Target + VIP -1 false @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 @@ -117,7 +117,7 @@ - Designated Target + VIP diff --git a/MekHQ/data/scenariotemplates/VIP Capture.xml b/MekHQ/data/scenariotemplates/VIP Capture.xml index d2af153efd..567efca79d 100644 --- a/MekHQ/data/scenariotemplates/VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/VIP Capture.xml @@ -84,7 +84,7 @@ - Designated Target + VIP -1 false @@ -100,7 +100,7 @@ 1 2 1.0 - Designated Target + VIP 3 5 4 @@ -117,7 +117,7 @@ - Designated Target + VIP diff --git a/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml b/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml index 2073cc0841..854ddbfe00 100644 --- a/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml @@ -31,9 +31,14 @@ SpecificScenarioVictory -0.5 - Capture.xml - Convoy Attack.xml + VIP Capture.xml + Remote VIP Capture.xml + Frontline VIP Capture.xml + Covert Strike.xml + Convoy Interdiction.xml + Convoy Raid.xml Convoy Escort.xml + Critical Convoy Escort.xml diff --git a/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml b/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml index 87108b1be1..bb7714ea3d 100644 --- a/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml @@ -25,8 +25,11 @@ SpecificScenarioVictory -0.5 - Assassinate.xml - Convoy Attack.xml + Frontier Assassination.xml + Assassination.xml + Covert Strike.xml + Convoy Interdiction.xml + Convoy Raid.xml diff --git a/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml b/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml index ab84bd5f5e..308fff914c 100644 --- a/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml +++ b/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml @@ -29,8 +29,9 @@ -0.33 AnyScenarioVictory - Destroy Grounded Dropship.xml - Low Atmo - Destroy Dropship.xml + Deep Raid.xml + Isolated DropShip Defense.xml + Low-Atmosphere DropShip Assault.xml diff --git a/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml b/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml index b8d5b2a1be..d699ae20d1 100644 --- a/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml @@ -31,7 +31,7 @@ SpecificScenarioVictory -0.5 - Recon.xml + Recon Evasion.xml diff --git a/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml b/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml index 89a08ef6bc..545a1db538 100644 --- a/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml +++ b/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml @@ -26,7 +26,8 @@ -0.5 SpecificScenarioVictory - Irregular Forces.xml + Irregular Force Assault.xml + Irregular Force Suppression.xml diff --git a/MekHQ/src/mekhq/MHQConstants.java b/MekHQ/src/mekhq/MHQConstants.java index f049ccef03..717c3a1bb1 100644 --- a/MekHQ/src/mekhq/MHQConstants.java +++ b/MekHQ/src/mekhq/MHQConstants.java @@ -261,7 +261,7 @@ public final class MHQConstants extends SuiteConstants { public static final String STRATCON_BIOME_MANIFEST_PATH = "./data/stratconbiomedefinitions/StratconBiomeManifest.xml"; public static final String TERRAIN_CONDITIONS_ODDS_MANIFEST_PATH = "./data/terrainconditionsodds/TerrainConditionsOddsManifest.xml"; public static final String HOSTILE_FACILITY_SCENARIO = "Hostile Facility.xml"; - public static final String ALLIED_FACILITY_SCENARIO = "Allied Facility.xml"; + public static final String ALLIED_FACILITY_SCENARIO = "Base Defense.xml"; public static final String SCENARIO_MODIFIER_ALLIED_GROUND_UNITS = "PrimaryAlliesGround.xml"; public static final String SCENARIO_MODIFIER_ALLIED_AIR_UNITS = "PrimaryAlliesAir.xml"; public static final String SCENARIO_MODIFIER_LIAISON_GROUND = "LiaisonGround.xml"; From f548878f328beed99e56d71263846d2bded003f3 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 22:16:52 -0500 Subject: [PATCH 06/22] Update scenario template entries Revised the scenario template file to streamline and rename scenario entries. The updated entries provide clearer scenario descriptions and simplify future maintenance. This change aims to improve readability and consistency across the scenario manifest. --- .../scenariotemplates/ScenarioManifest.xml | 342 +++++++++--------- 1 file changed, 177 insertions(+), 165 deletions(-) diff --git a/MekHQ/data/scenariotemplates/ScenarioManifest.xml b/MekHQ/data/scenariotemplates/ScenarioManifest.xml index 11af73ebef..bdce2a0b66 100644 --- a/MekHQ/data/scenariotemplates/ScenarioManifest.xml +++ b/MekHQ/data/scenariotemplates/ScenarioManifest.xml @@ -1,168 +1,180 @@ - - 0 - Battle - Skirmish.xml - - - 1 - Capture - Frontier.xml - - - 2 - Assassinate - Frontier.xml - - - 3 - Convoy Attack - Disruption.xml - - - 4 - Recon.xml - - - 5 - Decoy - Interception.xml - - - 6 - Diversion - Decoy.xml - - - 7 - Prevent Recon.xml - - - 8 - Breakthrough - Picket Line.xml - - - 9 - Pursuit.xml - - - 10 - Prevent Breakthrough.xml - - - 11 - Harass - Skirmish.xml - - - 12 - Convoy Escort - Frontier.xml - - - 13 - Irregular Forces - Frontier.xml - - - 14 - Defend Grounded Dropship - Interception.xml - - - 15 - Destroy Grounded Dropship - Interception.xml - - - 16 - Hostile Facility.xml - - - 17 - Allied Facility.xml - - - 18 - Low Atmo - Interception.xml - - - 19 - Low Atmo - Escort.xml - - - 20 - Low Atmo - Destroy Dropship.xml - - - 21 - Air Support.xml - - - 22 - Space - Interception.xml - - - 23 - Space - Blockade Run Escort.xml - - - 24 - Space - Blockade Run.xml - - - 25 - Allied Facility - Frontline.xml - - - 26 - Assassinate - Heavy Escort.xml - - - 27 - Battle - Frontline.xml - - - 28 - Breakthrough - Frontline.xml - - - 29 - Capture - Frontline.xml - - - 30 - Convoy Attack - Critical.xml - - - 31 - Convoy Escort - Critical .xml - - - 32 - Defend Grounded Dropship - Deep Raid.xml - - - 33 - Destroy Grounded Dropship - Deep Raid.xml - - - 34 - Diversion - Interception.xml - - - 35 - Decoy - Diversion.xml - - - 36 - Harass - Frontline.xml - - - 37 - Hostile Facility - Frontline.xml - - - 38 - Irregular Forces - Frontline.xml - - - 39 - Recon - Heavy.xml - - - 40 - Pivotal Battle.xml - - + + 0 + Annihilation.xml + + + 1 + Assassination.xml + + + 2 + Base Defense.xml + + + 3 + Breakthrough.xml + + + 4 + Close Air Support.xml + + + 5 + Convoy Escort.xml + + + 6 + Convoy Interdiction.xml + + + 7 + Convoy Raid.xml + + + 8 + Covert Strike.xml + + + 9 + Critical Convoy Escort.xml + + + 10 + Decoy Engagement.xml + + + 11 + Decoy Interception.xml + + + 12 + Deep Raid.xml + + + 13 + Deep Raid Defense.xml + + + 14 + Diversion Engagement.xml + + + 15 + DropShip Raid.xml + + + 16 + Frontier Assassination.xml + + + 17 + Frontline Breakthrough.xml + + + 18 + Frontline Disruption.xml + + + 19 + Frontline Engagement.xml + + + 20 + Frontline VIP Capture.xml + + + 21 + Heavy Recon Evasion.xml + + + 22 + Hostile Facility.xml + + + 23 + Intercept Engagement.xml + + + 24 + Interception Defense.xml + + + 25 + Irregular Force Assault.xml + + + 26 + Irregular Force Suppression.xml + + + 27 + Isolated DropShip Defense.xml + + + 28 + Low-Atmosphere Air Intercept.xml + + + 29 + Low-Atmosphere DropShip Assault.xml + + + 30 + Low-Atmosphere DropShip Escort.xml + + + 31 + Minor Engagement.xml + + + 32 + Picket Line Breakthrough.xml + + + 33 + Pivotal Battle.xml + + + 34 + Recon Evasion.xml + + + 35 + Reconnaissance Interdiction.xml + + + 36 + Remote VIP Capture.xml + + + 37 + Skirmish.xml + + + 38 + Skirmish Disruption.xml + + + 39 + Space Aerospace Intercept.xml + + + 40 + Space Blockade Run.xml + + + 41 + Space DropShip Intercept.xml + + + 42 + Tactical Withdrawal.xml + + + 43 + VIP Capture.xml + + From b8f6e403f0115e35444a501f9ec2a6d1ad19af85 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 22:29:48 -0500 Subject: [PATCH 07/22] Update scenario modifiers to adjust win conditions Updated various mission files to modify win conditions from 100% to 75% destruction or preservation thresholds. Simplified success and failure effect specifications and streamlined objective descriptions for clarity. --- .../FacilityAlliedDefend.xml | 14 ++------- .../FacilityHostileCapture.xml | 20 ------------- .../FacilityHostileDestroy.xml | 18 ++--------- .../FacilityHostileDestroyNonWin.xml | 7 ++--- .../FacilityHostileEngage.xml | 9 ++---- .../FacilityHostileExtract.xml | 30 ++++++------------- .../FacilityHostileRecon.xml | 15 +++------- 7 files changed, 24 insertions(+), 89 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml b/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml index 235fa4d12a..7d23fcf425 100644 --- a/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml +++ b/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml @@ -1,5 +1,5 @@ - Preserve 50% of the designated turrets. + Preserve 25% of the designated turrets. false PostForceGeneration Defend @@ -10,11 +10,6 @@ - - ScenarioVictory - Fixed - 2 - FacilityRemains Fixed @@ -22,11 +17,6 @@ - - ScenarioDefeat - Fixed - 1 - FacilityRemoved Fixed @@ -34,7 +24,7 @@ - Preserve 50% of the following force(s) and unit(s): + Preserve 25% of the following force(s) and unit(s): NONE Preserve 50 diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml index fbf524e6ff..731d0b1a4e 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml @@ -11,11 +11,6 @@ - - ScenarioVictory - Fixed - 2 - FacilityCaptured Fixed @@ -23,11 +18,6 @@ - - ScenarioDefeat - Fixed - 1 - FacilityRemains Fixed @@ -52,11 +42,6 @@ - - ScenarioVictory - Fixed - 2 - FacilityCaptured Fixed @@ -64,11 +49,6 @@ - - ScenarioDefeat - Fixed - 1 - FacilityRemains Fixed diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml b/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml index b7b542d0b2..57ce36a8e3 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml @@ -16,30 +16,18 @@ - - ScenarioVictory - Fixed - 2 - FacilityRemoved Fixed 1 - - - ScenarioDefeat - Fixed - 1 - - + - Destroy or force the withdrawal of all of the following force(s) and - unit(s) to render the facility inoperative: + Destroy or cripple 75% of the following unit(s) to render the facility inoperative: NONE ForceWithdraw - 100 + 75 0 true None diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml b/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml index 8ebcf0c1b4..f2775fd7a9 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml @@ -1,5 +1,5 @@ - This facility will be destroyed if all turret buildings are destroyed. + This facility will be destroyed if 75% of turrets are destroyed. false PreForceGeneration Destroy @@ -17,11 +17,10 @@ - Destroy or cripple all of the following force(s) and unit(s) to render the - facility inoperative: + Destroy or cripple 75% of the following unit(s) to render the facility inoperative: NONE ForceWithdraw - 100 + 75 0 true None diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml b/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml index 4fd6dd3d90..66cf0416fd 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml @@ -5,13 +5,11 @@ FacilityHostileDestroy.xml - If destroyed, this facility will be considered to have been sufficiently - distracted. + If destroyed, this facility will be considered to have been sufficiently distracted. FacilityHostileCapture.xml - If captured, this facility will be considered to have been sufficiently - distracted. + If captured, this facility will be considered to have been sufficiently distracted. Engage @@ -36,8 +34,7 @@ - Engage any hostile units with weapons fire or physical attacks for the - specified number of turns. + Engage any hostile units for the specified number of turns. NONE Custom 1 diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml b/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml index ee61d06913..2728a4b15f 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml @@ -17,31 +17,19 @@ - ScenarioVictory - Fixed + SupportPointUpdate + Linear 1 - - - ScenarioDefeat - Fixed - 1 - - - - Extraction can be carried out by a unit with at least one free - hand actuator, infantry or battle armor. - Extraction cannot be performed from destroyed buildings. - The extracting units may flee the battlefield; alternately, the - objective is automatically completed when routing the opposing force. - - Extract assets from 75% of the buildings designated by turrets. + + + Capture intact units from the following force(s) for additional support points: NONE - Custom - 75 - false - 2 + 1 + Capture + 1 + true None diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml b/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml index c15a3512fa..e3512c5814 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml @@ -29,21 +29,14 @@ 1 - - Scans may be conducted by moving a unit within three hexes of the - target and foregoing all attacks. - Any kind of probe, improved sensors quirk or sensor geek SPA - extends the range to five hexes, and the unit may attack as normal. - Scans cannot be conducted on destroyed buildings. - Note: This objective needs to be tracked outside of MegaMek. - - Scan the buildings designated by placed turrets. + + Scan the hostile base by engaging the base for the specified duration. NONE Custom 1 false - 2 - None + 3 + ScaledToPrimaryUnitCount From 8f136fc62a1582baeb93fa846021a61b1c518d09 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Fri, 27 Sep 2024 23:10:49 -0500 Subject: [PATCH 08/22] Update scenario modifiers and remove SearchAndRescue.xml Removed `SearchAndRescue.xml` and updated multiple scenario modifiers to contribute to BV and unit count. Simplified briefing texts for `IntegratedAllies` and `LiaisonAir` while adjusting various configuration parameters. --- .../scenariomodifiers/AlliedAirGarrison.xml | 2 +- .../scenariomodifiers/AlliedArtyGarrison.xml | 2 +- .../scenariomodifiers/AlliedGroundSupport.xml | 2 +- .../scenariomodifiers/AlliedOfficerMek.xml | 6 +- .../AlliedReinforcements.xml | 2 +- .../AlliedTankReinforcements.xml | 2 +- .../data/scenariomodifiers/AlliedTurrets.xml | 2 +- MekHQ/data/scenariomodifiers/BadIntelAir.xml | 2 +- .../data/scenariomodifiers/BadIntelGround.xml | 2 +- .../data/scenariomodifiers/EnemyASFAce01.xml | 4 +- .../data/scenariomodifiers/EnemyASFAce02.xml | 4 +- .../scenariomodifiers/EnemyAceMekARC2R.xml | 4 +- .../scenariomodifiers/EnemyAceMekAWS8Q.xml | 4 +- .../scenariomodifiers/EnemyAceMekFS9M.xml | 4 +- .../scenariomodifiers/EnemyAceMekGHR5N.xml | 4 +- .../scenariomodifiers/EnemyAceMekHGN733P.xml | 4 +- .../scenariomodifiers/EnemyAceMekMAD3D.xml | 4 +- .../scenariomodifiers/EnemyAceMekPXH1D.xml | 4 +- MekHQ/data/scenariomodifiers/EnemyAirCav.xml | 4 +- .../scenariomodifiers/EnemyAirGarrison.xml | 4 +- .../scenariomodifiers/EnemyAirMobileInf.xml | 4 +- .../data/scenariomodifiers/EnemyAirPatrol.xml | 4 +- .../EnemyAirSupportBombers.xml | 4 +- .../scenariomodifiers/EnemyArtyGarrison.xml | 4 +- .../scenariomodifiers/EnemyCommanderMek.xml | 4 +- .../data/scenariomodifiers/EnemyDropship.xml | 8 +- .../scenariomodifiers/EnemyFieldArtyCrack.xml | 4 +- .../EnemyFieldArtyOffboard.xml | 4 +- MekHQ/data/scenariomodifiers/EnemyHotDrop.xml | 4 +- .../scenariomodifiers/EnemyMekGarrison.xml | 4 +- .../data/scenariomodifiers/EnemyMekPatrol.xml | 4 +- .../data/scenariomodifiers/EnemyMercBrawl.xml | 4 +- .../EnemyMercFireSupport.xml | 4 +- .../EnemyMercHopInfantry.xml | 4 +- .../scenariomodifiers/EnemyMercScouts.xml | 4 +- .../scenariomodifiers/EnemyMercSkirmish.xml | 4 +- .../EnemyMercSkyInfantry.xml | 4 +- .../scenariomodifiers/EnemyOfficerMek.xml | 4 +- MekHQ/data/scenariomodifiers/EnemyTurrets.xml | 2 +- .../GroundedEnemyDropship.xml | 6 +- .../scenariomodifiers/HouseOfficerAir.xml | 77 +++--------------- .../scenariomodifiers/HouseOfficerGround.xml | 81 +++---------------- .../scenariomodifiers/IntegratedAlliesAir.xml | 77 +++--------------- .../IntegratedAlliesGround.xml | 77 +++--------------- MekHQ/data/scenariomodifiers/LiaisonAir.xml | 72 ++--------------- .../data/scenariomodifiers/LiaisonGround.xml | 73 ++--------------- .../scenariomodifiers/LocalGarrisonBoats.xml | 2 +- .../LocalGarrisonInfantry.xml | 2 +- .../LocalGarrisonTurrets.xml | 2 +- .../OverwhelmingEnemyAirReinforcements.xml | 3 +- .../OverwhelmingEnemyGroundReinforcements.xml | 3 +- .../scenariomodifiers/PrimaryAlliesAir.xml | 2 +- .../scenariomodifiers/PrimaryAlliesGround.xml | 2 +- .../scenariomodifiers/SearchAndRescue.xml | 66 --------------- .../groundBattleModifiers.xml | 3 - .../scenariomodifiers/modifiermanifest.xml | 3 - 56 files changed, 139 insertions(+), 556 deletions(-) delete mode 100644 MekHQ/data/scenariomodifiers/SearchAndRescue.xml diff --git a/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml b/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml index b3caebd0b5..d07a311cec 100644 --- a/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml +++ b/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml @@ -10,7 +10,7 @@ false true true - false + true false 10 diff --git a/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml b/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml index d59132930c..b05c1c5784 100644 --- a/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml +++ b/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml @@ -15,7 +15,7 @@ false true true - false + true false 10 diff --git a/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml b/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml index 2a167282f1..bce75007e8 100644 --- a/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml +++ b/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml @@ -14,7 +14,7 @@ true false true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml b/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml index a2e6e3064a..8e391424ed 100644 --- a/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml +++ b/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml @@ -4,7 +4,7 @@ AllGroundTerrain SpecificGroundTerrain - false + true PreForceGeneration -1 @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml b/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml index 12c65bd438..45d99ec2b5 100644 --- a/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml @@ -14,7 +14,7 @@ true false true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml b/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml index 8f176c8304..8d75d6a55b 100644 --- a/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml @@ -14,7 +14,7 @@ true false true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/AlliedTurrets.xml b/MekHQ/data/scenariomodifiers/AlliedTurrets.xml index fcf83cf19d..2ce6b29a7d 100644 --- a/MekHQ/data/scenariomodifiers/AlliedTurrets.xml +++ b/MekHQ/data/scenariomodifiers/AlliedTurrets.xml @@ -12,7 +12,7 @@ 7 0 false - false + true true false diff --git a/MekHQ/data/scenariomodifiers/BadIntelAir.xml b/MekHQ/data/scenariomodifiers/BadIntelAir.xml index c44f430acd..92f0a9fa00 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelAir.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelAir.xml @@ -11,7 +11,7 @@ true false true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/BadIntelGround.xml b/MekHQ/data/scenariomodifiers/BadIntelGround.xml index 89137e9be8..b0e3847a37 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelGround.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelGround.xml @@ -15,7 +15,7 @@ true false true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml index f57c6f22c5..fb97cce073 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml @@ -12,9 +12,9 @@ -3 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml index 589204272a..1e6e72a38f 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml @@ -12,9 +12,9 @@ -3 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml index a9841e47f6..4b0c82b425 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml index 8c30d43416..ea13c5deb5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml index 93757a618a..91242934e8 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml index ccda1adb0e..525ef38501 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml index e92f7de68f..b4d30b3659 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml index 9a7db1ea97..08e4b3d795 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml index f3b55bb9d5..eac67e11ae 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml index 5e05d48d79..d9a4590fb9 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml @@ -13,9 +13,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml index e50e32dbbd..ada68791f9 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml @@ -8,9 +8,9 @@ -3 0 false - false + true true - false + true false 9 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml index 484324dc78..58447acd06 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml @@ -12,9 +12,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml index 88ccbcb6a5..ff56381603 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml @@ -8,9 +8,9 @@ -3 2 true - false + true true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml index 73ca932cda..60b2f36ee5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml @@ -9,9 +9,9 @@ -3 -3 true - false + true true - false + true 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml index 9e5e4f266f..75d8aa5ace 100644 --- a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml @@ -13,9 +13,9 @@ 1 0 false - false + true true - false + true false 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml index e8e642b98a..2d2ed8d6af 100644 --- a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyDropship.xml b/MekHQ/data/scenariomodifiers/EnemyDropship.xml index 8af1d02ae2..111849308e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/EnemyDropship.xml @@ -1,5 +1,5 @@ - An active enemy dropship has been detected in the area. + An active enemy DropShip has been detected in the area. false PostForceGeneration @@ -8,9 +8,9 @@ 11 0 false - false + true true - false + true false 5 @@ -18,7 +18,7 @@ 2 1.0 Opfor Active Dropship - 3 + 2 3 4 diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml index 9e47dabea7..63dbabd322 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml @@ -12,9 +12,9 @@ 1 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml index c5a7450b1e..2fa727350a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true true 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml index 8f4e043e71..24d3465a2c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml +++ b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml @@ -13,9 +13,9 @@ -2 -3 false - false + true true - false + true 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml index bd5f910e33..6e65d4e074 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml index 79e09fa07d..7592f0e185 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml @@ -12,9 +12,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml index 058027598c..a1047a054d 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml @@ -13,9 +13,9 @@ 0 0 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml index 4e5459baee..c3d1eddf4a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml @@ -13,9 +13,9 @@ 0 0 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml index 6a827c6d41..250632fa1e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml @@ -13,9 +13,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml index 351b7098bc..de3b15abcf 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml @@ -12,9 +12,9 @@ 0 4 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml index 9d2cb27a0c..52d0d1803e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml @@ -13,9 +13,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml index a83a246080..7c6bedde6f 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml @@ -13,9 +13,9 @@ 0 3 false - false + true true - false + true false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml index 499c51723c..50d548d1d6 100644 --- a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml @@ -12,9 +12,9 @@ 0 0 false - false + true true - false + true false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml index 695dd435a9..39c3735f6f 100644 --- a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml +++ b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml @@ -12,7 +12,7 @@ 7 0 false - false + true true false diff --git a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml index cb95d03319..6a2c812205 100644 --- a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml @@ -13,9 +13,9 @@ 11 0 false - false + true true - false + true false 5 @@ -23,7 +23,7 @@ 2 1.0 Opfor Grounded Dropship - 3 + 2 3 4 50 diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml index 768c2fe03b..89d4f40c36 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml @@ -1,6 +1,5 @@ - Your force will be deployed under the command of a house officer. Keep - them alive. Additionally, allied command will dictate retreat conditions. + Your employer is dispatching a force to assist with this objective. true PreForceGeneration @@ -15,77 +14,21 @@ false 5 - 1 + 0 1 1.0 - House Officer - 3 - 3 + Joint Force + 2 + 1 4 - 50 + 2 + 0 5 + + Player + SameEdge Player false - - - - - House Officer - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - House Officer - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml index 4f3a94468a..9b4adf84cc 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml @@ -1,6 +1,5 @@ - The house commanding officer will deploy alongside your units. Keep them - alive. + Your employer is dispatching a force to assist with this objective. AllGroundTerrain SpecificGroundTerrain @@ -13,83 +12,27 @@ 0 0 false - false + true true - false + true false 5 - 1 + 0 1 1.0 - House Officer - 3 - 3 + Joint Force + 2 + 1 4 - 50 + 2 + 0 0 + + Player + SameEdge Player false - - - - - House Officer - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - House Officer - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml index 4875a9d3b4..d17d908314 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml @@ -1,91 +1,34 @@ - Your force will be deployed as part of an integrated unit. Keep the - allied units alive. Additionally, allied command will dictate retreat conditions. + Your employer has deployed you alongside an integrated force. true PreForceGeneration -1 - false + true 9 0 false - false + true true true false 5 - 2 + 0 1 - 1.0 + 2.0 Integrated Allies - 3 + 2 1 4 + 2 0 5 + + Player + SameEdge Player false - - - - - Integrated Allies - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - Integrated Allies - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml index 09678dd257..53353af866 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml @@ -1,6 +1,5 @@ - Your force will be deployed as part of an integrated unit. Keep the - allied units alive. + Your employer has deployed you alongside an integrated force. AllGroundTerrain SpecificGroundTerrain @@ -9,87 +8,31 @@ PreForceGeneration -1 - false + true 0 0 false - false + true true true false 5 - 2 + 0 1 - 1.0 + 2.0 Integrated Allies - 3 + 2 1 4 + 2 0 0 + + Player + SameEdge Player false - - - - - Integrated Allies - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - Integrated Allies - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/LiaisonAir.xml b/MekHQ/data/scenariomodifiers/LiaisonAir.xml index 16df04d6ce..59c3c891d1 100644 --- a/MekHQ/data/scenariomodifiers/LiaisonAir.xml +++ b/MekHQ/data/scenariomodifiers/LiaisonAir.xml @@ -1,7 +1,5 @@ - The employer's liaison will deploy alongside your force in a battlemek, - under your command. Keep them alive. Additionally, allied command will dictate retreat - conditions. + Your employer has deployer an observer to monitor your performance. true PreForceGeneration @@ -10,7 +8,7 @@ 9 0 false - false + true true true false @@ -19,74 +17,18 @@ 1 0 1.0 - Attached Liaison + Forward Observer 3 1 4 + 3 0 5 + + Player + SameEdge Player false - - - - - Attached Liaison - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - Attached Liaison - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/LiaisonGround.xml b/MekHQ/data/scenariomodifiers/LiaisonGround.xml index 9b7e1e5bef..47a4208ab5 100644 --- a/MekHQ/data/scenariomodifiers/LiaisonGround.xml +++ b/MekHQ/data/scenariomodifiers/LiaisonGround.xml @@ -1,6 +1,5 @@ - The employer's liaison will deploy alongside your force in a battlemek, - under your command. Keep them alive. + Your employer has deployer an observer to monitor your performance. AllGroundTerrain SpecificGroundTerrain @@ -10,10 +9,10 @@ -1 false - 0 + 9 0 false - false + true true true false @@ -22,74 +21,18 @@ 1 0 1.0 - Attached Liaison + Forward Observer 3 1 4 + 3 0 0 + + Player + SameEdge Player false - - - - - Attached Liaison - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - Preserve 100% of the following force(s) and unit(s): - NONE - Preserve - 100 - 0 - true - None - - - - Attached Liaison - Player - Allied Force - - - - - ScenarioVictory - Fixed - 1 - - - - - ScenarioDefeat - Fixed - 1 - - - - Preserve 50% of the following force(s) and unit(s): - NONE - Preserve - 50 - 0 - true - None - - diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml index 26b5448ed2..3bc418f45a 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml @@ -14,7 +14,7 @@ false false true - false + true 0 diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml index f04cec6ce5..67c5a217fa 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml @@ -12,7 +12,7 @@ 3 0 false - false + true true false diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml index 949d9c9dee..10f670ef61 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml @@ -12,7 +12,7 @@ 7 0 false - false + true true false diff --git a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml index 2cb3aca9a2..bcd05a7caa 100644 --- a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml @@ -1,6 +1,5 @@ - An overwhelming enemy aerospace force has been detected approaching the - area. + An overwhelming enemy aerospace force has been detected approaching the area. Space LowAtmosphere diff --git a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml index ecf06d9dc9..a62d4da5dd 100644 --- a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml @@ -1,6 +1,5 @@ - Overwhelming enemy ground reinforcements have been detected approaching - the area. + Overwhelming enemy ground reinforcements have been detected approaching the area. AllGroundTerrain SpecificGroundTerrain diff --git a/MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml b/MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml index 50afae8f85..a2442fdb89 100644 --- a/MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml +++ b/MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml @@ -9,7 +9,7 @@ -3 0 false - true + false true true false diff --git a/MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml b/MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml index 52633155c4..f28d37da7c 100644 --- a/MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml +++ b/MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml @@ -13,7 +13,7 @@ -2 0 false - true + false true true false diff --git a/MekHQ/data/scenariomodifiers/SearchAndRescue.xml b/MekHQ/data/scenariomodifiers/SearchAndRescue.xml deleted file mode 100644 index 264c3927ac..0000000000 --- a/MekHQ/data/scenariomodifiers/SearchAndRescue.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - AllGroundTerrain - SpecificGroundTerrain - - Minor detention facility reported here. Rescue targets from designated - buildings. - false - PostForceGeneration - - -1 - false - 7 - 0 - false - false - true - false - - 10 - - 5 - 0 - 2 - 1.0 - Designated Facilities - 2 - 2 - 4 - 50 - - Base Turrets - - None - - - - - Designated Facilities - - - - SupportPointUpdate - Linear - 1 - - - Extract from, or, leave intact while maintaining battlefield control, units from - the following force(s) for additional support points: - - Extraction can be carried out by a unit with at least one free hand - actuator, infantry or battle armor. - Extraction cannot be performed from destroyed buildings. - The extracting units may flee the battlefield; alternately, the objective - is automatically completed when routing the opposing force and one support point will be - awarded per intact turret remaining. - - NONE - 1 - Capture - 1 - true - None - - - diff --git a/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml b/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml index 643ca80c4a..97351cb62a 100644 --- a/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml +++ b/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml @@ -132,9 +132,6 @@ Need planetary condition adjustments OffworldOperation.xml - - SearchAndRescue.xml - AlliedTraineesGround.xml diff --git a/MekHQ/data/scenariomodifiers/modifiermanifest.xml b/MekHQ/data/scenariomodifiers/modifiermanifest.xml index b0cbe365e6..7a93df5f15 100644 --- a/MekHQ/data/scenariomodifiers/modifiermanifest.xml +++ b/MekHQ/data/scenariomodifiers/modifiermanifest.xml @@ -148,9 +148,6 @@ Need planetary condition adjustments OffworldOperation.xml - - SearchAndRescue.xml - GoodEvent.xml From 121177e752e5fd3264d36c59c4a37ab6f3b29381 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 00:18:36 -0500 Subject: [PATCH 09/22] Update scenario modifiers to not contribute to BV and unit count Adjusted various scenario modifier XML files to ensure that certain forces no longer contribute to Battle Value (BV) and unit count metrics. This change involved setting `` and `` to `false` in relevant files. Additionally, modified the minimum weight class and enabled map size contributions for certain scenarios. --- MekHQ/data/scenariomodifiers/BadIntelAir.xml | 2 +- MekHQ/data/scenariomodifiers/BadIntelGround.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyASFAce01.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyASFAce02.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml | 4 ++-- .../data/scenariomodifiers/EnemyAceMekHGN733P.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirCav.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml | 4 ++-- .../data/scenariomodifiers/EnemyAirMobileInf.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml | 4 ++-- .../scenariomodifiers/EnemyAirSupportBombers.xml | 4 ++-- .../data/scenariomodifiers/EnemyArtyGarrison.xml | 4 ++-- .../data/scenariomodifiers/EnemyCommanderMek.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyDropship.xml | 4 ++-- .../scenariomodifiers/EnemyFieldArtyCrack.xml | 4 ++-- .../scenariomodifiers/EnemyFieldArtyOffboard.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyHotDrop.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml | 4 ++-- .../scenariomodifiers/EnemyMercFireSupport.xml | 4 ++-- .../scenariomodifiers/EnemyMercHopInfantry.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMercScouts.xml | 4 ++-- .../data/scenariomodifiers/EnemyMercSkirmish.xml | 4 ++-- .../scenariomodifiers/EnemyMercSkyInfantry.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyTurrets.xml | 2 +- .../scenariomodifiers/GroundedEnemyDropship.xml | 4 ++-- MekHQ/data/scenariomodifiers/HouseOfficerAir.xml | 4 ++-- .../data/scenariomodifiers/HouseOfficerGround.xml | 4 ++-- .../scenariomodifiers/IntegratedAlliesAir.xml | 2 +- .../scenariomodifiers/IntegratedAlliesGround.xml | 2 +- .../data/scenariomodifiers/LocalGarrisonBoats.xml | 2 +- .../scenariomodifiers/LocalGarrisonTurrets.xml | 2 +- MekHQ/data/scenariotemplates/Deep Raid.xml | 6 +++--- MekHQ/data/scenariotemplates/DropShip Raid.xml | 10 +++++----- .../scenariotemplates/Frontier Assassination.xml | 2 +- .../scenariotemplates/Frontline Disruption.xml | 2 +- .../scenariotemplates/Frontline VIP Capture.xml | 2 +- MekHQ/data/scenariotemplates/Hostile Facility.xml | 2 +- .../scenariotemplates/Interception Defense.xml | 2 +- .../scenariotemplates/Irregular Force Assault.xml | 2 +- .../Irregular Force Suppression.xml | 2 +- .../Isolated DropShip Defense.xml | 4 ++-- .../data/scenariotemplates/Remote VIP Capture.xml | 2 +- .../scenariotemplates/Skirmish Disruption.xml | 2 +- .../data/scenariotemplates/Space Blockade Run.xml | 4 ++-- .../scenariotemplates/Tactical Withdrawal.xml | 2 +- MekHQ/data/scenariotemplates/VIP Capture.xml | 2 +- .../campaign/mission/ScenarioForceTemplate.java | 15 +++++++-------- 55 files changed, 101 insertions(+), 102 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/BadIntelAir.xml b/MekHQ/data/scenariomodifiers/BadIntelAir.xml index 92f0a9fa00..c44f430acd 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelAir.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelAir.xml @@ -11,7 +11,7 @@ true false true - true + false 1 2 diff --git a/MekHQ/data/scenariomodifiers/BadIntelGround.xml b/MekHQ/data/scenariomodifiers/BadIntelGround.xml index b0e3847a37..89137e9be8 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelGround.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelGround.xml @@ -15,7 +15,7 @@ true false true - true + false 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml index fb97cce073..f57c6f22c5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml @@ -12,9 +12,9 @@ -3 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml index 1e6e72a38f..589204272a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml @@ -12,9 +12,9 @@ -3 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml index 4b0c82b425..a9841e47f6 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml index ea13c5deb5..8c30d43416 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml index 91242934e8..93757a618a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml index 525ef38501..ccda1adb0e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml index b4d30b3659..e92f7de68f 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml index 08e4b3d795..9a7db1ea97 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml index eac67e11ae..f3b55bb9d5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml index d9a4590fb9..5e05d48d79 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml @@ -13,9 +13,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml index ada68791f9..e50e32dbbd 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml @@ -8,9 +8,9 @@ -3 0 false - true + false true - true + false false 9 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml index 58447acd06..484324dc78 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml @@ -12,9 +12,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml index ff56381603..88ccbcb6a5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml @@ -8,9 +8,9 @@ -3 2 true - true + false true - true + false 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml index 60b2f36ee5..73ca932cda 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml @@ -9,9 +9,9 @@ -3 -3 true - true + false true - true + false 1 2 diff --git a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml index 75d8aa5ace..9e5e4f266f 100644 --- a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml @@ -13,9 +13,9 @@ 1 0 false - true + false true - true + false false 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml index 2d2ed8d6af..e8e642b98a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyDropship.xml b/MekHQ/data/scenariomodifiers/EnemyDropship.xml index 111849308e..184b44b993 100644 --- a/MekHQ/data/scenariomodifiers/EnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/EnemyDropship.xml @@ -8,9 +8,9 @@ 11 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml index 63dbabd322..9e47dabea7 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml @@ -12,9 +12,9 @@ 1 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml index 2fa727350a..c5a7450b1e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false true 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml index 24d3465a2c..8f4e043e71 100644 --- a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml +++ b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml @@ -13,9 +13,9 @@ -2 -3 false - true + false true - true + false 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml index 6e65d4e074..bd5f910e33 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 10 diff --git a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml index 7592f0e185..79e09fa07d 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml @@ -12,9 +12,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml index a1047a054d..058027598c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml @@ -13,9 +13,9 @@ 0 0 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml index c3d1eddf4a..4e5459baee 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml @@ -13,9 +13,9 @@ 0 0 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml index 250632fa1e..6a827c6d41 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml @@ -13,9 +13,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml index de3b15abcf..351b7098bc 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml @@ -12,9 +12,9 @@ 0 4 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml index 52d0d1803e..9d2cb27a0c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml @@ -13,9 +13,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml index 7c6bedde6f..a83a246080 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml @@ -13,9 +13,9 @@ 0 3 false - true + false true - true + false false 1 diff --git a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml index 50d548d1d6..499c51723c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml index 39c3735f6f..695dd435a9 100644 --- a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml +++ b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml @@ -12,7 +12,7 @@ 7 0 false - true + false true false diff --git a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml index 6a2c812205..fdec08aefc 100644 --- a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml @@ -13,9 +13,9 @@ 11 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml index 89d4f40c36..a4a99c089b 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerAir.xml @@ -8,9 +8,9 @@ 9 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml index 9b4adf84cc..907eaf3136 100644 --- a/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml +++ b/MekHQ/data/scenariomodifiers/HouseOfficerGround.xml @@ -12,9 +12,9 @@ 0 0 false - true + false true - true + false false 5 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml index d17d908314..92bd9440e3 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesAir.xml @@ -21,7 +21,7 @@ 2 1 4 - 2 + 1 0 5 diff --git a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml index 53353af866..7c05288b8c 100644 --- a/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml +++ b/MekHQ/data/scenariomodifiers/IntegratedAlliesGround.xml @@ -25,7 +25,7 @@ 2 1 4 - 2 + 1 0 0 diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml index 3bc418f45a..26b5448ed2 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonBoats.xml @@ -14,7 +14,7 @@ false false true - true + false 0 diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml index 10f670ef61..949d9c9dee 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml @@ -12,7 +12,7 @@ 7 0 false - true + false true false diff --git a/MekHQ/data/scenariotemplates/Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml index c37e65877a..8ab58aabbc 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -94,7 +94,7 @@ 11 0 false - true + false true false false @@ -105,8 +105,8 @@ 1 2 1.0 - Dropship - 2 + DropShip + 4 3 4 0 diff --git a/MekHQ/data/scenariotemplates/DropShip Raid.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml index 3bfc99d3db..507ff289bd 100644 --- a/MekHQ/data/scenariotemplates/DropShip Raid.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -87,14 +87,14 @@ - Dropship + DropShip -1 false 11 0 false - true + false true false false @@ -105,7 +105,7 @@ 1 2 1.0 - Dropship + DropShip 2 3 4 @@ -122,7 +122,7 @@ - Dropship + DropShip @@ -140,7 +140,7 @@ - If the dropship cannot be deployed, this objective may be ignored. + If the DropShip cannot be deployed, this objective may be ignored. Destroy or cripple the following unit(s): NONE diff --git a/MekHQ/data/scenariotemplates/Frontier Assassination.xml b/MekHQ/data/scenariotemplates/Frontier Assassination.xml index 05feec2f83..526c2f9b45 100644 --- a/MekHQ/data/scenariotemplates/Frontier Assassination.xml +++ b/MekHQ/data/scenariotemplates/Frontier Assassination.xml @@ -92,7 +92,7 @@ 0 true false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Frontline Disruption.xml b/MekHQ/data/scenariotemplates/Frontline Disruption.xml index ad310a078c..6c6d698827 100644 --- a/MekHQ/data/scenariotemplates/Frontline Disruption.xml +++ b/MekHQ/data/scenariotemplates/Frontline Disruption.xml @@ -86,7 +86,7 @@ -3 false false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml index fc16ad77e0..78818e2fcd 100644 --- a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml @@ -92,7 +92,7 @@ 0 true false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index 1abb905f83..b7f6950436 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -28,7 +28,7 @@ 0 false false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Interception Defense.xml b/MekHQ/data/scenariotemplates/Interception Defense.xml index 05e5091260..c0d6e536b8 100644 --- a/MekHQ/data/scenariotemplates/Interception Defense.xml +++ b/MekHQ/data/scenariotemplates/Interception Defense.xml @@ -87,7 +87,7 @@ -3 true false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml index 5db66f5b28..6caab83eb2 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml @@ -98,7 +98,7 @@ 0 false false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml index 7aeb61b765..97e94e31ef 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml @@ -98,7 +98,7 @@ 0 false false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index c4c566522d..f10dd0fcc4 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -189,9 +189,9 @@ 11 0 false - true + false true - true + false false 10 diff --git a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml index ed4ee6c13f..37daf0c66c 100644 --- a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml @@ -92,7 +92,7 @@ 0 true false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml index 66ddaca648..5c24dbf014 100644 --- a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml +++ b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml @@ -86,7 +86,7 @@ -3 false false - false + true false false diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index ae7d1beb5a..cc03d2076d 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -148,9 +148,9 @@ 11 0 false - true + false true - true + false false 6 diff --git a/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml index e1642499a9..be52975a48 100644 --- a/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml +++ b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml @@ -148,7 +148,7 @@ -3 true false - false + true false false diff --git a/MekHQ/data/scenariotemplates/VIP Capture.xml b/MekHQ/data/scenariotemplates/VIP Capture.xml index 567efca79d..65cad35966 100644 --- a/MekHQ/data/scenariotemplates/VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/VIP Capture.xml @@ -92,7 +92,7 @@ 0 true false - false + true false false diff --git a/MekHQ/src/mekhq/campaign/mission/ScenarioForceTemplate.java b/MekHQ/src/mekhq/campaign/mission/ScenarioForceTemplate.java index b2a14337e7..b323ebfcdb 100644 --- a/MekHQ/src/mekhq/campaign/mission/ScenarioForceTemplate.java +++ b/MekHQ/src/mekhq/campaign/mission/ScenarioForceTemplate.java @@ -284,8 +284,7 @@ public enum SynchronizedDeploymentType { private boolean canReinforceLinked; /** - * Whether this force contributes to the BV budget if the generation method is - * BV Scaled + * Whether this force contributes to the OpFor BV budget if the generation method is BV Scaled */ private boolean contributesToBV; @@ -583,7 +582,7 @@ public boolean getDeployOffboard() { /** * Deserialization support for roles that could be applied to this force - * + * * @return */ @XmlElementWrapper(name = "roleChoices") @@ -598,7 +597,7 @@ public List getRoleCollections() { * are provided, returns an empty set. * FIXME: placeholder function. Needs to be properly tied into the UI and file * read/write. - * + * * @return */ public Collection getRequiredRoles() { @@ -716,7 +715,7 @@ public void setDeployOffboard(boolean deployOffBoard) { * Adds a set of roles required for this formation. Duplicates are ignored. * FIXME: placeholder function. Needs to be properly tied into the UI and file * read/write. - * + * * @param newRoles */ public void addRequiredRoles(Collection newRoles) { @@ -767,7 +766,7 @@ public boolean isAlliedPlayerForce() { /** * Whether this force is bot-controlled and allied to the player - * + * * @return */ public boolean isAlliedBotForce() { @@ -786,7 +785,7 @@ public boolean isEnemyBotForce() { /** * Convenience function that returns the displayable name of the selected unit * type. - * + * * @return */ public String getAllowedUnitTypeName() { @@ -800,7 +799,7 @@ public String getAllowedUnitTypeName() { /** * Attempt to deserialize an instance of a ScenarioForceTemplate from the * passed-in XML Node - * + * * @param xmlNode The source file * @return Possibly an instance of a ScenarioForceTemplate */ From 6607ff249fa945bb6a2521fb599c72d748c3b421 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 00:22:06 -0500 Subject: [PATCH 10/22] Corrected Opfor to OpFor in scenario templates Standardized the casing for "OpFor" across various scenario template XML files to maintain consistency and improve readability. This change impacts multiple templates, including "Minor Engagement" and "Isolated DropShip Defense." --- MekHQ/data/scenariotemplates/Base Defense.xml | 6 +++--- MekHQ/data/scenariotemplates/Breakthrough.xml | 6 +++--- .../scenariotemplates/Close Air Support.xml | 6 +++--- .../scenariotemplates/Convoy Interdiction.xml | 6 +++--- .../Critical Convoy Escort.xml | 6 +++--- .../scenariotemplates/Decoy Engagement.xml | 8 ++++---- .../scenariotemplates/Deep Raid Defense.xml | 4 ++-- MekHQ/data/scenariotemplates/Deep Raid.xml | 10 +++++----- .../scenariotemplates/Diversion Engagement.xml | 6 +++--- MekHQ/data/scenariotemplates/DropShip Raid.xml | 6 +++--- MekHQ/data/scenariotemplates/Duel.xml | 4 ++-- .../Frontier Assassination.xml | 4 ++-- .../Frontline Breakthrough.xml | 6 +++--- .../scenariotemplates/Frontline Disruption.xml | 6 +++--- .../Frontline VIP Capture.xml | 4 ++-- .../scenariotemplates/Hostile Facility.xml | 6 +++--- .../scenariotemplates/Intercept Engagement.xml | 6 +++--- .../scenariotemplates/Interception Defense.xml | 8 ++++---- .../Irregular Force Assault.xml | 18 +++++++++--------- .../Irregular Force Suppression.xml | 18 +++++++++--------- .../Isolated DropShip Defense.xml | 8 ++++---- .../scenariotemplates/LegacyAtB/AceDuel.xml | 4 ++-- .../LegacyAtB/AlliedTraitors.xml | 4 ++-- .../scenariotemplates/LegacyAtB/AllyRescue.xml | 4 ++-- .../scenariotemplates/LegacyAtB/Ambush.xml | 4 ++-- .../LegacyAtB/OfficerDuel.xml | 4 ++-- .../Low-Atmosphere DropShip Assault.xml | 6 +++--- .../Low-Atmosphere DropShip Escort.xml | 10 +++++----- .../scenariotemplates/Minor Engagement.xml | 4 ++-- .../data/scenariotemplates/Pivotal Battle.xml | 6 +++--- .../Reconnaissance Interdiction.xml | 6 +++--- .../scenariotemplates/Skirmish Disruption.xml | 4 ++-- .../Space Aerospace Intercept.xml | 6 +++--- .../scenariotemplates/Space Blockade Run.xml | 10 +++++----- .../Space DropShip Intercept.xml | 10 +++++----- 35 files changed, 117 insertions(+), 117 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Base Defense.xml b/MekHQ/data/scenariotemplates/Base Defense.xml index d30a9ecfb5..9b461e62b9 100644 --- a/MekHQ/data/scenariotemplates/Base Defense.xml +++ b/MekHQ/data/scenariotemplates/Base Defense.xml @@ -93,7 +93,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -119,7 +119,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -135,7 +135,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Breakthrough.xml b/MekHQ/data/scenariotemplates/Breakthrough.xml index 95a3c6e815..3cc0172306 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Breakthrough.xml @@ -46,7 +46,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.5 - Primary Opfor + Primary OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Close Air Support.xml b/MekHQ/data/scenariotemplates/Close Air Support.xml index 82b81eea36..dc237a5bc7 100644 --- a/MekHQ/data/scenariotemplates/Close Air Support.xml +++ b/MekHQ/data/scenariotemplates/Close Air Support.xml @@ -53,7 +53,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -79,7 +79,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -178,7 +178,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml index 204f0061d3..fd8389935d 100644 --- a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml +++ b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml @@ -44,7 +44,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -60,7 +60,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -160,7 +160,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml index a6d18b58b7..cfef4ed202 100644 --- a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml @@ -47,7 +47,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -63,7 +63,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -166,7 +166,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Decoy Engagement.xml b/MekHQ/data/scenariotemplates/Decoy Engagement.xml index e1999f4d82..b7b51d2c70 100644 --- a/MekHQ/data/scenariotemplates/Decoy Engagement.xml +++ b/MekHQ/data/scenariotemplates/Decoy Engagement.xml @@ -55,7 +55,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.25 - Primary Opfor + Primary OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + Primary OpFor @@ -115,7 +115,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml index 7764908527..c47a4ee286 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml @@ -182,7 +182,7 @@ - Dropship + DropShip -1 false @@ -200,7 +200,7 @@ 1 1 1.0 - Dropship + DropShip 4 3 4 diff --git a/MekHQ/data/scenariotemplates/Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml index 8ab58aabbc..fe9984c2e2 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -56,7 +56,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -87,7 +87,7 @@ - Dropship + DropShip -1 false @@ -122,7 +122,7 @@ - Dropship + DropShip @@ -140,7 +140,7 @@ - If the dropship cannot be deployed, this objective may be ignored. + If the DropShip cannot be deployed, this objective may be ignored. Destroy or cripple the following unit(s): NONE diff --git a/MekHQ/data/scenariotemplates/Diversion Engagement.xml b/MekHQ/data/scenariotemplates/Diversion Engagement.xml index 58b9861315..8635546862 100644 --- a/MekHQ/data/scenariotemplates/Diversion Engagement.xml +++ b/MekHQ/data/scenariotemplates/Diversion Engagement.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.25 - Primary Opfor + Primary OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/DropShip Raid.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml index 507ff289bd..830d0ed434 100644 --- a/MekHQ/data/scenariotemplates/DropShip Raid.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -2,7 +2,7 @@ DropShip Raid Destroy or cripple enemy DropShip. - An enemy dropship has been intercepted shortly after landing. You have 30 turns to destroy or cripple it before it can lift off. The defenders are not the priority. Preserve 50% of your forces to ensure mission success. + An enemy DropShip has been intercepted shortly after landing. You have 30 turns to destroy or cripple it before it can lift off. The defenders are not the priority. Preserve 50% of your forces to ensure mission success. false false @@ -56,7 +56,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Duel.xml b/MekHQ/data/scenariotemplates/Duel.xml index eaed2804d7..73eb0eb93a 100644 --- a/MekHQ/data/scenariotemplates/Duel.xml +++ b/MekHQ/data/scenariotemplates/Duel.xml @@ -58,7 +58,7 @@ - Opfor + OpFor -1 false @@ -74,7 +74,7 @@ 1 2 1.0 - Opfor + OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/Frontier Assassination.xml b/MekHQ/data/scenariotemplates/Frontier Assassination.xml index 526c2f9b45..75e2e4c860 100644 --- a/MekHQ/data/scenariotemplates/Frontier Assassination.xml +++ b/MekHQ/data/scenariotemplates/Frontier Assassination.xml @@ -55,7 +55,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 3 diff --git a/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml index fbf661287e..179b13a8be 100644 --- a/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml @@ -46,7 +46,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.5 - Primary Opfor + Primary OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Frontline Disruption.xml b/MekHQ/data/scenariotemplates/Frontline Disruption.xml index 6c6d698827..d08bf15d41 100644 --- a/MekHQ/data/scenariotemplates/Frontline Disruption.xml +++ b/MekHQ/data/scenariotemplates/Frontline Disruption.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 2.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -111,7 +111,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml index 78818e2fcd..af38604aa4 100644 --- a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml @@ -55,7 +55,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index b7f6950436..5bb87f81ac 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -90,7 +90,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -108,7 +108,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -124,7 +124,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Intercept Engagement.xml b/MekHQ/data/scenariotemplates/Intercept Engagement.xml index 0aae07acb8..b4c78dd6c3 100644 --- a/MekHQ/data/scenariotemplates/Intercept Engagement.xml +++ b/MekHQ/data/scenariotemplates/Intercept Engagement.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.25 - Primary Opfor + Primary OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Interception Defense.xml b/MekHQ/data/scenariotemplates/Interception Defense.xml index c0d6e536b8..c4fd042fd1 100644 --- a/MekHQ/data/scenariotemplates/Interception Defense.xml +++ b/MekHQ/data/scenariotemplates/Interception Defense.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -66,7 +66,7 @@ 0 2 1.5 - Primary Opfor + Primary OpFor 1 5 4 @@ -104,7 +104,7 @@ 50 0 OppositeEdge - Primary Opfor + Primary OpFor false @@ -112,7 +112,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml index 6caab83eb2..fec2bb069e 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml @@ -60,7 +60,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -76,7 +76,7 @@ -1 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -90,7 +90,7 @@ - Opfor Infantry + OpFor Infantry -1 false @@ -108,7 +108,7 @@ 0 2 2.0 - Opfor Infantry + OpFor Infantry 2 5 4 @@ -121,7 +121,7 @@ - Opfor Irregulars + OpFor Irregulars -1 false @@ -139,7 +139,7 @@ 0 2 2.0 - Opfor Irregulars + OpFor Irregulars 2 5 4 @@ -155,9 +155,9 @@ - Primary Opfor - Opfor Infantry - Opfor Irregulars + Primary OpFor + OpFor Infantry + OpFor Irregulars diff --git a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml index 97e94e31ef..5296390bc3 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml @@ -60,7 +60,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -76,7 +76,7 @@ -1 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -90,7 +90,7 @@ - Opfor Infantry + OpFor Infantry -1 false @@ -108,7 +108,7 @@ 0 2 2.0 - Opfor Infantry + OpFor Infantry 2 5 4 @@ -121,7 +121,7 @@ - Opfor Irregulars + OpFor Irregulars -1 false @@ -139,7 +139,7 @@ 0 2 2.0 - Opfor Irregulars + OpFor Irregulars 2 5 4 @@ -155,9 +155,9 @@ - Primary Opfor - Opfor Infantry - Opfor Irregulars + Primary OpFor + OpFor Infantry + OpFor Irregulars diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index f10dd0fcc4..f6d075415c 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor @@ -143,7 +143,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -182,7 +182,7 @@ - Dropship + DropShip -1 false @@ -200,7 +200,7 @@ 1 1 1.0 - Dropship + DropShip 4 3 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml index b04da1eac1..c20a31aaba 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml @@ -54,7 +54,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -70,7 +70,7 @@ 1 2 1.0 - Primary Opfor + Primary OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml index 456bf29cb7..74d6ffb618 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml @@ -52,7 +52,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -70,7 +70,7 @@ 2 1 1.0 - Primary Opfor + Primary OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml index 2ced4f346f..51c2e4af57 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml @@ -88,7 +88,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -104,7 +104,7 @@ 12 2 1.0 - Primary Opfor + Primary OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml b/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml index 7e6ea0b67a..fe0cf05678 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -66,7 +66,7 @@ 2 2 1.0 - Primary Opfor + Primary OpFor 1 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml index 0da53cbea5..7ee9974f2e 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml @@ -54,7 +54,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -70,7 +70,7 @@ 1 2 1.0 - Primary Opfor + Primary OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml index 9e49683b5c..adbb118a68 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml @@ -49,7 +49,7 @@ - Opfor Dropship + Opfor DropShip -1 false @@ -65,7 +65,7 @@ 1 2 1.0 - Opfor Dropship + Opfor DropShip 3 5 4 @@ -113,7 +113,7 @@ - Opfor Dropship + Opfor DropShip diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index 454a03a449..0c98de0819 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -18,7 +18,7 @@ - Primary Opfor + Primary OpFor @@ -141,7 +141,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -157,7 +157,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -171,7 +171,7 @@ - Allied Dropship + Allied DropShip -1 false @@ -187,7 +187,7 @@ 1 1 1.0 - Allied Dropship + Allied DropShip 4 4 4 diff --git a/MekHQ/data/scenariotemplates/Minor Engagement.xml b/MekHQ/data/scenariotemplates/Minor Engagement.xml index afb5477854..d8404e4ee1 100644 --- a/MekHQ/data/scenariotemplates/Minor Engagement.xml +++ b/MekHQ/data/scenariotemplates/Minor Engagement.xml @@ -55,7 +55,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 3 diff --git a/MekHQ/data/scenariotemplates/Pivotal Battle.xml b/MekHQ/data/scenariotemplates/Pivotal Battle.xml index 836bcd52d7..f40fe41fe6 100644 --- a/MekHQ/data/scenariotemplates/Pivotal Battle.xml +++ b/MekHQ/data/scenariotemplates/Pivotal Battle.xml @@ -55,7 +55,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml index 4af989f234..fbfa4f8960 100644 --- a/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml +++ b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml @@ -58,7 +58,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 2 @@ -91,7 +91,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml index 5c24dbf014..dc5748106e 100644 --- a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml +++ b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml @@ -48,7 +48,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -64,7 +64,7 @@ 0 2 2.0 - Primary Opfor + Primary OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml index 92ec93becd..b24eab27d3 100644 --- a/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml @@ -58,7 +58,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -91,7 +91,7 @@ - Primary Opfor + Primary OpFor diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index cc03d2076d..f9f9a7e189 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -52,7 +52,7 @@ - Primary Opfor + Primary OpFor @@ -141,7 +141,7 @@ - Escorted Dropship + Escorted DropShip -1 false @@ -157,7 +157,7 @@ 1 1 1.0 - Escorted Dropship + Escorted DropShip 4 4 4 @@ -171,7 +171,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -187,7 +187,7 @@ 1 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml index 4b70cb06c6..8b603b4da3 100644 --- a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml @@ -45,7 +45,7 @@ - Primary Opfor + Primary OpFor @@ -134,7 +134,7 @@ - Primary Opfor + Primary OpFor -1 false @@ -150,7 +150,7 @@ 1 2 1.0 - Primary Opfor + Primary OpFor 1 5 4 @@ -164,7 +164,7 @@ - Enemy Dropships + Enemy DropShips -1 false @@ -180,7 +180,7 @@ 1 2 1.0 - Enemy Dropships + Enemy DropShips 3 5 4 From df8cdcc69bb9061be75fc8cf18bf263e5d6ead45 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 09:58:10 -0500 Subject: [PATCH 11/22] Rename 'Primary OpFor' to 'OpFor' in scenario templates Updated various scenario template XML files by renaming 'Primary OpFor' to 'OpFor' for consistency and clarity. Also made minor brief description adjustments and renamed other entities like 'Escorted DropShip' to 'DropShip' in relevant templates. --- MekHQ/data/scenariotemplates/Annihilation.xml | 6 +++--- MekHQ/data/scenariotemplates/Assassination.xml | 4 ++-- MekHQ/data/scenariotemplates/Base Defense.xml | 12 ++++++------ MekHQ/data/scenariotemplates/Breakthrough.xml | 6 +++--- .../scenariotemplates/Close Air Support.xml | 6 +++--- MekHQ/data/scenariotemplates/Convoy Escort.xml | 6 +++--- .../scenariotemplates/Convoy Interdiction.xml | 6 +++--- MekHQ/data/scenariotemplates/Convoy Raid.xml | 6 +++--- MekHQ/data/scenariotemplates/Covert Strike.xml | 4 ++-- .../Critical Convoy Escort.xml | 6 +++--- .../scenariotemplates/Decoy Engagement.xml | 8 ++++---- .../scenariotemplates/Decoy Interception.xml | 8 ++++---- .../scenariotemplates/Deep Raid Defense.xml | 10 +++++----- MekHQ/data/scenariotemplates/Deep Raid.xml | 10 +++++----- .../scenariotemplates/Diversion Engagement.xml | 6 +++--- MekHQ/data/scenariotemplates/DropShip Raid.xml | 10 +++++----- .../Frontier Assassination.xml | 4 ++-- .../Frontline Breakthrough.xml | 6 +++--- .../scenariotemplates/Frontline Disruption.xml | 6 +++--- .../scenariotemplates/Frontline Engagement.xml | 6 +++--- .../Frontline VIP Capture.xml | 6 +++--- .../scenariotemplates/Heavy Recon Evasion.xml | 8 ++++---- .../scenariotemplates/Hostile Facility.xml | 10 +++++----- .../scenariotemplates/Intercept Engagement.xml | 6 +++--- .../scenariotemplates/Interception Defense.xml | 8 ++++---- .../Irregular Force Assault.xml | 18 +++++++++--------- .../Irregular Force Suppression.xml | 18 +++++++++--------- .../Isolated DropShip Defense.xml | 6 +++--- .../scenariotemplates/LegacyAtB/AceDuel.xml | 4 ++-- .../LegacyAtB/AlliedTraitors.xml | 4 ++-- .../scenariotemplates/LegacyAtB/AllyRescue.xml | 4 ++-- .../scenariotemplates/LegacyAtB/Ambush.xml | 4 ++-- .../LegacyAtB/OfficerDuel.xml | 4 ++-- .../Low-Atmosphere Air Intercept.xml | 6 +++--- .../Low-Atmosphere DropShip Assault.xml | 10 +++++----- .../Low-Atmosphere DropShip Escort.xml | 12 ++++++------ .../scenariotemplates/Minor Engagement.xml | 6 +++--- .../Picket Line Breakthrough.xml | 6 +++--- .../data/scenariotemplates/Pivotal Battle.xml | 6 +++--- MekHQ/data/scenariotemplates/Recon Evasion.xml | 4 ++-- .../Reconnaissance Interdiction.xml | 6 +++--- .../scenariotemplates/Remote VIP Capture.xml | 6 +++--- .../scenariotemplates/Skirmish Disruption.xml | 6 +++--- MekHQ/data/scenariotemplates/Skirmish.xml | 6 +++--- .../Space Aerospace Intercept.xml | 6 +++--- .../scenariotemplates/Space Blockade Run.xml | 16 ++++++++-------- .../Space DropShip Intercept.xml | 16 ++++++++-------- .../scenariotemplates/Tactical Withdrawal.xml | 6 +++--- MekHQ/data/scenariotemplates/VIP Capture.xml | 6 +++--- 49 files changed, 180 insertions(+), 180 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Annihilation.xml b/MekHQ/data/scenariotemplates/Annihilation.xml index 51f9feb88b..b00b87bc29 100644 --- a/MekHQ/data/scenariotemplates/Annihilation.xml +++ b/MekHQ/data/scenariotemplates/Annihilation.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Assassination.xml b/MekHQ/data/scenariotemplates/Assassination.xml index a6408c8861..d0d8bbfb75 100644 --- a/MekHQ/data/scenariotemplates/Assassination.xml +++ b/MekHQ/data/scenariotemplates/Assassination.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Base Defense.xml b/MekHQ/data/scenariotemplates/Base Defense.xml index 9b461e62b9..44107f9c6e 100644 --- a/MekHQ/data/scenariotemplates/Base Defense.xml +++ b/MekHQ/data/scenariotemplates/Base Defense.xml @@ -21,7 +21,7 @@ - Base Turrets + Base Defenses -1 false @@ -39,7 +39,7 @@ 0 1 1.0 - Base Turrets + Base Defenses 2 4 4 @@ -93,7 +93,7 @@ - Primary OpFor + OpFor -1 false @@ -119,7 +119,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -135,7 +135,7 @@ - Primary OpFor + OpFor @@ -162,7 +162,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariotemplates/Breakthrough.xml b/MekHQ/data/scenariotemplates/Breakthrough.xml index 3cc0172306..44c9e0dc0f 100644 --- a/MekHQ/data/scenariotemplates/Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Breakthrough.xml @@ -46,7 +46,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.5 - Primary OpFor + OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Close Air Support.xml b/MekHQ/data/scenariotemplates/Close Air Support.xml index dc237a5bc7..f1e149f8de 100644 --- a/MekHQ/data/scenariotemplates/Close Air Support.xml +++ b/MekHQ/data/scenariotemplates/Close Air Support.xml @@ -53,7 +53,7 @@ - Primary OpFor + OpFor -1 false @@ -79,7 +79,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -178,7 +178,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Convoy Escort.xml b/MekHQ/data/scenariotemplates/Convoy Escort.xml index 8bc7c1282e..b575aed967 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort.xml @@ -47,7 +47,7 @@ - Primary Opfor + OpFor -1 false @@ -63,7 +63,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -166,7 +166,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml index fd8389935d..ca7c9e1d22 100644 --- a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml +++ b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml @@ -44,7 +44,7 @@ - Primary OpFor + OpFor -1 false @@ -60,7 +60,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -160,7 +160,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Convoy Raid.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml index 8f7b5dd672..423568d268 100644 --- a/MekHQ/data/scenariotemplates/Convoy Raid.xml +++ b/MekHQ/data/scenariotemplates/Convoy Raid.xml @@ -44,7 +44,7 @@ - Primary Opfor + OpFor -1 false @@ -60,7 +60,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -160,7 +160,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Covert Strike.xml b/MekHQ/data/scenariotemplates/Covert Strike.xml index 8a39d80889..b54720d42a 100644 --- a/MekHQ/data/scenariotemplates/Covert Strike.xml +++ b/MekHQ/data/scenariotemplates/Covert Strike.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml index cfef4ed202..d7d04b106f 100644 --- a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml @@ -47,7 +47,7 @@ - Primary OpFor + OpFor -1 false @@ -63,7 +63,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -166,7 +166,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Decoy Engagement.xml b/MekHQ/data/scenariotemplates/Decoy Engagement.xml index b7b51d2c70..27bce72560 100644 --- a/MekHQ/data/scenariotemplates/Decoy Engagement.xml +++ b/MekHQ/data/scenariotemplates/Decoy Engagement.xml @@ -55,7 +55,7 @@ - Primary OpFor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.25 - Primary OpFor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary OpFor + OpFor @@ -115,7 +115,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Decoy Interception.xml b/MekHQ/data/scenariotemplates/Decoy Interception.xml index 82d67f9982..b783af63ef 100644 --- a/MekHQ/data/scenariotemplates/Decoy Interception.xml +++ b/MekHQ/data/scenariotemplates/Decoy Interception.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.25 - Primary Opfor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor @@ -115,7 +115,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml index c47a4ee286..7524f5f384 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml @@ -48,7 +48,7 @@ - Primary Opfor + OpFor @@ -143,7 +143,7 @@ - Primary Opfor + OpFor -1 false @@ -169,7 +169,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -201,8 +201,8 @@ 1 1.0 DropShip - 4 - 3 + 3 + 1 4 0 diff --git a/MekHQ/data/scenariotemplates/Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml index fe9984c2e2..dd412d17a1 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -1,8 +1,8 @@ Deep Raid - Destroy or cripple enemy DropShip. - A grounded enemy DropShip must be destroyed or crippled within 30 turns before it lifts off. This raid takes place deep behind enemy lines, and the DropShip’s defenders are not important. Preserve 50% of your forces during the operation to ensure mission success. + Destroy or cripple DropShip. + A grounded DropShip must be destroyed or crippled within 30 turns before it lifts off. This raid takes place deep behind enemy lines, and the DropShip’s defenders are not important. Preserve 50% of your forces during the operation to ensure mission success. false false @@ -56,7 +56,7 @@ - Primary OpFor + OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -106,7 +106,7 @@ 2 1.0 DropShip - 4 + 3 3 4 0 diff --git a/MekHQ/data/scenariotemplates/Diversion Engagement.xml b/MekHQ/data/scenariotemplates/Diversion Engagement.xml index 8635546862..31849ec4e0 100644 --- a/MekHQ/data/scenariotemplates/Diversion Engagement.xml +++ b/MekHQ/data/scenariotemplates/Diversion Engagement.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.25 - Primary OpFor + OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/DropShip Raid.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml index 830d0ed434..3a1b2300c4 100644 --- a/MekHQ/data/scenariotemplates/DropShip Raid.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -1,8 +1,8 @@ DropShip Raid - Destroy or cripple enemy DropShip. - An enemy DropShip has been intercepted shortly after landing. You have 30 turns to destroy or cripple it before it can lift off. The defenders are not the priority. Preserve 50% of your forces to ensure mission success. + Destroy or cripple DropShip. + A DropShip has been intercepted shortly after landing. You have 30 turns to destroy or cripple it before it can lift off. The defenders are not the priority. Preserve 50% of your forces to ensure mission success. false false @@ -56,7 +56,7 @@ - Primary OpFor + OpFor -1 false @@ -74,8 +74,8 @@ 0 2 1.0 - Primary OpFor - 1 + OpFor + 3 5 4 0 diff --git a/MekHQ/data/scenariotemplates/Frontier Assassination.xml b/MekHQ/data/scenariotemplates/Frontier Assassination.xml index 75e2e4c860..812ca61923 100644 --- a/MekHQ/data/scenariotemplates/Frontier Assassination.xml +++ b/MekHQ/data/scenariotemplates/Frontier Assassination.xml @@ -55,7 +55,7 @@ - Primary OpFor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 3 diff --git a/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml index 179b13a8be..977d4de8c5 100644 --- a/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Frontline Breakthrough.xml @@ -46,7 +46,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.5 - Primary OpFor + OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Frontline Disruption.xml b/MekHQ/data/scenariotemplates/Frontline Disruption.xml index d08bf15d41..101a7fbee6 100644 --- a/MekHQ/data/scenariotemplates/Frontline Disruption.xml +++ b/MekHQ/data/scenariotemplates/Frontline Disruption.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 2.0 - Primary OpFor + OpFor 1 5 4 @@ -111,7 +111,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Frontline Engagement.xml b/MekHQ/data/scenariotemplates/Frontline Engagement.xml index dec15838ef..1a3a4953c2 100644 --- a/MekHQ/data/scenariotemplates/Frontline Engagement.xml +++ b/MekHQ/data/scenariotemplates/Frontline Engagement.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml index af38604aa4..924cd6f698 100644 --- a/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Frontline VIP Capture.xml @@ -55,7 +55,7 @@ - Primary OpFor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -145,7 +145,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml b/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml index 1a4a4123a1..6317b7649c 100644 --- a/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml +++ b/MekHQ/data/scenariotemplates/Heavy Recon Evasion.xml @@ -58,7 +58,7 @@ - Primary Opfor + OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -91,7 +91,7 @@ - Primary Opfor + OpFor @@ -125,7 +125,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index 5bb87f81ac..69866a6cc9 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -20,7 +20,7 @@ - Base Turrets + Base Defenses -1 false @@ -38,7 +38,7 @@ 0 2 1.0 - Base Turrets + Base Defenses 2 5 4 @@ -90,7 +90,7 @@ - Primary OpFor + OpFor -1 false @@ -108,7 +108,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -124,7 +124,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Intercept Engagement.xml b/MekHQ/data/scenariotemplates/Intercept Engagement.xml index b4c78dd6c3..d907fe595f 100644 --- a/MekHQ/data/scenariotemplates/Intercept Engagement.xml +++ b/MekHQ/data/scenariotemplates/Intercept Engagement.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.25 - Primary OpFor + OpFor 1 5 4 @@ -110,7 +110,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Interception Defense.xml b/MekHQ/data/scenariotemplates/Interception Defense.xml index c4fd042fd1..23e495923e 100644 --- a/MekHQ/data/scenariotemplates/Interception Defense.xml +++ b/MekHQ/data/scenariotemplates/Interception Defense.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -66,7 +66,7 @@ 0 2 1.5 - Primary OpFor + OpFor 1 5 4 @@ -104,7 +104,7 @@ 50 0 OppositeEdge - Primary OpFor + OpFor false @@ -112,7 +112,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml index fec2bb069e..6747be8c56 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml @@ -60,7 +60,7 @@ - Primary OpFor + OpFor -1 false @@ -76,7 +76,7 @@ -1 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -90,7 +90,7 @@ - OpFor Infantry + Infantry -1 false @@ -108,7 +108,7 @@ 0 2 2.0 - OpFor Infantry + Infantry 2 5 4 @@ -121,7 +121,7 @@ - OpFor Irregulars + Irregulars -1 false @@ -139,7 +139,7 @@ 0 2 2.0 - OpFor Irregulars + Irregulars 2 5 4 @@ -155,9 +155,9 @@ - Primary OpFor - OpFor Infantry - OpFor Irregulars + OpFor + Infantry + Irregulars diff --git a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml index 5296390bc3..71fed740dc 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml @@ -60,7 +60,7 @@ - Primary OpFor + OpFor -1 false @@ -76,7 +76,7 @@ -1 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -90,7 +90,7 @@ - OpFor Infantry + Infantry -1 false @@ -108,7 +108,7 @@ 0 2 2.0 - OpFor Infantry + Infantry 2 5 4 @@ -121,7 +121,7 @@ - OpFor Irregulars + Irregulars -1 false @@ -139,7 +139,7 @@ 0 2 2.0 - OpFor Irregulars + Irregulars 2 5 4 @@ -155,9 +155,9 @@ - Primary OpFor - OpFor Infantry - OpFor Irregulars + OpFor + Infantry + Irregulars diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index f6d075415c..5a3fdb713b 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor @@ -143,7 +143,7 @@ - Primary OpFor + OpFor -1 false @@ -169,7 +169,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml index c20a31aaba..76853c14fc 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml @@ -54,7 +54,7 @@ - Primary OpFor + OpFor -1 false @@ -70,7 +70,7 @@ 1 2 1.0 - Primary OpFor + OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml index 74d6ffb618..67b832dace 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml @@ -52,7 +52,7 @@ - Primary OpFor + OpFor -1 false @@ -70,7 +70,7 @@ 2 1 1.0 - Primary OpFor + OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml index 51c2e4af57..74704dc4db 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/AllyRescue.xml @@ -88,7 +88,7 @@ - Primary OpFor + OpFor -1 false @@ -104,7 +104,7 @@ 12 2 1.0 - Primary OpFor + OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml b/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml index fe0cf05678..ef48085b5b 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/Ambush.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -66,7 +66,7 @@ 2 2 1.0 - Primary OpFor + OpFor 1 1 4 diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml index 7ee9974f2e..96e7b292c4 100644 --- a/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml +++ b/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml @@ -54,7 +54,7 @@ - Primary OpFor + OpFor -1 false @@ -70,7 +70,7 @@ 1 2 1.0 - Primary OpFor + OpFor 3 1 4 diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml index 99d79ca5e1..1505abad48 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere Air Intercept.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml index adbb118a68..2768698219 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml @@ -49,7 +49,7 @@ - Opfor DropShip + DropShip -1 false @@ -65,7 +65,7 @@ 1 2 1.0 - Opfor DropShip + OpFor DropShip 3 5 4 @@ -80,7 +80,7 @@ - Opfor Escorts + Escorts -1 false @@ -96,7 +96,7 @@ 1 2 1.0 - Opfor Escorts + Escorts 1 5 4 @@ -113,7 +113,7 @@ - Opfor DropShip + DropShip diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index 0c98de0819..9f03078cd4 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -18,7 +18,7 @@ - Primary OpFor + OpFor @@ -45,7 +45,7 @@ - Allied DropShip + DropShip @@ -141,7 +141,7 @@ - Primary OpFor + OpFor -1 false @@ -157,7 +157,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -171,7 +171,7 @@ - Allied DropShip + DropShip -1 false @@ -187,7 +187,7 @@ 1 1 1.0 - Allied DropShip + DropShip 4 4 4 diff --git a/MekHQ/data/scenariotemplates/Minor Engagement.xml b/MekHQ/data/scenariotemplates/Minor Engagement.xml index d8404e4ee1..b1cbd23650 100644 --- a/MekHQ/data/scenariotemplates/Minor Engagement.xml +++ b/MekHQ/data/scenariotemplates/Minor Engagement.xml @@ -55,7 +55,7 @@ - Primary OpFor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 3 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml b/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml index 8cb83ebd27..4b3b117f3e 100644 --- a/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml +++ b/MekHQ/data/scenariotemplates/Picket Line Breakthrough.xml @@ -46,7 +46,7 @@ - Primary Opfor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 1.5 - Primary Opfor + OpFor 1 5 3 @@ -110,7 +110,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Pivotal Battle.xml b/MekHQ/data/scenariotemplates/Pivotal Battle.xml index f40fe41fe6..4a38a57327 100644 --- a/MekHQ/data/scenariotemplates/Pivotal Battle.xml +++ b/MekHQ/data/scenariotemplates/Pivotal Battle.xml @@ -55,7 +55,7 @@ - Primary OpFor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -87,7 +87,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Recon Evasion.xml b/MekHQ/data/scenariotemplates/Recon Evasion.xml index be1abd4b93..28a4c294f0 100644 --- a/MekHQ/data/scenariotemplates/Recon Evasion.xml +++ b/MekHQ/data/scenariotemplates/Recon Evasion.xml @@ -58,7 +58,7 @@ - Primary Opfor + OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.5 - Primary Opfor + OpFor 1 5 2 diff --git a/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml index fbfa4f8960..fb699e8b6e 100644 --- a/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml +++ b/MekHQ/data/scenariotemplates/Reconnaissance Interdiction.xml @@ -58,7 +58,7 @@ - Primary OpFor + OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 2 @@ -91,7 +91,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml index 37daf0c66c..43f45bd129 100644 --- a/MekHQ/data/scenariotemplates/Remote VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/Remote VIP Capture.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 3 @@ -145,7 +145,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml index dc5748106e..4615367b98 100644 --- a/MekHQ/data/scenariotemplates/Skirmish Disruption.xml +++ b/MekHQ/data/scenariotemplates/Skirmish Disruption.xml @@ -48,7 +48,7 @@ - Primary OpFor + OpFor -1 false @@ -64,7 +64,7 @@ 0 2 2.0 - Primary OpFor + OpFor 1 5 4 @@ -111,7 +111,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Skirmish.xml b/MekHQ/data/scenariotemplates/Skirmish.xml index eb9da1de9b..8f25ed200e 100644 --- a/MekHQ/data/scenariotemplates/Skirmish.xml +++ b/MekHQ/data/scenariotemplates/Skirmish.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 3 @@ -87,7 +87,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml index b24eab27d3..75d63c8d05 100644 --- a/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space Aerospace Intercept.xml @@ -58,7 +58,7 @@ - Primary OpFor + OpFor -1 false @@ -74,7 +74,7 @@ 0 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -91,7 +91,7 @@ - Primary OpFor + OpFor diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index f9f9a7e189..3255598a81 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -1,8 +1,8 @@ Space Blockade Run - Break enemy blockade, escort allied DropShip. - An allied DropShip is attempting to run an enemy blockade in space. Your mission is to ensure the DropShip survives the run. Either destroy 50% of the enemy forces or break through the blockade while preserving 50% of your own forces. + Break enemy blockade, escort DropShip. + A DropShip is attempting to run an enemy blockade in space. Your mission is to ensure the DropShip survives the run. Either destroy 50% of the enemy forces or break through the blockade while preserving 50% of your own forces. false false @@ -18,7 +18,7 @@ - Escorted DropShip + DropShip @@ -52,7 +52,7 @@ - Primary OpFor + OpFor @@ -141,7 +141,7 @@ - Escorted DropShip + DropShip -1 false @@ -157,7 +157,7 @@ 1 1 1.0 - Escorted DropShip + DropShip 4 4 4 @@ -171,7 +171,7 @@ - Primary OpFor + OpFor -1 false @@ -187,7 +187,7 @@ 1 2 1.0 - Primary OpFor + OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml index 8b603b4da3..22c5c958f3 100644 --- a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml @@ -1,8 +1,8 @@ Space DropShip Intercept - Prevent enemy DropShip escape. - An enemy DropShip has been detected in space, attempting to escape. Your mission is to destroy or severely damage the DropShip before it can flee. Preserve at least 50% of your forces during the engagement to ensure success. + Prevent DropShip escape. + A DropShip has been detected in space, attempting to escape. Your mission is to destroy or severely damage the DropShip before it can flee. Preserve at least 50% of your forces during the engagement to ensure success. false false @@ -18,7 +18,7 @@ - Enemy DropShips + DropShip @@ -45,7 +45,7 @@ - Primary OpFor + OpFor @@ -134,7 +134,7 @@ - Primary OpFor + OpFor -1 false @@ -150,7 +150,7 @@ 1 2 1.0 - Primary OpFor + OpFor 1 5 4 @@ -164,7 +164,7 @@ - Enemy DropShips + DropShip -1 false @@ -180,7 +180,7 @@ 1 2 1.0 - Enemy DropShips + DropShip 3 5 4 diff --git a/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml index be52975a48..128fd29f20 100644 --- a/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml +++ b/MekHQ/data/scenariotemplates/Tactical Withdrawal.xml @@ -49,7 +49,7 @@ - Primary Opfor + OpFor @@ -109,7 +109,7 @@ - Primary Opfor + OpFor -1 false @@ -127,7 +127,7 @@ 0 2 2.0 - Primary Opfor + OpFor 1 5 4 diff --git a/MekHQ/data/scenariotemplates/VIP Capture.xml b/MekHQ/data/scenariotemplates/VIP Capture.xml index 65cad35966..224e797977 100644 --- a/MekHQ/data/scenariotemplates/VIP Capture.xml +++ b/MekHQ/data/scenariotemplates/VIP Capture.xml @@ -55,7 +55,7 @@ - Primary Opfor + OpFor -1 false @@ -71,7 +71,7 @@ 0 2 1.0 - Primary Opfor + OpFor 1 5 4 @@ -145,7 +145,7 @@ - Primary Opfor + OpFor From 177f633e5817d6f48b586f454e31846ec4b369d5 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 10:35:07 -0500 Subject: [PATCH 12/22] Update contract scenarios and add new 'VIP Defense' template Removed unnecessary convoy escort scenarios from ExtractionRaid.xml and added 'Deep Raid' to ObjectiveRaid.xml. Introduced a new scenario template for VIP Defense. Updated various contract definitions to include new and relevant scenarios. --- MekHQ/data/scenariotemplates/Convoy Raid.xml | 2 +- .../scenariotemplates/ScenarioManifest.xml | 4 + MekHQ/data/scenariotemplates/VIP Defense.xml | 200 ++++++++++++++++++ .../DiversionaryRaid.xml | 18 +- .../ExtractionRaid.xml | 2 - .../GuerillaWarfare.xml | 15 ++ .../ObjectiveRaid.xml | 1 + .../PirateHunting.xml | 4 +- .../PlanetaryAssault.xml | 19 ++ .../stratconcontractdefinitions/ReconRaid.xml | 2 + .../stratconcontractdefinitions/RiotDuty.xml | 1 + .../SecurityDuty.xml | 10 + 12 files changed, 270 insertions(+), 8 deletions(-) create mode 100644 MekHQ/data/scenariotemplates/VIP Defense.xml diff --git a/MekHQ/data/scenariotemplates/Convoy Raid.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml index 423568d268..1b3885e729 100644 --- a/MekHQ/data/scenariotemplates/Convoy Raid.xml +++ b/MekHQ/data/scenariotemplates/Convoy Raid.xml @@ -2,7 +2,7 @@ Convoy Raid Intercept and disrupt enemy convoy. - An enemy convoy carrying standard supplies is moving through the area. The objective is to prevent at least 50% of the convoy units from reaching the far edge of the map. The convoy will surrender if 50% of its escorts are destroyed or routed. Preserve 50% of friendly forces. + An enemy convoy carrying supplies is moving through the area. The objective is to prevent at least 50% of the convoy units from reaching the far edge of the map. The convoy will surrender if 50% of its escorts are destroyed or routed. Preserve 50% of friendly forces. false diff --git a/MekHQ/data/scenariotemplates/ScenarioManifest.xml b/MekHQ/data/scenariotemplates/ScenarioManifest.xml index bdce2a0b66..6a68eca3f7 100644 --- a/MekHQ/data/scenariotemplates/ScenarioManifest.xml +++ b/MekHQ/data/scenariotemplates/ScenarioManifest.xml @@ -176,5 +176,9 @@ 43 VIP Capture.xml + + 44 + VIP Defense.xml + diff --git a/MekHQ/data/scenariotemplates/VIP Defense.xml b/MekHQ/data/scenariotemplates/VIP Defense.xml new file mode 100644 index 0000000000..e877012e1f --- /dev/null +++ b/MekHQ/data/scenariotemplates/VIP Defense.xml @@ -0,0 +1,200 @@ + + + VIP Defense + Protect VIP and defeat enemy. + Your mission is to protect a high-value VIP while engaging the enemy. Defeat at least 50% of enemy forces and preserve 50% of your own. Ensure the VIP remains safe throughout the engagement to achieve mission success. + + + false + 0 + 0 + 5 + AllGroundTerrain + true + 5 + + + + Player + + -1 + false + -2 + 0 + true + true + true + true + false + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + 5 + 0 + 0 + 1.0 + Player + 0 + 1 + 4 + 0 + 50 + 0 + None + false + + + + VIP + + -1 + false + -2 + 0 + false + true + true + true + false + + 5 + 1 + 0 + 1.0 + 1 + VIP + 3 + 1 + 4 + 3 + 0 + 0 + SameEdge + Player + false + + + + OpFor + + -1 + false + -2 + 0 + true + false + true + false + false + + 5 + 0 + 2 + 1.0 + OpFor + 1 + 5 + 4 + 2 + 50 + 0 + OppositeEdge + Player + false + + + + + + + VIP + + + + + ScenarioVictory + Fixed + 2 + + + + + ScenarioDefeat + Fixed + 2 + + + Preserve 100% of the following force(s) and unit(s): + NONE + Preserve + 100 + 0 + true + None + + + + OpFor + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Destroy or rout 50% of the following force(s) and unit(s): + NONE + ForceWithdraw + 50 + true + None + + + + Player + + + + + ScenarioVictory + Fixed + 1 + + + + + ScenarioDefeat + Fixed + 1 + + + + Preserve 50% of the following force(s) and unit(s): + NONE + Preserve + 50 + true + None + + + diff --git a/MekHQ/data/stratconcontractdefinitions/DiversionaryRaid.xml b/MekHQ/data/stratconcontractdefinitions/DiversionaryRaid.xml index 43e6bf4e92..b5a279f638 100644 --- a/MekHQ/data/stratconcontractdefinitions/DiversionaryRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/DiversionaryRaid.xml @@ -18,9 +18,19 @@ 3 - - -1 - AnyScenarioVictory - + + -1.0 + AnyScenarioVictory + + Assassination.xml + Convoy Interdiction.xml + Convoy Raid.xml + Covert Strike.xml + Decoy Engagement.xml + Frontier Assassination.xml + Frontline Disruption.xml + Tactical Withdrawal.xml + + diff --git a/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml b/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml index 854ddbfe00..b3c67bdccc 100644 --- a/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ExtractionRaid.xml @@ -37,8 +37,6 @@ Covert Strike.xml Convoy Interdiction.xml Convoy Raid.xml - Convoy Escort.xml - Critical Convoy Escort.xml diff --git a/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml b/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml index 0e1f7548b8..21625a06bd 100644 --- a/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml +++ b/MekHQ/data/stratconcontractdefinitions/GuerillaWarfare.xml @@ -26,5 +26,20 @@ OverwhelmingEnemyAirReinforcements.xml + + -0.5 + AnyScenarioVictory + + Convoy Interdiction.xml + Convoy Raid.xml + Frontier Assassination.xml + Heavy Recon Evasion.xml + Intercept Engagement.xml + Recon Evasion.xml + Remote VIP Capture.xml + Skirmish.xml + Tactical Withdrawal.xml + + diff --git a/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml b/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml index bb7714ea3d..0e39ffa0de 100644 --- a/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ObjectiveRaid.xml @@ -30,6 +30,7 @@ Covert Strike.xml Convoy Interdiction.xml Convoy Raid.xml + Deep Raid.xml diff --git a/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml b/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml index 308fff914c..deb4cfe6ec 100644 --- a/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml +++ b/MekHQ/data/stratconcontractdefinitions/PirateHunting.xml @@ -29,9 +29,11 @@ -0.33 AnyScenarioVictory + Convoy Escort.xml + Critical Convoy Escort.xml Deep Raid.xml + DropShip Raid.xml Isolated DropShip Defense.xml - Low-Atmosphere DropShip Assault.xml diff --git a/MekHQ/data/stratconcontractdefinitions/PlanetaryAssault.xml b/MekHQ/data/stratconcontractdefinitions/PlanetaryAssault.xml index b55734e669..b5afb709ec 100644 --- a/MekHQ/data/stratconcontractdefinitions/PlanetaryAssault.xml +++ b/MekHQ/data/stratconcontractdefinitions/PlanetaryAssault.xml @@ -21,5 +21,24 @@ FacilityDestruction -1 + + -0.5 + AnyScenarioVictory + + Annihilation.xml + Breakthrough.xml + Decoy Engagement.xml + Decoy Interception.xml + Deep Raid.xml + Deep Raid Defense.xml + Frontline Breakthrough.xml + Frontline Disruption.xml + Frontline Engagement.xml + Intercept Engagement.xml + Interception Defense.xml + Picket Line Breakthrough.xml + Pivotal Battle.xml + + diff --git a/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml b/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml index d699ae20d1..dd9f25cd28 100644 --- a/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml +++ b/MekHQ/data/stratconcontractdefinitions/ReconRaid.xml @@ -32,6 +32,8 @@ -0.5 Recon Evasion.xml + Heavy Recon Evasion.xml + Remote VIP Capture.xml diff --git a/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml b/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml index 545a1db538..94a44508b3 100644 --- a/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml +++ b/MekHQ/data/stratconcontractdefinitions/RiotDuty.xml @@ -28,6 +28,7 @@ Irregular Force Assault.xml Irregular Force Suppression.xml + VIP Defense.xml diff --git a/MekHQ/data/stratconcontractdefinitions/SecurityDuty.xml b/MekHQ/data/stratconcontractdefinitions/SecurityDuty.xml index 79b5c81468..a7215f21bd 100644 --- a/MekHQ/data/stratconcontractdefinitions/SecurityDuty.xml +++ b/MekHQ/data/stratconcontractdefinitions/SecurityDuty.xml @@ -22,5 +22,15 @@ AlliedFacilityControl -1 + + -0.5 + SpecificScenarioVictory + + Convoy Escort.xml + Critical Convoy Escort.xml + Reconnaissance Interdiction.xml + VIP Defense.xml + + From fac8a34e2c0df9809418a0d104b442d531b7c27f Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 10:56:12 -0500 Subject: [PATCH 13/22] Update contract scenarios and add new 'VIP Defense' template Removed unnecessary convoy escort scenarios from ExtractionRaid.xml and added 'Deep Raid' to ObjectiveRaid.xml. Introduced a new scenario template for VIP Defense. Updated various contract definitions to include new and relevant scenarios. --- MekHQ/data/scenariomodifiers/ArmednArmored.xml | 2 +- MekHQ/data/scenariomodifiers/BadIntelAir.xml | 4 ++-- MekHQ/data/scenariomodifiers/BadIntelGround.xml | 4 ++-- MekHQ/data/scenariomodifiers/Elites.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyASFAce01.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyASFAce02.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirCav.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirSupport.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyArty.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyDropship.xml | 6 +++--- MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyHotDrop.xml | 6 +++--- MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyMercScouts.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyReinforcements.xml | 4 ++-- MekHQ/data/scenariomodifiers/EnemyTankGarrison.xml | 4 ++-- MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml | 2 +- .../scenariomodifiers/FacilityHostileCaptureNonWin.xml | 2 +- MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml | 6 +++--- MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml | 2 +- .../OverwhelmingEnemyAirReinforcements.xml | 4 ++-- .../OverwhelmingEnemyGroundReinforcements.xml | 4 ++-- MekHQ/data/scenariomodifiers/Rookies.xml | 2 +- MekHQ/data/scenariomodifiers/Veterans.xml | 2 +- MekHQ/data/scenariomodifiers/airBattleModifiers.xml | 6 +++--- MekHQ/data/scenariomodifiers/groundBattleModifiers.xml | 8 ++++---- MekHQ/data/scenariomodifiers/modifiermanifest.xml | 8 ++++---- MekHQ/data/scenariotemplates/Base Defense.xml | 4 ++-- MekHQ/data/scenariotemplates/Hostile Facility.xml | 4 ++-- 50 files changed, 93 insertions(+), 93 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/ArmednArmored.xml b/MekHQ/data/scenariomodifiers/ArmednArmored.xml index 4117652dd9..ba7ce41db8 100644 --- a/MekHQ/data/scenariomodifiers/ArmednArmored.xml +++ b/MekHQ/data/scenariomodifiers/ArmednArmored.xml @@ -1,5 +1,5 @@ - Intel on the Opfor indicates a larger more well-equipped force. + Intel on the OpFor indicates a larger more well-equipped force. false PreForceGeneration Opposing diff --git a/MekHQ/data/scenariomodifiers/BadIntelAir.xml b/MekHQ/data/scenariomodifiers/BadIntelAir.xml index c44f430acd..bccd0e236d 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelAir.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelAir.xml @@ -27,13 +27,13 @@ -1 2 1.0 - Additional OpFor Aircraft + Additional Aircraft 3 3 4 0 - Primary Opfor + OpFor 5 None diff --git a/MekHQ/data/scenariomodifiers/BadIntelGround.xml b/MekHQ/data/scenariomodifiers/BadIntelGround.xml index 89137e9be8..62ca046b03 100644 --- a/MekHQ/data/scenariomodifiers/BadIntelGround.xml +++ b/MekHQ/data/scenariomodifiers/BadIntelGround.xml @@ -31,13 +31,13 @@ -1 2 1.0 - Additional Opfor Ground Units + Additional Ground Units 3 3 4 0 - Primary Opfor + OpFor None diff --git a/MekHQ/data/scenariomodifiers/Elites.xml b/MekHQ/data/scenariomodifiers/Elites.xml index 606fbafc72..1ed038767f 100644 --- a/MekHQ/data/scenariomodifiers/Elites.xml +++ b/MekHQ/data/scenariomodifiers/Elites.xml @@ -1,5 +1,5 @@ - Opfor markings indicate an elite force. + OpFor markings indicate an elite force. false PostForceGeneration Opposing diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml index f57c6f22c5..3cef1792ab 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml index 589204272a..64188a44fc 100644 --- a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml +++ b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml index a9841e47f6..4c156edb83 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml index 8c30d43416..ae3703c516 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml index 93757a618a..576c5088c6 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml index ccda1adb0e..789739c44e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml index e92f7de68f..0e99735916 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml index 9a7db1ea97..b6f85488ec 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml index f3b55bb9d5..697af0731d 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml index 5e05d48d79..e0e648bbaf 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml @@ -39,7 +39,7 @@ 50 1 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml index e50e32dbbd..da481d4c26 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml @@ -19,12 +19,12 @@ -1 2 1.0 - Opfor Air Garrison + Air Garrison 3 5 4 - Primary Opfor + OpFor 75 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml index 484324dc78..3f82155b39 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml @@ -38,7 +38,7 @@ 50 1 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml index 88ccbcb6a5..989719c338 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml @@ -26,12 +26,12 @@ 2 2 1.0 - Opfor Recon Aircraft + Recon Aircraft 3 5 1 - Primary Opfor + OpFor 50 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml index 60e331f3b7..9365b57242 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml @@ -26,12 +26,12 @@ -1 2 1.0 - Opfor Aircraft + Aircraft 3 5 4 - Primary Opfor + OpFor 50 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml index 73ca932cda..956ac5b0dd 100644 --- a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml +++ b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml @@ -27,12 +27,12 @@ -1 2 1.0 - Opfor Aircraft + Aircraft 3 5 4 - Primary Opfor + OpFor 50 5 diff --git a/MekHQ/data/scenariomodifiers/EnemyArty.xml b/MekHQ/data/scenariomodifiers/EnemyArty.xml index 5c3f4d69ed..e97d846962 100644 --- a/MekHQ/data/scenariomodifiers/EnemyArty.xml +++ b/MekHQ/data/scenariomodifiers/EnemyArty.xml @@ -23,7 +23,7 @@ -1 2 1.0 - Opfor Artillery + Artillery 3 3 4 diff --git a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml index 9e5e4f266f..1e566ca4df 100644 --- a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml @@ -24,12 +24,12 @@ -1 2 1.0 - Opfor Artillery Garrison + Artillery Garrison 3 5 4 - Primary Opfor + OpFor 75 0 diff --git a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml index e8e642b98a..6f5fc888dc 100644 --- a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyDropship.xml b/MekHQ/data/scenariomodifiers/EnemyDropship.xml index 184b44b993..69941ba3a5 100644 --- a/MekHQ/data/scenariomodifiers/EnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/EnemyDropship.xml @@ -17,17 +17,17 @@ 1 2 1.0 - Opfor Active Dropship + Active DropShip 2 3 4 - Primary Opfor + OpFor 50 5 SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml index 9e47dabea7..d2d74e20e0 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyCrack.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml index c5a7450b1e..8b3738e9cf 100644 --- a/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml +++ b/MekHQ/data/scenariomodifiers/EnemyFieldArtyOffboard.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml index 8f4e043e71..92062d9ca1 100644 --- a/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml +++ b/MekHQ/data/scenariomodifiers/EnemyHotDrop.xml @@ -1,5 +1,5 @@ - Enemy dropship has been detected in the area. Telemetry indicates it's at + Enemy DropShip has been detected in the area. Telemetry indicates it's at least partially loaded. Expect additional hostile units to be deployed via airdrop. AllGroundTerrain @@ -23,13 +23,13 @@ -1 2 1.0 - Opfor Hot Drop + Hot Drop 3 2 4 50 - Primary Opfor + OpFor None 3 diff --git a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml index bd5f910e33..3d08dae93a 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekGarrison.xml @@ -23,14 +23,14 @@ -1 2 1.0 - Opfor Mek Garrison + Mek Garrison 3 5 4 75 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml index 79e09fa07d..ff7058976e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMekPatrol.xml @@ -30,14 +30,14 @@ 5 2 2 - Opfor Recon Meks + Recon Meks 3 6 1 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml index 058027598c..fda97b1f7e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercBrawl.xml @@ -39,7 +39,7 @@ 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml index 4e5459baee..597c1e9faf 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercFireSupport.xml @@ -39,7 +39,7 @@ 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml index 6a827c6d41..7076561d79 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercHopInfantry.xml @@ -39,7 +39,7 @@ 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml index 351b7098bc..4ca25eb972 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercScouts.xml @@ -38,7 +38,7 @@ 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml index 9d2cb27a0c..c9ff7f018c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkirmish.xml @@ -1,5 +1,5 @@ - Opfor Mercenary Skirmishers with veteran markings are in the area. Don't + OpFor Mercenary Skirmishers with veteran markings are in the area. Don't get flanked. AllGroundTerrain @@ -39,7 +39,7 @@ 50 0 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml index a83a246080..63a2ae302c 100644 --- a/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml +++ b/MekHQ/data/scenariomodifiers/EnemyMercSkyInfantry.xml @@ -39,7 +39,7 @@ 50 1 - Primary Opfor + OpFor None false diff --git a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml index 499c51723c..b443355d68 100644 --- a/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml +++ b/MekHQ/data/scenariomodifiers/EnemyOfficerMek.xml @@ -28,10 +28,10 @@ 75 0 - Primary Opfor + OpFor SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/EnemyReinforcements.xml b/MekHQ/data/scenariomodifiers/EnemyReinforcements.xml index d8e90008d4..b24a56553e 100644 --- a/MekHQ/data/scenariomodifiers/EnemyReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/EnemyReinforcements.xml @@ -30,13 +30,13 @@ -1 2 1.0 - Opfor Ground Reinforcements + Ground Reinforcements 3 3 4 0 - Primary Opfor + OpFor None diff --git a/MekHQ/data/scenariomodifiers/EnemyTankGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyTankGarrison.xml index b2a2f09bca..b51452dc3b 100644 --- a/MekHQ/data/scenariomodifiers/EnemyTankGarrison.xml +++ b/MekHQ/data/scenariomodifiers/EnemyTankGarrison.xml @@ -23,13 +23,13 @@ -1 2 1.0 - Opfor Tank Garrison + Tank Garrison 3 5 4 75 - Primary Opfor + OpFor 0 None diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml index 731d0b1a4e..d80a9aca01 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml @@ -38,7 +38,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml index 8c706742ac..90d4a45951 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml @@ -38,7 +38,7 @@ - Primary Opfor + OpFor diff --git a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml index fdec08aefc..e3fbac0a3c 100644 --- a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml @@ -1,5 +1,5 @@ - An enemy dropship has been grounded in this area, but its weapons are + An enemy DropShip has been grounded in this area, but its weapons are still active so pay attention. AllGroundTerrain @@ -22,14 +22,14 @@ 1 2 1.0 - Opfor Grounded Dropship + Grounded DropShip 2 3 4 50 0 SameEdge - Primary Opfor + OpFor false diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml index 67c5a217fa..abe7e5156d 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonInfantry.xml @@ -27,7 +27,7 @@ 5 4 - Primary Opfor + OpFor 50 None diff --git a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml index bcd05a7caa..9908124637 100644 --- a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml @@ -30,13 +30,13 @@ -1 2 1.0 - Opfor Aerospace Reinforcements + Aerospace Reinforcements 1 5 4 0 - Primary Opfor + OpFor 5 None diff --git a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml index a62d4da5dd..cf7e39cd38 100644 --- a/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml +++ b/MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml @@ -30,13 +30,13 @@ -1 2 1.0 - Opfor Ground Reinforcements + Ground Reinforcements 1 5 4 0 - Primary Opfor + OpFor None diff --git a/MekHQ/data/scenariomodifiers/Rookies.xml b/MekHQ/data/scenariomodifiers/Rookies.xml index 5f593f24dd..455fd54334 100644 --- a/MekHQ/data/scenariomodifiers/Rookies.xml +++ b/MekHQ/data/scenariomodifiers/Rookies.xml @@ -1,5 +1,5 @@ - Opfor markings indicate a training cadre. + OpFor markings indicate a training cadre. true PostForceGeneration Opposing diff --git a/MekHQ/data/scenariomodifiers/Veterans.xml b/MekHQ/data/scenariomodifiers/Veterans.xml index f52d90d1ad..cc747ca3fe 100644 --- a/MekHQ/data/scenariomodifiers/Veterans.xml +++ b/MekHQ/data/scenariomodifiers/Veterans.xml @@ -1,5 +1,5 @@ - Opfor markings indicate a veteran force. + OpFor markings indicate a veteran force. false PostForceGeneration Opposing diff --git a/MekHQ/data/scenariomodifiers/airBattleModifiers.xml b/MekHQ/data/scenariomodifiers/airBattleModifiers.xml index d83c9c640e..a07eb9040c 100644 --- a/MekHQ/data/scenariomodifiers/airBattleModifiers.xml +++ b/MekHQ/data/scenariomodifiers/airBattleModifiers.xml @@ -23,11 +23,11 @@ GoodEquipment.xml - EnemyDropship.xml + EnemyDropShip.xml GoodIntel.xml @@ -59,7 +59,7 @@ diff --git a/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml b/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml index 97351cb62a..d1603fa81a 100644 --- a/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml +++ b/MekHQ/data/scenariomodifiers/groundBattleModifiers.xml @@ -50,17 +50,17 @@ HostileBVBudgetIncrease.xml EnemyHotDrop.xml - EnemyDropship.xml + EnemyDropShip.xml - GroundedEnemyDropship.xml + GroundedEnemyDropShip.xml GoodIntel.xml @@ -119,7 +119,7 @@ diff --git a/MekHQ/data/scenariomodifiers/modifiermanifest.xml b/MekHQ/data/scenariomodifiers/modifiermanifest.xml index 7a93df5f15..cb4b3015f3 100644 --- a/MekHQ/data/scenariomodifiers/modifiermanifest.xml +++ b/MekHQ/data/scenariomodifiers/modifiermanifest.xml @@ -56,17 +56,17 @@ BadEvent.xml EnemyHotDrop.xml - EnemyDropship.xml + EnemyDropShip.xml - GroundedEnemyDropship.xml + GroundedEnemyDropShip.xml GoodIntel.xml @@ -135,7 +135,7 @@ diff --git a/MekHQ/data/scenariotemplates/Base Defense.xml b/MekHQ/data/scenariotemplates/Base Defense.xml index 44107f9c6e..4ca3e35a96 100644 --- a/MekHQ/data/scenariotemplates/Base Defense.xml +++ b/MekHQ/data/scenariotemplates/Base Defense.xml @@ -38,9 +38,9 @@ 5 0 1 - 1.0 + 0.25 Base Defenses - 2 + 1 4 4 0 diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index 69866a6cc9..cb1779ec3f 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -37,9 +37,9 @@ 5 0 2 - 1.0 + 0.25 Base Defenses - 2 + 1 5 4 0 From d656af7eb4affbf3f8ebee7697c687940fe590df Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:17:46 -0500 Subject: [PATCH 14/22] Catch exceptions for linked force alignment check Added exception handling for the alignment check of linked forces in ScenarioObjective. This will make troubleshooting easier if I mucked up the name changes somewhere. --- .../campaign/mission/ScenarioObjective.java | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/mission/ScenarioObjective.java b/MekHQ/src/mekhq/campaign/mission/ScenarioObjective.java index 1bca7b9ec1..c640018961 100644 --- a/MekHQ/src/mekhq/campaign/mission/ScenarioObjective.java +++ b/MekHQ/src/mekhq/campaign/mission/ScenarioObjective.java @@ -18,20 +18,6 @@ */ package mekhq.campaign.mission; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - -import javax.xml.namespace.QName; - -import org.w3c.dom.Node; - import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.Marshaller; @@ -41,10 +27,15 @@ import megamek.common.OffBoardDirection; import megamek.logging.MMLogger; import mekhq.campaign.mission.ObjectiveEffect.EffectScalingType; +import org.w3c.dom.Node; + +import javax.xml.namespace.QName; +import java.io.PrintWriter; +import java.util.*; /** * Contains metadata used to describe a scenario objective - * + * * @author NickAragua */ public class ScenarioObjective { @@ -452,7 +443,14 @@ public boolean isApplicableToForceTemplate(ScenarioForceTemplate forceTemplate, if (objectiveContainsLinkedForce) { ScenarioForceTemplate linkedForceTemplate = scenario.getTemplate().getScenarioForces() .get(linkedForceName); - return linkedForceTemplate.getForceAlignment() == forceTemplate.getForceAlignment(); + + try { + return linkedForceTemplate.getForceAlignment() == forceTemplate.getForceAlignment(); + } catch (Exception e) { + // We don't want this to silently fail, as it means there is something + // critically wrong with the forceTemplate + logger.error(String.format("Failed to load %s.", forceTemplate.getForceName())); + } } } } @@ -469,11 +467,11 @@ public String toString() { if (objectiveCriterion == ObjectiveCriterion.ReachMapEdge || objectiveCriterion == ObjectiveCriterion.PreventReachMapEdge) { - sb.append("\n"); + sb.append('\n'); if ((destinationEdge != null) && (destinationEdge != OffBoardDirection.NONE)) { - sb.append(destinationEdge.toString()); + sb.append(destinationEdge); } else { sb.append("opposite deployment"); } @@ -490,28 +488,28 @@ public String toString() { if (!associatedForceNames.isEmpty()) { sb.append("\nForces:"); for (String forceName : associatedForceNames) { - sb.append("\n"); + sb.append('\n'); sb.append(forceName); } } if (!associatedUnitIDs.isEmpty()) { for (String unitID : associatedUnitIDs) { - sb.append("\n"); + sb.append('\n'); sb.append(unitID); } } if (!successEffects.isEmpty()) { for (ObjectiveEffect effect : successEffects) { - sb.append("\n"); + sb.append('\n'); sb.append(effect.toString()); } } if (!failureEffects.isEmpty()) { for (ObjectiveEffect effect : failureEffects) { - sb.append("\n"); + sb.append('\n'); sb.append(effect.toString()); } } @@ -522,7 +520,7 @@ public String toString() { /** * Serialize this instance of a ScenarioObjective to a PrintWriter * Omits initial xml declaration - * + * * @param pw The destination print writer */ public void Serialize(PrintWriter pw) { @@ -542,7 +540,7 @@ public void Serialize(PrintWriter pw) { /** * Attempt to deserialize an instance of a ScenarioObjective from the passed-in * XML Node - * + * * @param xmlNode The node with the scenario template * @return Possibly an instance of a ScenarioTemplate */ From 303dae744c572659cc8406ebbf3b1bf4e3ad33aa Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:18:35 -0500 Subject: [PATCH 15/22] Disable non-era agnostic scenario modifiers Commented out scenario modifiers not suitable for all eras in `modifiermanifest.xml` to prevent inconsistencies. Added explanatory comments to indicate the reasons for their deactivation. --- .../scenariomodifiers/modifiermanifest.xml | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/modifiermanifest.xml b/MekHQ/data/scenariomodifiers/modifiermanifest.xml index cb4b3015f3..43d4d7a16a 100644 --- a/MekHQ/data/scenariomodifiers/modifiermanifest.xml +++ b/MekHQ/data/scenariomodifiers/modifiermanifest.xml @@ -172,63 +172,66 @@ EnemyMekPatrol.xml - + + + + + + + EnemyAirCav.xml EnemyAirMobileInf.xml - + + + + + + + + + + AlliedOfficerMek.xml @@ -241,21 +244,22 @@ AlliedHorseCav.xml - - AlliedASFAce01.xml - EnemyFieldArtyCrack.xml EnemyFieldArtyOffboard.xml - + + + From ec6f1091c07791791c059cf6c174aaebef4315cb Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:22:23 -0500 Subject: [PATCH 16/22] Update DropShip generation method in scenario templates Changed the generation method from 4 to 3 for DropShip in three scenario templates: Isolated DropShip Defense, Low-Atmosphere DropShip Escort, and Space Blockade Run. This adjustment ensures consistency in DropShip generation across various scenarios. --- MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml | 2 +- MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml | 2 +- MekHQ/data/scenariotemplates/Space Blockade Run.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index 5a3fdb713b..6e1d2b49a3 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -201,7 +201,7 @@ 1 1.0 DropShip - 4 + 3 3 4 0 diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index 9f03078cd4..d37f0ed178 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -188,7 +188,7 @@ 1 1.0 DropShip - 4 + 3 4 4 1 diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index 3255598a81..472cfade84 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -158,7 +158,7 @@ 1 1.0 DropShip - 4 + 3 4 4 1 From 5c0f188b4ae2932375b266bb2a80cf4eb7d2079d Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:32:56 -0500 Subject: [PATCH 17/22] Refactor: Rename 'Base Turrets' to 'Base Defenses' Updated all instances of 'Base Turrets' to 'Base Defenses' to ensure consistency across scenario modifiers and template files. This change aligns the terminology with current design standards and improves clarity for future development and maintenance. --- MekHQ/data/scenariomodifiers/AlliedTurrets.xml | 2 +- MekHQ/data/scenariomodifiers/EnemyTurrets.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml | 2 +- MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml | 2 +- MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml | 2 +- MekHQ/data/scenariotemplates/Base Defense.xml | 2 +- MekHQ/data/scenariotemplates/Hostile Facility.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/AlliedTurrets.xml b/MekHQ/data/scenariomodifiers/AlliedTurrets.xml index 2ce6b29a7d..7545645791 100644 --- a/MekHQ/data/scenariomodifiers/AlliedTurrets.xml +++ b/MekHQ/data/scenariomodifiers/AlliedTurrets.xml @@ -28,7 +28,7 @@ 4 50 - Base Turrets + Base Defenses None diff --git a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml index 695dd435a9..fca3f9fa71 100644 --- a/MekHQ/data/scenariomodifiers/EnemyTurrets.xml +++ b/MekHQ/data/scenariomodifiers/EnemyTurrets.xml @@ -28,7 +28,7 @@ 4 50 - Base Turrets + Base Defenses None diff --git a/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml b/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml index 7d23fcf425..13a9f2d450 100644 --- a/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml +++ b/MekHQ/data/scenariomodifiers/FacilityAlliedDefend.xml @@ -6,7 +6,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml index d80a9aca01..87831a2bac 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml @@ -7,7 +7,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml index 90d4a45951..2db795ba18 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileCaptureNonWin.xml @@ -7,7 +7,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml b/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml index 57ce36a8e3..30b4975e30 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileDestroy.xml @@ -12,7 +12,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml b/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml index f2775fd7a9..86907d1e18 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileDestroyNonWin.xml @@ -6,7 +6,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml b/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml index 66cf0416fd..b1567c3a7b 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileEngage.xml @@ -16,7 +16,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml b/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml index 2728a4b15f..293dbe92dd 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileExtract.xml @@ -12,7 +12,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml b/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml index e3512c5814..0da86f0a7d 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostileRecon.xml @@ -12,7 +12,7 @@ - Base Turrets + Base Defenses diff --git a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml index 949d9c9dee..7d44de5d85 100644 --- a/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml +++ b/MekHQ/data/scenariomodifiers/LocalGarrisonTurrets.xml @@ -28,7 +28,7 @@ 4 50 - Base Turrets + Base Defenses None diff --git a/MekHQ/data/scenariotemplates/Base Defense.xml b/MekHQ/data/scenariotemplates/Base Defense.xml index 4ca3e35a96..6bb183298a 100644 --- a/MekHQ/data/scenariotemplates/Base Defense.xml +++ b/MekHQ/data/scenariotemplates/Base Defense.xml @@ -38,7 +38,7 @@ 5 0 1 - 0.25 + 0.1 Base Defenses 1 4 diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml index cb1779ec3f..ceda44e4b8 100644 --- a/MekHQ/data/scenariotemplates/Hostile Facility.xml +++ b/MekHQ/data/scenariotemplates/Hostile Facility.xml @@ -37,7 +37,7 @@ 5 0 2 - 0.25 + 0.1 Base Defenses 1 5 From 420c78f51784a755ffa17622c10999913355a9ff Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:38:38 -0500 Subject: [PATCH 18/22] Reduce convoy force multipliers in scenario templates Adjusted the forceMultiplier from 1.0 to 0.5 in both the "Convoy Escort" and "Convoy Raid" scenario templates. This change ensures that convoy forces are more balanced and less overwhelming during these missions. --- MekHQ/data/scenariotemplates/Convoy Escort.xml | 2 +- MekHQ/data/scenariotemplates/Convoy Raid.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Convoy Escort.xml b/MekHQ/data/scenariotemplates/Convoy Escort.xml index b575aed967..b8fe4d7661 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort.xml @@ -97,7 +97,7 @@ 6 0 1 - 1.0 + 0.5 Convoy 2 4 diff --git a/MekHQ/data/scenariotemplates/Convoy Raid.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml index 1b3885e729..c8a6d86f7c 100644 --- a/MekHQ/data/scenariotemplates/Convoy Raid.xml +++ b/MekHQ/data/scenariotemplates/Convoy Raid.xml @@ -93,7 +93,7 @@ 6 0 2 - 1.0 + 0.5 Convoy 2 5 From 8cdc7ad9b86bffa21f2562105527b5f7a45b54e8 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 11:55:40 -0500 Subject: [PATCH 19/22] Add role choices to multiple DropShip scenario templates Included various force roles like MEK_CARRIER, ASF_CARRIER, VEE_CARRIER, INFANTRY_CARRIER, TROOP_CARRIER, and CIVILIAN in several DropShip scenario templates. This enhances scenario flexibility and allows for more diverse unit deployment. --- MekHQ/data/scenariotemplates/Deep Raid Defense.xml | 8 ++++++++ MekHQ/data/scenariotemplates/Deep Raid.xml | 8 ++++++++ MekHQ/data/scenariotemplates/DropShip Raid.xml | 8 ++++++++ .../data/scenariotemplates/Isolated DropShip Defense.xml | 8 ++++++++ .../scenariotemplates/Low-Atmosphere DropShip Assault.xml | 8 ++++++++ .../scenariotemplates/Low-Atmosphere DropShip Escort.xml | 8 ++++++++ MekHQ/data/scenariotemplates/Space Blockade Run.xml | 8 ++++++++ MekHQ/data/scenariotemplates/Space DropShip Intercept.xml | 8 ++++++++ 8 files changed, 64 insertions(+) diff --git a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml index 7524f5f384..605021bd08 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml @@ -210,6 +210,14 @@ 0 None false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml index dd412d17a1..71f96ba05b 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -116,6 +116,14 @@ false None false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/DropShip Raid.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml index 3a1b2300c4..c479cbcb89 100644 --- a/MekHQ/data/scenariotemplates/DropShip Raid.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -116,6 +116,14 @@ false None false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index 6e1d2b49a3..908c2763d1 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -210,6 +210,14 @@ 0 None false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml index 2768698219..696325f585 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml @@ -77,6 +77,14 @@ OppositeEdge Player false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index d37f0ed178..42903c8e87 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -198,6 +198,14 @@ SameEdge Player false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index 472cfade84..1b6977d59a 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -168,6 +168,14 @@ SameEdge Player false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml index 22c5c958f3..32e471efd4 100644 --- a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml @@ -192,6 +192,14 @@ SameEdge Player false + + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + From 6e4dd1ce6c13ea9077da4838b9d1159c5bb696f3 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 12:03:55 -0500 Subject: [PATCH 20/22] Update scenario templates and modifiers for consistency Duplicated MEK_CARRIER entries were added across multiple XML files in scenario templates, which may be an error. Additionally, modified forceName attributes in some scenario modifiers and expanded roleChoices to include new roles like TROOP_CARRIER and CIVILIAN. --- MekHQ/data/scenariomodifiers/EnemyDropship.xml | 11 ++++++++++- .../data/scenariomodifiers/GroundedEnemyDropship.xml | 11 ++++++++++- MekHQ/data/scenariotemplates/Deep Raid Defense.xml | 1 + MekHQ/data/scenariotemplates/Deep Raid.xml | 1 + MekHQ/data/scenariotemplates/DropShip Raid.xml | 1 + .../scenariotemplates/Isolated DropShip Defense.xml | 1 + .../Low-Atmosphere DropShip Assault.xml | 1 + .../Low-Atmosphere DropShip Escort.xml | 1 + MekHQ/data/scenariotemplates/Space Blockade Run.xml | 1 + .../scenariotemplates/Space DropShip Intercept.xml | 1 + 10 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MekHQ/data/scenariomodifiers/EnemyDropship.xml b/MekHQ/data/scenariomodifiers/EnemyDropship.xml index 69941ba3a5..cf65a40f39 100644 --- a/MekHQ/data/scenariomodifiers/EnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/EnemyDropship.xml @@ -17,7 +17,7 @@ 1 2 1.0 - Active DropShip + DropShip 2 3 4 @@ -29,5 +29,14 @@ SameEdge OpFor false + + MEK_CARRIER + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml index e3fbac0a3c..3e35036b9a 100644 --- a/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml +++ b/MekHQ/data/scenariomodifiers/GroundedEnemyDropship.xml @@ -22,7 +22,7 @@ 1 2 1.0 - Grounded DropShip + DropShip 2 3 4 @@ -31,5 +31,14 @@ SameEdge OpFor false + + MEK_CARRIER + MEK_CARRIER + ASF_CARRIER + VEE_CARRIER + INFANTRY_CARRIER + TROOP_CARRIER + CIVILIAN + diff --git a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml index 605021bd08..e8ea862b8a 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid Defense.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid Defense.xml @@ -211,6 +211,7 @@ None false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Deep Raid.xml b/MekHQ/data/scenariotemplates/Deep Raid.xml index 71f96ba05b..6f50f8a49d 100644 --- a/MekHQ/data/scenariotemplates/Deep Raid.xml +++ b/MekHQ/data/scenariotemplates/Deep Raid.xml @@ -117,6 +117,7 @@ None false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/DropShip Raid.xml b/MekHQ/data/scenariotemplates/DropShip Raid.xml index c479cbcb89..4e47d0648d 100644 --- a/MekHQ/data/scenariotemplates/DropShip Raid.xml +++ b/MekHQ/data/scenariotemplates/DropShip Raid.xml @@ -117,6 +117,7 @@ None false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml index 908c2763d1..8bf81ae95e 100644 --- a/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml +++ b/MekHQ/data/scenariotemplates/Isolated DropShip Defense.xml @@ -211,6 +211,7 @@ None false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml index 696325f585..bcd6d442ec 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Assault.xml @@ -78,6 +78,7 @@ Player false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml index 42903c8e87..8d2cb142a3 100644 --- a/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml +++ b/MekHQ/data/scenariotemplates/Low-Atmosphere DropShip Escort.xml @@ -199,6 +199,7 @@ Player false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Space Blockade Run.xml b/MekHQ/data/scenariotemplates/Space Blockade Run.xml index 1b6977d59a..f944f29de4 100644 --- a/MekHQ/data/scenariotemplates/Space Blockade Run.xml +++ b/MekHQ/data/scenariotemplates/Space Blockade Run.xml @@ -169,6 +169,7 @@ Player false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER diff --git a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml index 32e471efd4..1d9195f62a 100644 --- a/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml +++ b/MekHQ/data/scenariotemplates/Space DropShip Intercept.xml @@ -193,6 +193,7 @@ Player false + MEK_CARRIER MEK_CARRIER ASF_CARRIER VEE_CARRIER From c34e1b3b73ea51a38d46c8de71d17f99d5d0d480 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 13:24:29 -0500 Subject: [PATCH 21/22] Update convoy scenarios with special civilian unit types Adjusted convoy-related scenario templates to allow and define special civilian unit types and roles. Modified scenario generation code to handle civilians and ensure correct unit selection and fallback mechanisms. --- .../data/scenariotemplates/Convoy Escort.xml | 8 +- .../scenariotemplates/Convoy Interdiction.xml | 10 +- MekHQ/data/scenariotemplates/Convoy Raid.xml | 8 +- .../Critical Convoy Escort.xml | 10 +- .../mission/AtBDynamicScenarioFactory.java | 174 ++++++++++++++++-- 5 files changed, 185 insertions(+), 25 deletions(-) diff --git a/MekHQ/data/scenariotemplates/Convoy Escort.xml b/MekHQ/data/scenariotemplates/Convoy Escort.xml index b8fe4d7661..2eb413cf55 100644 --- a/MekHQ/data/scenariotemplates/Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Convoy Escort.xml @@ -81,7 +81,7 @@ -1 false - -1 + -2 0 false true @@ -108,6 +108,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + diff --git a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml index ca7c9e1d22..a1d69f9ab1 100644 --- a/MekHQ/data/scenariotemplates/Convoy Interdiction.xml +++ b/MekHQ/data/scenariotemplates/Convoy Interdiction.xml @@ -77,7 +77,7 @@ -1 false - -1 + -2 0 true false @@ -93,7 +93,7 @@ 6 0 2 - 1.0 + 0.5 Convoy 2 5 @@ -104,6 +104,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + diff --git a/MekHQ/data/scenariotemplates/Convoy Raid.xml b/MekHQ/data/scenariotemplates/Convoy Raid.xml index c8a6d86f7c..694df4d383 100644 --- a/MekHQ/data/scenariotemplates/Convoy Raid.xml +++ b/MekHQ/data/scenariotemplates/Convoy Raid.xml @@ -77,7 +77,7 @@ -1 false - -1 + -2 0 true false @@ -104,6 +104,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + diff --git a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml index d7d04b106f..a27cb2be94 100644 --- a/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml +++ b/MekHQ/data/scenariotemplates/Critical Convoy Escort.xml @@ -81,7 +81,7 @@ -1 false - -1 + -2 0 false true @@ -97,7 +97,7 @@ 6 0 1 - 1.0 + 0.5 Convoy 2 4 @@ -108,6 +108,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java index 743fe2606b..43df6ec8aa 100644 --- a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java +++ b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java @@ -69,7 +69,9 @@ import java.util.stream.IntStream; import static java.lang.Math.round; +import static megamek.client.ratgenerator.MissionRole.CIVILIAN; import static mekhq.campaign.mission.Scenario.T_GROUND; +import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_CIVILIANS; import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_MIX; /** @@ -495,7 +497,7 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac } else if (forceTemplate.getAllowedUnitType() == ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_CIVILIANS) { // TODO: this will need to be adjusted to cover SUPPORT and CIVILIAN separately for (int i = 0; i <= UnitType.AERO; i++) { - if (MissionRole.CIVILIAN.fitsUnitType(i)) { + if (CIVILIAN.fitsUnitType(i)) { requiredRoles.put(i, new ArrayList<>(baseRoles)); } } @@ -594,10 +596,6 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac } else if (actualUnitType == UnitType.GUN_EMPLACEMENT) { generatedLance = generateTurrets(4, skill, quality, campaign, faction); - // Civilian formations use fixed tables instead of the force generator system - } else if (actualUnitType == ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_CIVILIANS) { - generatedLance = generateCivilianUnits(4, campaign); - // All other unit types use the force generator system to randomly select units } else { // Determine unit types for each unit of the formation. Normally this is all one @@ -608,19 +606,27 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac // Formations composed entirely of Meks, aerospace fighters (but not conventional), // and ground vehicles use weight categories as do SPECIAL_UNIT_TYPE_ATB_MIX. // Formations of other types, plus artillery formations do not use weight classes. - if ((actualUnitType == SPECIAL_UNIT_TYPE_ATB_MIX || IUnitGenerator.unitTypeSupportsWeightClass(actualUnitType)) && !forceTemplate.getUseArtillery()) { + if ((actualUnitType == SPECIAL_UNIT_TYPE_ATB_MIX + || actualUnitType == SPECIAL_UNIT_TYPE_ATB_CIVILIANS + || IUnitGenerator.unitTypeSupportsWeightClass(actualUnitType)) + && !forceTemplate.getUseArtillery()) { // Generate a specific weight class for each unit based on the formation weight // class and lower/upper bounds - final String unitWeights = generateUnitWeights(unitTypes, factionCode, AtBConfiguration.decodeWeightStr(currentLanceWeightString, 0), forceTemplate.getMaxWeightClass(), forceTemplate.getMinWeightClass(), requiredRoles, campaign); + final String unitWeights = generateUnitWeights(unitTypes, factionCode, + AtBConfiguration.decodeWeightStr(currentLanceWeightString, 0), + forceTemplate.getMaxWeightClass(), forceTemplate.getMinWeightClass(), + requiredRoles, campaign); if (unitWeights != null) { - generatedLance = generateLance(factionCode, skill, quality, unitTypes, unitWeights, requiredRoles, campaign); + generatedLance = generateLance(factionCode, skill, quality, unitTypes, unitWeights, + requiredRoles, campaign, scenario); } else { generatedLance = new ArrayList<>(); } } else { - generatedLance = generateLance(factionCode, skill, quality, unitTypes, requiredRoles, campaign); + generatedLance = generateLance(factionCode, skill, quality, unitTypes, requiredRoles, + campaign, scenario); // If extreme temperatures are present and XCT infantry is not being generated, // swap out standard armor for snowsuits or heat suits as appropriate @@ -1518,7 +1524,7 @@ public static Entity getEntity(String faction, int quality, int unitType, int weightClass, - Collection rolesByType, + @Nullable Collection rolesByType, Campaign campaign) { MekSummary unitData; @@ -2464,6 +2470,34 @@ private static List generateUnitTypes(int unitTypeCode, } else { actualUnitType = UnitType.MEK; } + } else if (unitTypeCode == SPECIAL_UNIT_TYPE_ATB_CIVILIANS) { + // Use the Vehicle/Mixed ratios from campaign options as weighted values for + // random unit types. + int vehicleLanceWeight = campaign.getCampaignOptions().getOpForLanceTypeVehicles(); + int mixedLanceWeight = campaign.getCampaignOptions().getOpForLanceTypeMixed(); + + int totalWeight = mixedLanceWeight + vehicleLanceWeight; + + // Roll for unit types + if (totalWeight <= 0) { + actualUnitType = UnitType.TANK; + } else { + int roll = Compute.randomInt(totalWeight); + if (roll < vehicleLanceWeight) { + actualUnitType = UnitType.TANK; + // Mixed units randomly select between Mek or ground vehicle + } else { + for (int x = 0; x < unitCount; x++) { + boolean addTank = Compute.randomInt(2) == 0; + if (addTank) { + unitTypes.add(UnitType.TANK); + } else { + unitTypes.add(UnitType.MEK); + } + } + return unitTypes; + } + } } // Add unit types to the list of actual unity types @@ -2790,7 +2824,7 @@ private static List generateLance(String faction, int quality, List unitTypes, Map> rolesByType, - Campaign campaign) { + Campaign campaign, Scenario scenario) { List generatedEntities = new ArrayList<>(); @@ -2802,6 +2836,52 @@ private static List generateLance(String faction, UNIT_WEIGHT_UNSPECIFIED, rolesByType.getOrDefault(unitTypes.get(i), new ArrayList<>()), campaign); + + if (newEntity == null) { + // We reset the count locally, so that we're passing through the entire list. + // The idea is that this will give us the best chance of hitting a valid unit. + int freshIteration = 0; + + while (freshIteration < unitTypes.size()) { + newEntity = getEntity(faction, + skill, + quality, + unitTypes.get(i), + UNIT_WEIGHT_UNSPECIFIED, + rolesByType.getOrDefault(unitTypes.get(i), new ArrayList<>()), + campaign); + + if (newEntity != null) { + break; + } + + freshIteration++; + } + + // If we still haven't got a valid entity, use hardcoded fallbacks. + if (newEntity == null) { + if (unitTypes.get(0) == UnitType.DROPSHIP) { + newEntity = getEntity(faction, + skill, + quality, + UnitType.DROPSHIP, + UNIT_WEIGHT_UNSPECIFIED, + List.of(CIVILIAN), + campaign); + } else { + if (scenario.getBoardType() == T_GROUND) { + getEntity(faction, + skill, + quality, + UnitType.TANK, + UNIT_WEIGHT_UNSPECIFIED, + null, + campaign); + } + } + } + } + if (newEntity != null) { generatedEntities.add(newEntity); } @@ -2836,7 +2916,7 @@ private static List generateLance(String faction, List unitTypes, String weights, Map> rolesByType, - Campaign campaign) { + Campaign campaign, AtBScenario scenario) { List generatedEntities = new ArrayList<>(); // If the number of unit types and number of weight classes don't match, @@ -2852,13 +2932,40 @@ private static List generateLance(String faction, } for (int i = 0; i < unitTypeSize; i++) { - Entity newEntity = getEntity(faction, - skill, - quality, - unitTypes.get(i), - AtBConfiguration.decodeWeightStr(weights, i), - rolesByType.getOrDefault(unitTypes.get(i), new ArrayList<>()), - campaign); + Entity newEntity = getNewEntity(faction, skill, quality, unitTypes, weights, rolesByType, + campaign, i); + + if (newEntity == null) { + // We reset the count locally, so that we're passing through the entire list. + // The idea is that this will give us the best chance of hitting a valid unit. + int freshIteration = 0; + + while (freshIteration < unitTypeSize) { + newEntity = getNewEntity(faction, skill, quality, unitTypes, weights, rolesByType, + campaign, freshIteration); + + if (newEntity != null) { + break; + } + + freshIteration++; + } + + // If we still haven't got a valid entity, use hardcoded fallbacks. + if (newEntity == null) { + if (unitTypes.get(0) == UnitType.DROPSHIP) { + newEntity = getNewEntity(faction, skill, quality, List.of(UnitType.TANK), + weights, Map.of(UnitType.DROPSHIP, List.of(CIVILIAN)), + campaign, 0); + } else { + if (scenario.getBoardType() == T_GROUND) { + newEntity = getNewEntity(faction, skill, quality, List.of(UnitType.TANK), + weights, null, campaign, 0); + } + } + } + } + if (newEntity != null) { generatedEntities.add(newEntity); } @@ -2867,6 +2974,35 @@ private static List generateLance(String faction, return generatedEntities; } + /** + * Retrieve a new instance of Entity with the given parameters. + * + * @param faction the faction of the entity + * @param skill the skill level of the entity + * @param quality the quality of the entity + * @param unitTypes the list of unit types + * @param weights the unit weights string + * @param rolesByType the mapping of unit types to mission roles + * @param campaign the campaign associated with the entity + * @param i the index of the unit type in the unitTypes list + * + * @return a new instance of Entity with the specified parameters + */ + private static Entity getNewEntity(String faction, SkillLevel skill, int quality, + List unitTypes, String weights, + @Nullable Map> rolesByType, + Campaign campaign, int i) { + Collection roles; + + if (rolesByType != null) { + roles = rolesByType.getOrDefault(unitTypes.get(i), new ArrayList<>()); + } else { + roles = null; + } + return getEntity(faction, skill, quality, unitTypes.get(i), + AtBConfiguration.decodeWeightStr(weights, i), roles, campaign); + } + /** * Worker method that sets bot force properties such as name, color, team * From d29b83662f4bfa8236b204dbf6fd9345bdd8eb3e Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Sat, 28 Sep 2024 14:32:24 -0500 Subject: [PATCH 22/22] Add role choices to scenario force definitions Updated the force definitions in the XML files to include various role choices like CIVILIAN, CARGO, SUPPORT, and APC. This ensures more detailed and flexible scenario configurations for both hostile and allied facility evacuation scenarios, as well as in irregular force suppression and assault scenarios. --- MekHQ/data/scenariomodifiers/FacilityAlliedEvac.xml | 6 ++++++ MekHQ/data/scenariomodifiers/FacilityHostilePreventEvac.xml | 6 ++++++ MekHQ/data/scenariotemplates/Irregular Force Assault.xml | 4 ++++ .../data/scenariotemplates/Irregular Force Suppression.xml | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/MekHQ/data/scenariomodifiers/FacilityAlliedEvac.xml b/MekHQ/data/scenariomodifiers/FacilityAlliedEvac.xml index f6aa86066f..5e4e9f99d4 100644 --- a/MekHQ/data/scenariomodifiers/FacilityAlliedEvac.xml +++ b/MekHQ/data/scenariomodifiers/FacilityAlliedEvac.xml @@ -28,6 +28,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + Evacuate diff --git a/MekHQ/data/scenariomodifiers/FacilityHostilePreventEvac.xml b/MekHQ/data/scenariomodifiers/FacilityHostilePreventEvac.xml index a362261869..37112c1c5b 100644 --- a/MekHQ/data/scenariomodifiers/FacilityHostilePreventEvac.xml +++ b/MekHQ/data/scenariomodifiers/FacilityHostilePreventEvac.xml @@ -29,6 +29,12 @@ 0 None false + + CIVILIAN + CARGO + SUPPORT + APC + diff --git a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml index 6747be8c56..24b75e8871 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Assault.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Assault.xml @@ -149,6 +149,10 @@ 0 None false + + CIVILIAN + APC + diff --git a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml index 71fed740dc..573c718644 100644 --- a/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml +++ b/MekHQ/data/scenariotemplates/Irregular Force Suppression.xml @@ -149,6 +149,10 @@ 0 None false + + CIVILIAN + APC +