Skip to content

Commit 5b4bcfc

Browse files
committed
Added ATOW Attributes to Skills; Improved Combat vs. Non-Combat Skill Handling
- Introduced `SkillAttribute` enum to represent attributes associated with skills. - Includes attributes such as REFLEXES, DEXTERITY, CHARISMA, etc. - Provides a utility method `fromString` for parsing input strings or integers. - Updated `SkillType` class: - Added references to `SkillAttribute` and `SkillSubType`. - Integrated new attributes `firstAttribute`, `secondAttribute`, and `subType`. - Deprecated methods `isCombatSkill`, `isPiloting`, and `isGunnery` in favor of `isSubTypeOf` methods. - Enhanced XML deserialization to handle new attributes and ensure backward compatibility. - Implemented a robust compatibility handler for legacy `SkillType` definitions. - Ensures compliance with new standards by updating subtype and attributes where missing.
1 parent 71a2801 commit 5b4bcfc

File tree

6 files changed

+726
-258
lines changed

6 files changed

+726
-258
lines changed

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

+15-37
Original file line numberDiff line numberDiff line change
@@ -1904,16 +1904,24 @@ lblRecruitmentBonusesCombatPanel.text=Combat Roles
19041904
lblRecruitmentBonusesSupportPanel.text=Support Roles
19051905
## Advancement Tab
19061906
skillsContentTabs.title=Skills
1907-
combatSkillsTab.title=Combat Skills
1908-
combatSkillsTab.border="Every skill you master is another weapon in your arsenal. Out here, the\
1907+
0gunnerySkillsTab.title=Gunnery Skills
1908+
0gunnerySkillsTab.border="Every skill you master is another weapon in your arsenal. Out here, the\
19091909
\ better you fight, the longer you live."\
19101910
<br><i>Sergeant Mick "Crash" Lannister\
19111911
<br>The Enforcers</i>
1912-
supportSkillsTab.title=Support Skills
1913-
supportSkillsTab.border="Support staff are like the coolant system in a 'Mek \u2014 nobody notices them\
1912+
1pilotingSkillsTab.title=Piloting Skills
1913+
1pilotingSkillsTab.border="Victory or debt!"\
1914+
<br><i>The Mercenary's Battle Cry</i>
1915+
2supportSkillsTab.title=Support Skills
1916+
2supportSkillsTab.border="Support staff are like the coolant system in a 'Mek \u2014 nobody notices them\
19141917
\ until they're gone, and then everyone's screaming."\
19151918
<br><i>Sergeant Leo "Gears" Malone\
19161919
<br>The Panther Corsairs</i>
1920+
3roleplaySkillsTab.title=Roleplay Skills
1921+
3roleplaySkillsTab.border="War doesn't just change planets and politics \u2014 it changes us. The person you\
1922+
\ are doesn't survive who you become."\
1923+
<br><i>Colonel Erik "Warhound" Voss\
1924+
<br>The Scion Saviors</i>
19171925
btnToggle.text=Toggle Advanced Options
19181926
btnHideAll.text=Hide All Advanced Options
19191927
btnDisplayAll.text=Display All Advanced Options
@@ -1934,40 +1942,10 @@ lblSkillLevel8.text=8
19341942
lblSkillLevel9.text=9
19351943
lblSkillLevel10.text=10
19361944
# Combat Skills Tab
1937-
lblCombatSkillsTab.text=Combat Skill Options
1938-
lblSkillPanelPiloting/Mek.text=Piloting/Mek
1939-
lblSkillPanelPiloting/Aerospace.text=Piloting/Aerospace
1940-
lblSkillPanelPiloting/Aircraft.text=Piloting/Aircraft
1941-
lblSkillPanelPiloting/GroundVehicle.text=Piloting/Ground Vehicle
1942-
lblSkillPanelPiloting/VTOL.text=Piloting/VTOL
1943-
lblSkillPanelPiloting/Naval.text=Piloting/Naval
1944-
lblSkillPanelPiloting/Spacecraft.text=Piloting/Spacecraft
1945-
lblSkillPanelGunnery/Mek.text=Gunnery/Mek
1946-
lblSkillPanelGunnery/Aerospace.text=Gunnery/Aerospace
1947-
lblSkillPanelGunnery/Aircraft.text=Gunnery/Aircraft
1948-
lblSkillPanelGunnery/Vehicle.text=Gunnery/Vehicle
1949-
lblSkillPanelGunnery/Spacecraft.text=Gunnery/Spacecraft
1950-
lblSkillPanelGunnery/BattleArmor.text=Gunnery/BattleArmor
1951-
lblSkillPanelGunnery/ProtoMek.text=Gunnery/ProtoMek
1952-
lblSkillPanelArtillery.text=Artillery
1953-
lblSkillPanelSmallArms.text=Small Arms
1954-
lblSkillPanelAnti-Mek.text=Anti-Mek
1945+
lblGunnerySkillsTab.text=Gunnery Skill Options
1946+
lblPilotingSkillsTab.text=Piloting Skill Options
19551947
lblSupportSkillsTab.text=Support Skill Options
1956-
lblSkillPanelTech/Mek.text=Tech/Mek
1957-
lblSkillPanelTech/Mechanic.text=Tech/Mechanic
1958-
lblSkillPanelTech/Aero.text=Tech/Aero
1959-
lblSkillPanelTech/BattleArmor.text=Tech/BattleArmor
1960-
lblSkillPanelTech/Vessel.text=Tech/Vessel
1961-
lblSkillPanelAstech.text=Astech
1962-
lblSkillPanelDoctor.text=Doctor
1963-
lblSkillPanelMedTech.text=MedTech
1964-
lblSkillPanelHyperspaceNavigation.text=Hyperspace Navigation
1965-
lblSkillPanelAdministration.text=Administration
1966-
lblSkillPanelNegotiation.text=Negotiation
1967-
lblSkillPanelLeadership.text=Leadership
1968-
lblSkillPanelScrounge.text=Scrounge <b>(Deprecated)</b>
1969-
lblSkillPanelStrategy.text=Strategy
1970-
lblSkillPanelTactics.text=Tactics
1948+
lblRoleplaySkillsTab.text=Roleplay Skill Options
19711949
## Advancement Tab
19721950
abilityContentTabs.title=Abilities
19731951
combatAbilitiesTab.title=Combat Abilities

0 commit comments

Comments
 (0)