Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into opFor_nameBug
Browse files Browse the repository at this point in the history 
# Conflicts:
#	MekHQ/src/mekhq/campaign/mission/AtBContract.java
#	MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
  • Loading branch information
@IllianiCBT
IllianiCBT committed Sep 26, 2024
2 parents 62317ee + b3314a8 commit ca6e145
Show file tree
Hide file tree
Showing 140 changed files with 9,632 additions and 3,805 deletions.
131 changes: 0 additions & 131 deletions MekHQ/data/CamOpsContractData2.xml
View file

This file was deleted.

40 changes: 38 additions & 2 deletions MekHQ/data/universe/academies/Unit Education.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,42 @@
<qualificationStartYear>2300</qualificationStartYear>
<baseAcademicSkillLevel>1</baseAcademicSkillLevel>
</academy>
<academy>
<name>Adult Apprenticeship</name>
<isMilitary>true</isMilitary>
<isPrepSchool>true</isPrepSchool>
<description>An adult apprenticeship is a hands-on training program where older recruits are integrated into a military or mercenary unit. The apprenticeship focuses heavily on learning in the field, with recruits shadowing seasoned veterans.</description>
<isHomeSchool>true</isHomeSchool>
<locationSystem>Terra</locationSystem>
<constructionYear>2300</constructionYear>
<tuition>0</tuition>
<educationLevelMax>Early Childhood</educationLevelMax>
<durationDays>150</durationDays>
<facultySkill>9</facultySkill>
<ageMin>16</ageMin>
<qualification>MekTech Apprenticeship</qualification>
<curriculum>Astech, Tech/Mek</curriculum>
<qualificationStartYear>2439</qualificationStartYear>
<qualification>Mechanic Apprenticeship</qualification>
<curriculum>Astech, Tech/Mechanic</curriculum>
<qualificationStartYear>2300</qualificationStartYear>
<qualification>AeroTek Apprenticeship</qualification>
<curriculum>Astech, Tech/Aero</curriculum>
<qualificationStartYear>2314</qualificationStartYear>
<qualification>Battle Armor Technician Apprenticeship</qualification>
<curriculum>Astech, Tech/BattleArmor</curriculum>
<qualificationStartYear>3050</qualificationStartYear>
<qualification>Black Naval Tech Apprenticeship</qualification>
<curriculum>Astech, Tech/Vessel</curriculum>
<qualificationStartYear>2470</qualificationStartYear>
<qualification>Administrative Apprenticeship</qualification>
<curriculum>Administration, Scrounge</curriculum>
<qualificationStartYear>2300</qualificationStartYear>
<qualification>Medical Apprenticeship</qualification>
<curriculum>MedTech, Doctor</curriculum>
<qualificationStartYear>2300</qualificationStartYear>
<baseAcademicSkillLevel>0</baseAcademicSkillLevel>
</academy>
<academy>
<name>In-House Boot Camp</name>
<type>Basic Training</type>
Expand All @@ -95,7 +131,7 @@
<isHomeSchool>true</isHomeSchool>
<locationSystem>Terra</locationSystem>
<constructionYear>2300</constructionYear>
<tuition>1250</tuition>
<tuition>0</tuition>
<educationLevelMax>Early Childhood</educationLevelMax>
<durationDays>70</durationDays>
<facultySkill>9</facultySkill>
Expand All @@ -122,7 +158,7 @@
<isHomeSchool>true</isHomeSchool>
<locationSystem>Terra</locationSystem>
<constructionYear>2300</constructionYear>
<tuition>1250</tuition>
<tuition>0</tuition>
<educationLevelMax>Early Childhood</educationLevelMax>
<durationDays>150</durationDays>
<facultySkill>9</facultySkill>
Expand Down
133 changes: 60 additions & 73 deletions MekHQ/data/universe/atbconfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,16 @@ of 4. An entry of the form <entry>option</entry> has a weight of 1.
format. -->
<botForce org="IS,CLAN,CS">
<weightedTable weightClass="L">
<entry weight="9">M</entry>
<entry weight="7">LL</entry>
<entry weight="4">H</entry>
<entry weight="1">L</entry>
</weightedTable>
<weightedTable weightClass="M">
<entry weight="5">LL</entry>
<entry weight="5">H</entry>
<entry weight="10">ML</entry>
<entry weight="1">M</entry>
</weightedTable>
<weightedTable weightClass="H">
<entry weight="3">LLL</entry>
<entry weight="4">MM</entry>
<entry weight="2">A</entry>
<entry weight="3">HL</entry>
<entry weight="4">MLL</entry>
<entry weight="4">HM</entry>
<entry weight="1">H</entry>
</weightedTable>
<weightedTable weightClass="A">
<entry weight="4">MML</entry>
<entry weight="3">HLL</entry>
<entry weight="2">HH</entry>
<entry weight="2">AL</entry>
<entry weight="4">MMM</entry>
<entry weight="3">HML</entry>
<entry weight="2">AM</entry>
<entry weight="1">A</entry>
</weightedTable>
</botForce>

