Skip to content

Commit

Permalink
Merge pull request #4129 from repligator/master
Browse files Browse the repository at this point in the history
Minor spelling and typos
  • Loading branch information
SJuliez authored Jun 6, 2024
2 parents 924bfc2 + f6ebda1 commit 1149795
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion MekHQ/data/scenariomodifiers/HouseOfficerAir.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<AtBScenarioModifier>
<additionalBriefingText>Your force will be deployed under the command of a house officer. Keep them alive. Additionally, allied command will dicatate retreat conditions.</additionalBriefingText>
<additionalBriefingText>Your force will be deployed under the command of a house officer. Keep them alive. Additionally, allied command will dictate retreat conditions.</additionalBriefingText>
<benefitsPlayer>true</benefitsPlayer>
<eventTiming>PreForceGeneration</eventTiming>
<forceDefinition>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Engage - Heavy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</failureEffect>
</failureEffects>
<additionalDetails/>
<description>Enage the following enemy unit(s) and force(s):</description>
<description>Engage the following enemy unit(s) and force(s):</description>
<destinationEdge>NONE</destinationEdge>
<objectiveCriterion>Custom</objectiveCriterion>
<percentage>1</percentage>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Engage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</failureEffect>
</failureEffects>
<additionalDetails/>
<description>Enage the following enemy unit(s) and force(s):</description>
<description>Engage the following enemy unit(s) and force(s):</description>
<destinationEdge>NONE</destinationEdge>
<objectiveCriterion>Custom</objectiveCriterion>
<percentage>1</percentage>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Low Atmo - Interception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ScenarioTemplate>
<name>Low Atmo - Interception</name>
<shortBriefing>Hostile aircraft on approach. Intercept and destroy.</shortBriefing>
<detailedBriefing>Destory or cripple 50% of hostile aircraft.</detailedBriefing>
<detailedBriefing>Destroy or cripple 50% of hostile aircraft.</detailedBriefing>
<mapParameters>
<allowedTerrainTypes/>
<allowRotation>false</allowRotation>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Prevent Recon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<ScenarioTemplate>
<name>Prevent Recon</name>
<shortBriefing>Prevent hostile reconnaisance.</shortBriefing>
<shortBriefing>Prevent hostile reconnaissance.</shortBriefing>
<detailedBriefing>Destroy or rout 50% of the opposing force within the specified duration.</detailedBriefing>
<isHostileFacility>false</isHostileFacility>
<isAlliedFacility>false</isAlliedFacility>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/Space - Interception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ScenarioTemplate>
<name>Space - Interception</name>
<shortBriefing>Hostile aircraft on approach. Intercept and destroy.</shortBriefing>
<detailedBriefing>Destory or cripple 50% of hostile aircraft.</detailedBriefing>
<detailedBriefing>Destroy or cripple 50% of hostile aircraft.</detailedBriefing>
<isHostileFacility>false</isHostileFacility>
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/universe/academies/Prestigious Academies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
<name>Canopian Institute of War (3080)</name>
<isMilitary>true</isMilitary>
<promotion>Lieutenant Jr. Grade</promotion>
<description>Rebuild in 3080, the Canopian Institute of War, continues to elevate the Magistracy Armed Forces' training programs, inspired by the Sun Zhang MechWarrior Academy. Graduates, distinguished by their gold, silver, and lavender uniforms, often join elite units like the Magistracy Royal Guards or pursue further training at the Victoria Academy of Arms and Technology.</description>
<description>Rebuilt in 3080, the Canopian Institute of War, continues to elevate the Magistracy Armed Forces' training programs, inspired by the Sun Zhang MechWarrior Academy. Graduates, distinguished by their gold, silver, and lavender uniforms, often join elite units like the Magistracy Royal Guards or pursue further training at the Victoria Academy of Arms and Technology.</description>
<factionDiscount>0</factionDiscount>
<isFactionRestricted>true</isFactionRestricted>
<faction>MOC</faction>
Expand Down
8 changes: 4 additions & 4 deletions MekHQ/data/universe/news.xml
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ Information veracity as described in the 25 Years of Art & Fiction of "Story Fic
<newsItem>
<headline>Is the Draconis Combine sated?</headline> <!-- Source: House Kurita (The Draconis Combine) -->
<date>2367</date>
<desc><![CDATA[<p>As the Principality of Rasalhague invasion war comes to a close, the question that burns in the mind of any outside observer is: was it worth it? Tenno declared victory in the war against Rasalhague, but the reality is not that simple. Although the Principality had been defeated, and acknowledged the Combine as their overlords, in reality the Rasalhagians largely maintained their independence, and their culture remains strongly imbedded. How will the Dragon impose its doctrine and will the Rasalhagians accept it?</p>]]></desc>
<desc><![CDATA[<p>As the Principality of Rasalhague invasion war comes to a close, the question that burns in the mind of any outside observer is: was it worth it? Tenno declared victory in the war against Rasalhague, but the reality is not that simple. Although the Principality had been defeated, and acknowledged the Combine as their overlords, in reality the Rasalhagians largely maintained their independence, and their culture remains strongly embedded. How will the Dragon impose its doctrine and will the Rasalhagians accept it?</p>]]></desc>
<service>Terran News Service</service>
<location>New Samarkand</location>
</newsItem>
Expand Down Expand Up @@ -813,7 +813,7 @@ Information veracity as described in the 25 Years of Art & Fiction of "Story Fic
<location>Terra</location>
</newsItem>
<newsItem>
<headline>The Director-General has sufered a fatal heart attack</headline> <!-- Source: The Star League -->
<headline>The Director-General has suffered a fatal heart attack</headline> <!-- Source: The Star League -->
<date>2387-12</date>
<desc><![CDATA[<p>Lord Protector Raymond Cameron has been confirmed dead from a heart attack brought by his medication. This comes after difficult days for the Director-General. After increased dissent from the public for months, he recently found his wife Katherine fathered a child with his own brother Brian. He had Brian arrested and accused of treason, for which Raymond wanted Brian put on trial for.</p> <p>That didn't come to be. After a meeting with the High Council, Raymond collapsed in his quarters. The President of Terran Congress was sworn in Pro-tem, in an attempt to recover political stability. Brian remains incarcerated.</p>]]></desc>
<service>Terran News Service</service>
Expand Down Expand Up @@ -2107,7 +2107,7 @@ Information veracity as described in the 25 Years of Art & Fiction of "Story Fic
<newsItem>
<headline>Obituary: Herodias Ap Gwynn</headline> <!-- Source: The Periphery Sourcebook -->
<date>3013-04-12</date>
<desc><![CDATA[<p>It is with great remorse that I bring you the following report. Herodias Ap Gwynn, the founder of the Pan-Humanist doctrine, was found dead earlier today.</p> <p>Herodias Ap Gwynn was well respected throughout the Alliance as an idealist, pacifist and philosopher, whose idea attracted hundreds if not thousands of followers to his view that humanity shares a common path and goal. He spent his life as a conciliator, diplomat and techer, instructing his followers to offer aid to those in need and to spread peace, education and medicine throughout the known galaxy.</p> <p>Herodias Ap Gwynn was 60 years old, at this time the cause of death is unknown, though authorities do not suspect foul-play was involved. Ceremonies will be held on Alpheratz in two weeks, with hundreds of Pan Humanists expected to be in attendance.</p> <p>Officials from the organization that Herodias Ap Gwynn began decades ago promised that his works and teachings will continue even after his death.</p>]]></desc>
<desc><![CDATA[<p>It is with great remorse that I bring you the following report. Herodias Ap Gwynn, the founder of the Pan-Humanist doctrine, was found dead earlier today.</p> <p>Herodias Ap Gwynn was well respected throughout the Alliance as an idealist, pacifist and philosopher, whose idea attracted hundreds if not thousands of followers to his view that humanity shares a common path and goal. He spent his life as a conciliator, diplomat and teacher, instructing his followers to offer aid to those in need and to spread peace, education and medicine throughout the known galaxy.</p> <p>Herodias Ap Gwynn was 60 years old, at this time the cause of death is unknown, though authorities do not suspect foul-play was involved. Ceremonies will be held on Alpheratz in two weeks, with hundreds of Pan Humanists expected to be in attendance.</p> <p>Officials from the organization that Herodias Ap Gwynn began decades ago promised that his works and teachings will continue even after his death.</p>]]></desc>
<service>OAB</service>
<location>Alpheratz</location>
</newsItem>
Expand Down Expand Up @@ -3263,7 +3263,7 @@ Information veracity as described in the 25 Years of Art & Fiction of "Story Fic
<newsItem>
<headline>Noisiel first inaugural Summer Games held: Father versus son to highlight the Games</headline> <!-- Source: Mercenaries Supplemental II -->
<date>3047-07</date>
<desc><![CDATA[<p>Spectators were treated to a new form of 'Mech competition last month on Noisiel. Duke Michael Alextep and his son William faced off in the first ever <em>Atlas</em> rugby match. The event was the highlight of the first annual Noisiel Summer Games announced earlier this year. The event highlighted traditional athletes as well as some of the finest aerobatic maneuvers from AFFC pilots. The event was so popular talks are already under way as to the next years eventy with several ideas being submitted to the Duke's offices.</p>]]></desc>
<desc><![CDATA[<p>Spectators were treated to a new form of 'Mech competition last month on Noisiel. Duke Michael Alextep and his son William faced off in the first ever <em>Atlas</em> rugby match. The event was the highlight of the first annual Noisiel Summer Games announced earlier this year. The event highlighted traditional athletes as well as some of the finest aerobatic maneuvers from AFFC pilots. The event was so popular talks are already under way as to the next years event with several ideas being submitted to the Duke's offices.</p>]]></desc>
<service>CNB</service>
<location>Noisiel</location>
</newsItem>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/mmconf/campaignPresets/AtBStarterGuidev40.xml
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ Note: This ability is only used for BattleMechs.</desc>
<displayName>Terrain Master [Mountaineer] (CamOps)</displayName>
<lookupName>tm_mountaineer</lookupName>
<desc>Movement in rubble or rough cost 1 less MP and elevation changes also cost 1 MP less.
The mountaineer also recieves a -1 to PSR checks for the given terrain.</desc>
The mountaineer also receives a -1 to PSR checks for the given terrain.</desc>
<xpCost>40</xpCost>
<weight>3</weight>
<prereqAbilities></prereqAbilities>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/mmconf/campaignPresets/DefaultTotalWarfare.xml
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ Note: This ability is only used for BattleMechs.</desc>
<displayName>Terrain Master [Mountaineer] (CamOps)</displayName>
<lookupName>tm_mountaineer</lookupName>
<desc>Movement in rubble or rough cost 1 less MP and elevation changes also cost 1 MP less.
The mountaineer also recieves a -1 to PSR checks for the given terrain.</desc>
The mountaineer also receives a -1 to PSR checks for the given terrain.</desc>
<xpCost>15</xpCost>
<weight>3</weight>
<prereqAbilities></prereqAbilities>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/mmconf/campaignPresets/StratConAlpha.xml
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ Note: This ability is only used for BattleMechs.</desc>
<displayName>Terrain Master [Mountaineer] (CamOps)</displayName>
<lookupName>tm_mountaineer</lookupName>
<desc>Movement in rubble or rough cost 1 less MP and elevation changes also cost 1 MP less.
The mountaineer also recieves a -1 to PSR checks for the given terrain.</desc>
The mountaineer also receives a -1 to PSR checks for the given terrain.</desc>
<xpCost>40</xpCost>
<weight>3</weight>
<prereqAbilities></prereqAbilities>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/mmconf/non_combat_units_list.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; The purpose of this file is to maintain a list of non-combat units. Non-combat units will not checked for weapon
; ranges or damage output in regards to the Crippled Units and Forced Withdrawal rules in Total Warfare.

; Industiral Mechs
; Industrial Mechs
DemolitionMech, WI-DM
DemolitionMech, WI-DM2
Hyena SalvageMech, HYN-4A
Expand Down

0 comments on commit 1149795

Please sign in to comment.