Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored Phenotype Enum; Added ATOW Attributes to Character Generation; Added 'Extra Attribute Randomization' Campaign Option #6564

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -1790,12 +1790,20 @@ lblContractNegotiationXP.tooltip=How much experience does a contract negotiator
<br><b>Recommended:</b> Keep this disabled.
# skillRandomizationTab
lblSkillRandomizationTab.text=Skill Randomization Options \u270E
lblExtraRandomness.text=Extra Randomness \u26A0
lblExtraRandomness.text=Extra Random Skills \u26A0
lblExtraRandomness.tooltip=If checked, an additional 1d6 will be rolled per skill possessed by a\
\ newly created character. On a 1, the skill will be lowered, and on a 6 the skill will be raised.\
<br>\
<br><b>Warning:</b> Due to the way experience levels are calculated, enabling this option will\
\ more frequently have characters created with slightly lower than normal experience levels.
lblRandomizeAttributes.text=Extra Random Attributes \uD83C\uDF1F
lblRandomizeAttributes.tooltip=If checked, an extra d6 is rolled for each of the character's ATOW Attributes.\
<br>\
<br>On a roll of a 6 the Attribute is increased by 1, and a second d6 is rolled. If that is also a 6, the Attribute is\
\ increased by 1 again; and so on, until 6s stop being rolled.\
<br>\
<br>On a roll of a 6 the Attribute is decreased by 1, and a second d6 is rolled. If that is also a 1, the Attribute is\
\ decreased by 1 again; and so on, until 1s stop being rolled.
lblPhenotypesPanel.text=Clan Trueborn Percentages
lblMekWarrior.text=MekWarrior
lblMekWarrior.tooltip=What percentage of Clan MekWarriors should have a Trueborn phenotype?
Expand Down
3 changes: 2 additions & 1 deletion MekHQ/resources/mekhq/resources/GUI.properties
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ removePregnancies.text=Remove Pregnancies
regenerateLoyalty.text=Regenerate Loyalty
regeneratePersonality.text=Regenerate Personality
addRandomSPA.text=Add Random SPA
generateRoleplaySkills.text=Generate Roleplay Skills
generateRoleplaySkills.text=Generate Random Roleplay Skills
generateRoleplayAttributes.text=Reset Roleplay Attributes
addMinimumComplement.text=Add minimum complement
addMinimumComplementRandom.text=Random
addMinimumComplementElite.text=Elite
Expand Down
52 changes: 0 additions & 52 deletions MekHQ/resources/mekhq/resources/Personnel.properties
Original file line number Diff line number Diff line change
Expand Up @@ -275,58 +275,6 @@ MergingSurnameStyle.FEMALE.dropDownText=Both share the female spouse's surname (
MergingSurnameStyle.WEIGHTED.text=Weighted
MergingSurnameStyle.WEIGHTED.toolTipText=The surname style used will be randomly determined through set weights
MergingSurnameStyle.WEIGHTED.dropDownText=Surname style randomly determined through set weights
# PersonnelRole Enum
PersonnelRole.MEKWARRIOR.text=MekWarrior
PersonnelRole.LAM_PILOT.text=LAM Pilot
PersonnelRole.GROUND_VEHICLE_DRIVER.text=Vehicle Driver
PersonnelRole.NAVAL_VEHICLE_DRIVER.text=Naval Driver
PersonnelRole.VTOL_PILOT.text=VTOL Pilot
PersonnelRole.VEHICLE_GUNNER.text=Vehicle Gunner
PersonnelRole.VEHICLE_CREW.text=Vehicle Crewmember
PersonnelRole.AEROSPACE_PILOT.text=Aerospace Pilot
PersonnelRole.CONVENTIONAL_AIRCRAFT_PILOT.text=Conventional Aircraft Pilot
PersonnelRole.PROTOMEK_PILOT.text=ProtoMek Pilot
PersonnelRole.BATTLE_ARMOUR.text=Battle Armor Pilot
PersonnelRole.BATTLE_ARMOUR.clan.text=Elemental
PersonnelRole.SOLDIER.text=Soldier
PersonnelRole.VESSEL_PILOT.text=Vessel Pilot
PersonnelRole.VESSEL_GUNNER.text=Vessel Gunner
PersonnelRole.VESSEL_CREW.text=Vessel Crewmember
PersonnelRole.VESSEL_NAVIGATOR.text=Hyperspace Navigator
PersonnelRole.MEK_TECH.text=Mek Tech
PersonnelRole.MECHANIC.text=Mechanic
PersonnelRole.AERO_TEK.text=Aerospace Tech
PersonnelRole.BA_TECH.text=Battle Armor Tech
PersonnelRole.ASTECH.text=Astech
PersonnelRole.DOCTOR.text=Doctor
PersonnelRole.MEDIC.text=Medic
PersonnelRole.ADMINISTRATOR_COMMAND.text=Admin/Command
PersonnelRole.ADMINISTRATOR_LOGISTICS.text=Admin/Logistical
PersonnelRole.ADMINISTRATOR_TRANSPORT.text=Admin/Transport
PersonnelRole.ADMINISTRATOR_HR.text=Admin/HR
PersonnelRole.DEPENDENT.text=Dependent
PersonnelRole.NONE.text=None
# Phenotype Enum
Phenotype.MEKWARRIOR.text=MekWarrior
Phenotype.MEKWARRIOR.toolTipText=Probability of a trueborn person with appropriate bonuses for MekWarriors. Does not apply to non-clan factions.
Phenotype.ELEMENTAL.text=Elemental
Phenotype.ELEMENTAL.toolTipText=Probability of a trueborn person with appropriate bonuses for Elementals. Does not apply to non-clan factions.
Phenotype.AEROSPACE.text=Aerospace
Phenotype.AEROSPACE.groupingNameText=Aerospace Pilot
Phenotype.AEROSPACE.toolTipText=Probability of a trueborn person with appropriate bonuses for Aerospace crews. Does not apply to non-clan factions.
Phenotype.VEHICLE.text=Vehicle
Phenotype.VEHICLE.groupingNameText=Vehicle Crew
Phenotype.VEHICLE.toolTipText=Probability of a trueborn person with appropriate bonuses for Vehicle crews. This only applies to Clan Hell's Horses.
Phenotype.PROTOMEK.text=ProtoMek
Phenotype.PROTOMEK.groupingNameText=ProtoMek Pilot
Phenotype.PROTOMEK.toolTipText=Probability of a trueborn person with appropriate bonuses for ProtoMek crews. Does not apply to non-clan factions, nor clans before 3060.
Phenotype.NAVAL.text=Naval
Phenotype.NAVAL.groupingNameText=Naval Commander
Phenotype.NAVAL.toolTipText=Probability of a trueborn person with appropriate bonuses for Naval crews. This only applies to Clan Snow Raven and the Outworlds Alliance.
Phenotype.NONE.text=None
Phenotype.NONE.toolTipText=This person is freeborn
Phenotype.GENERAL.text=General
Phenotype.GENERAL.toolTipText=Error: this should never be displayed and is used for generation
# Profession Enum
Profession.MEKWARRIOR.text=MekWarrior
Profession.MEKWARRIOR.toolTipText=The MekWarrior Profession contains MekWarriors, LAM Pilots, and ProtoMek Pilots.
Expand Down
31 changes: 31 additions & 0 deletions MekHQ/resources/mekhq/resources/PersonnelRole.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# suppress inspection "UnusedProperty" for the whole file
MEKWARRIOR.label=MekWarrior
LAM_PILOT.label=LAM Pilot
GROUND_VEHICLE_DRIVER.label=Vehicle Driver
NAVAL_VEHICLE_DRIVER.label=Naval Driver
VTOL_PILOT.label=VTOL Pilot
VEHICLE_GUNNER.label=Vehicle Gunner
VEHICLE_CREW.label=Vehicle Crewmember
AEROSPACE_PILOT.label=Aerospace Pilot
CONVENTIONAL_AIRCRAFT_PILOT.label=Conventional Aircraft Pilot
PROTOMEK_PILOT.label=ProtoMek Pilot
BATTLE_ARMOUR.label=Battle Armor Pilot
BATTLE_ARMOUR.label.clan=Elemental
SOLDIER.label=Soldier
VESSEL_PILOT.label=Vessel Pilot
VESSEL_GUNNER.label=Vessel Gunner
VESSEL_CREW.label=Vessel Crewmember
VESSEL_NAVIGATOR.label=Hyperspace Navigator
MEK_TECH.label=Mek Tech
MECHANIC.label=Mechanic
AERO_TEK.label=Aerospace Tech
BA_TECH.label=Battle Armor Tech
ASTECH.label=Astech
DOCTOR.label=Doctor
MEDIC.label=Medic
ADMINISTRATOR_COMMAND.label=Admin/Command
ADMINISTRATOR_LOGISTICS.label=Admin/Logistical
ADMINISTRATOR_TRANSPORT.label=Admin/Transport
ADMINISTRATOR_HR.label=Admin/HR
DEPENDENT.label=Dependent
NONE.label=None
25 changes: 25 additions & 0 deletions MekHQ/resources/mekhq/resources/Phenotype.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# suppress inspection "UnusedProperty" for whole file
## General
shortName.trueborn=Trueborn
shortName.freeborn=Freeborn
## Specific
MEKWARRIOR.label=MekWarrior
MEKWARRIOR.tooltip=Probability of a trueborn person with appropriate bonuses for MekWarriors. Does not apply to non-clan factions.
ELEMENTAL.label=Elemental
ELEMENTAL.tooltip=Probability of a trueborn person with appropriate bonuses for Elementals. Does not apply to non-clan factions.
AEROSPACE.label=Aerospace
AEROSPACE.groupingNameText=Aerospace Pilot
AEROSPACE.tooltip=Probability of a trueborn person with appropriate bonuses for Aerospace crews. Does not apply to non-clan factions.
VEHICLE.label=Vehicle
VEHICLE.groupingNameText=Vehicle Crew
VEHICLE.tooltip=Probability of a trueborn person with appropriate bonuses for Vehicle crews. This only applies to Clan Hell's Horses.
PROTOMEK.label=ProtoMek
PROTOMEK.groupingNameText=ProtoMek Pilot
PROTOMEK.tooltip=Probability of a trueborn person with appropriate bonuses for ProtoMek crews. Does not apply to non-clan factions, nor clans before 3060.
NAVAL.label=Naval
NAVAL.groupingNameText=Naval Commander
NAVAL.tooltip=Probability of a trueborn person with appropriate bonuses for Naval crews. This only applies to Clan Snow Raven and the Outworlds Alliance.
NONE.label=None
NONE.tooltip=This person is freeborn
GENERAL.label=General
GENERAL.tooltip=Error: this should never be displayed and is used for generation
Loading
Loading