Expand All @@ -64,83 +49,81 @@ of 4. An entry of the form <entry>option</entry> has a weight of 1.

<botLance org="IS">
<weightedTable weightClass="L">
<entry weight="3">LLLL</entry>
<entry weight="1">LLLL</entry>
<entry weight="2">LLLM</entry>
<entry weight="1">LLMM</entry>
<entry weight="2">LLMM</entry>
<entry weight="1">LLMH</entry>
</weightedTable>
<weightedTable weightClass="M">
<entry weight="1">LLMM</entry>
<entry weight="2">LMMM</entry>
<entry weight="1">LMMH</entry>
<entry weight="2">MMMM</entry>
<entry weight="1">MMMH</entry>
<entry weight="2">MMMH</entry>
<entry weight="1">MMHH</entry>
</weightedTable>
<weightedTable weightClass="H">
<entry weight="1">MMHH</entry>
<entry weight="2">MHHH</entry>
<entry weight="1">MHHH</entry>
<entry weight="2">HHHH</entry>
<entry weight="2">MHHA</entry>
<entry weight="1">HHHA</entry>
</weightedTable>
<weightedTable weightClass="A">
<entry weight="1">MHAA</entry>
<entry weight="2">HHAA</entry>
<entry weight="3">HAAA</entry>
<entry weight="2">HAAA</entry>
<entry weight="1">AAAA</entry>
</weightedTable>
</botLance>

<botLance org="CLAN">
<weightedTable weightClass="L">
<entry>LLLLL</entry>
<entry>LLLLM</entry>
<entry>LLLMM</entry>
<entry weight="1">LLLLL</entry>
<entry weight="2">LLLLM</entry>
<entry weight="2">LLMMM</entry>
<entry weight="1">LLMMH</entry>
</weightedTable>
<weightedTable weightClass="M">
<entry weight="1">LLMMM</entry>
<entry weight="1">LMMMM</entry>
<entry weight="2">MMMMM</entry>
<entry weight="1">MMMMH</entry>
<entry weight="2">MMMMH</entry>
<entry weight="1">MMMHH</entry>
</weightedTable>
<weightedTable weightClass="H">
<entry weight="1">MMHHH</entry>
<entry weight="2">MHHHH</entry>
<entry weight="2">HHHHH</entry>
<entry weight="1">HHHHA</entry>
<entry weight="1">MHHHA</entry>
</weightedTable>
<weightedTable weightClass="A">
<entry weight="1">MHHAA</entry>
<entry weight="2">HHHHA</entry>
<entry weight="2">HHHAA</entry>
<entry weight="2">HHAAA</entry>
<entry weight="1">AAAAA</entry>
<entry weight="1">HHAAA</entry>
</weightedTable>
</botLance>

