Merge branch 'master' into nag_faction

MegaMek · Jun 20, 2024 · d9ed387 · d9ed387
2 parents 7e6680d + f66f2a6
commit d9ed387
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/MekHQ/data/universe/academies/Prestigious Academies.xml b/MekHQ/data/universe/academies/Prestigious Academies.xml
@@ -23,8 +23,6 @@
         <name>Addicks University</name>
         <type>University</type>
         <description>Located in the heart of the Inner Sphere, Addicks University is celebrated for its progressive liberal arts education, particularly in teacher training. The institution uniquely integrates its academic programs with community schools, allowing student teachers to gain invaluable hands-on experience.</description>
-        <factionDiscount>0</factionDiscount>
-        <isFactionRestricted>true</isFactionRestricted>
         <locationSystem>Addicks</locationSystem>
         <constructionYear>2400</constructionYear>
         <destructionYear>2777</destructionYear>
@@ -34,6 +32,9 @@
         <educationLevelMin>High School</educationLevelMin>
         <educationLevelMax>College</educationLevelMax>
         <ageMin>16</ageMin>
+        <qualification>Teaching Graduate</qualification>
+        <curriculum>Leadership</curriculum>
+        <qualificationStartYear>2300</qualificationStartYear>
         <baseAcademicSkillLevel>0</baseAcademicSkillLevel>
     </academy>
     <academy>
@@ -1795,7 +1796,6 @@
         <qualification>Semester One Curriculum</qualification>
         <curriculum>Small Arms</curriculum>
         <qualificationStartYear>2300</qualificationStartYear>
-        <qualificationStartYear>2300</qualificationStartYear>
         <baseAcademicSkillLevel>-1</baseAcademicSkillLevel>
     </academy>
     <academy>
@@ -2324,7 +2324,6 @@
         <qualification>Armored Infantry Graduate</qualification>
         <curriculum>Gunnery/Battlesuit, Anti-Mech</curriculum>
         <qualificationStartYear>3058</qualificationStartYear>
-        <qualificationStartYear>3058</qualificationStartYear>
         <qualification>Aerospace Graduate</qualification>
         <curriculum>Piloting/Aerospace, Gunnery/Aerospace</curriculum>
         <qualificationStartYear>2490</qualificationStartYear>
@@ -2422,12 +2421,15 @@
         <locationSystem>Terra</locationSystem>
         <constructionYear>2300</constructionYear>
         <destructionYear>2777</destructionYear>
-        <tuition>#N/A</tuition>
+        <tuition>7500</tuition>
         <durationDays>1200</durationDays>
         <facultySkill>5</facultySkill>
         <educationLevelMin>High School</educationLevelMin>
         <educationLevelMax>Doctorate</educationLevelMax>
         <ageMin>16</ageMin>
+        <qualification>Intergalactic Diplomacy in the Modern Age</qualification>
+        <curriculum>Negotiation, Leadership</curriculum>
+        <qualificationStartYear>2300</qualificationStartYear>
         <baseAcademicSkillLevel>0</baseAcademicSkillLevel>
     </academy>
     <academy>

diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -103,6 +103,7 @@ MEKHQ VERSION HISTORY:
 + Fix #4235: Fixed Invalid Parsing of Early Childhood when Loading Personnel
 + PR #4242: Added Prestigious Academies D-F
 + PR #4246: Added Prestigious Academies G-J
++ PR #4248: Fixed Missing Qualification from James McKenna University
 
 0.49.19.1 (2024-05-14 1800 UTC)
 + Milestone Release. Backported fixes.