<botLance org="CS">
<weightedTable weightClass="L">
<entry weight="1">LLLLLL</entry>
<entry weight="2">LLLLLM</entry>
<entry weight="2">LLLLMM</entry>
<entry weight="1">LLLMMM</entry>
<entry weight="2">LLLMMM</entry>
<entry weight="1">LLLMHH</entry>
</weightedTable>
<weightedTable weightClass="M">
<entry weight="1">LLLMMM</entry>
<entry weight="1">LLMMMM</entry>
<entry weight="1">LMMMMM</entry>
<entry weight="1">MMMMMM</entry>
<entry weight="1">MMMMMH</entry>
<entry weight="1">MMMMHH</entry>
<entry weight="1">LLMMHH</entry>
<entry weight="2">MMMMMM</entry>
<entry weight="2">MMMMHH</entry>
<entry weight="1">MMMHHH</entry>
</weightedTable>
<weightedTable weightClass="H">
<entry>MMMHHH</entry>
<entry>MMHHHH</entry>
<entry>MHHHHH</entry>
<entry>HHHHHH</entry>
<entry>HHHHHA</entry>
<entry>HHHHAA</entry>
<entry weight="1">MMHHHH</entry>
<entry weight="2">HHHHHH</entry>
<entry weight="2">MMHHAA</entry>
<entry weight="1">HHHHAA</entry>
</weightedTable>
<weightedTable weightClass="A">
<entry weight="1">MMHAAA</entry>
<entry weight="2">HHHAAA</entry>
<entry weight="1">HHAAAA</entry>
<entry weight="2">HAAAAA</entry>
<entry weight="2">HHAAAA</entry>
<entry weight="1">AAAAAA</entry>
</weightedTable>
</botLance>
Expand All @@ -155,28 +138,32 @@ of 4. An entry of the form <entry>option</entry> has a weight of 1.
*Note that start and end dates are optional, but must
follow yyyy-MM-dd format. Planet names much match the
name in planets.xml exactly.-->
<hiringHalls>
<hall start="3031-01-01" end="3067-10-15">Outreach</hall>
<hall start="2700-01-01">Solaris</hall>
<hall start="3057-01-01">Arc-Royal</hall>
<hall start="3058-01-01" end="3081-03-15">Fletcher</hall>
<hall start="2650-01-01">Galatea</hall>
<hall start="3000-01-01">Westerhand</hall>
<hall start="3057-01-01" end="3081-03-15">Northwind</hall>
<hall start="3020-01-01">Herotitus</hall>
</hiringHalls>

</contractGeneration>

<!-- Values used for searching for an available ship to purchase. -->
<shipSearch>
<!-- The total cost of the search process -->
<shipSearchCost>100000</shipSearchCost>

<!-- The number of weeks required to complete the ship search. -->
<shipSearchLengthWeeks>4</shipSearchLengthWeeks>

<!-- The target number to for the dice roll to determine whether the ship search
<hiringHalls>
<hall start="3031-01-01" end="3067-10-15" level="great">Outreach</hall>
<hall start="2700-01-01" level="minor">Solaris</hall>
<hall start="3057-01-01" level="standard">Arc-Royal</hall>
<hall start="3058-01-01" end="3081-03-15" level="minor" >Fletcher</hall>
<hall start="2650-01-01" level="great">Galatea</hall>
<hall start="3000-01-01" level="great">Westerhand</hall>
<hall start="3057-01-01" end="3081-03-15" level="great">Northwind</hall>
<hall start="3020-01-01" level="minor">Herotitus</hall>
<hall start="2694-01-01" level="questionable">Antallos (Port Krin)</hall>
<hall start="2912-01-01" level="questionable">Astrokaszy</hall>
<hall start="3052-01-01" level="minor">Noisiel</hall>
<hall start="2811-01-01" end="3045-01-01" level="minor">Le Blanc</hall>
</hiringHalls>

</contractGeneration>

<!-- Values used for searching for an available ship to purchase. -->
<shipSearch>
<!-- The total cost of the search process -->
<shipSearchCost>100000</shipSearchCost>

<!-- The number of weeks required to complete the ship search. -->
<shipSearchLengthWeeks>4</shipSearchLengthWeeks>

<!-- The target number to for the dice roll to determine whether the ship search
was successful. Acceptable values for unitType are Dropship, Jumpship, and Warship.
If the target number is missing or commented out, that type of ship is not available
in a search. -->
Expand Down
Loading

0 comments on commit ca6e145

Please sign in to comment.