8000 Fix: Added Missing Art/Cooking Skill as Potential Skill for the Vehicle Crewmember Role by IllianiBird · Pull Request #6950 · MegaMek/mekhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix: Added Missing Art/Cooking Skill as Potential Skill for the Vehicle Crewmember Role #6950

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 10, 2025
Merged

Fix: Added Missing Art/Cooking Skill as Potential Skill for the Vehicle Crewmember Role #6950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions MekHQ/src/mekhq/campaign/personnel/Person.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,9 +1097,15 @@ public boolean canPerformRole(LocalDate today, final PersonnelRole role, final b
case VEHICLE_GUNNER -> hasSkill(SkillType.S_GUN_VEE);
case MECHANIC -> hasSkill(SkillType.S_TECH_MECHANIC);
case VEHICLE_CREW -> Stream.of(SkillType.S_TECH_MEK,
SkillType.S_TECH_AERO,
SkillType.S_TECH_MECHANIC, SkillType.S_TECH_BA, SkillType.S_SURGERY,
SkillType.S_MEDTECH, SkillType.S_ASTECH, SkillType.S_COMMUNICATIONS, SkillType.S_SENSOR_OPERATIONS)
SkillType.S_TECH_AERO,
SkillType.S_TECH_MECHANIC,
SkillType.S_TECH_BA,
SkillType.S_SURGERY,
SkillType.S_MEDTECH,
SkillType.S_ASTECH,
SkillType.S_COMMUNICATIONS,
SkillType.S_SENSOR_OPERATIONS,
SkillType.S_ART_COOKING)
.anyMatch(this::hasSkill);
case AEROSPACE_PILOT -> hasSkill(SkillType.S_GUN_AERO) && hasSkill(SkillType.S_PILOT_AERO);
case CONVENTIONAL_AIRCRAFT_PILOT -> hasSkill(SkillType.S_GUN_JET) && hasSkill(SkillType.S_PILOT_JET);
Expand Down Expand Up @@ -3800,7 +3806,7 @@ public int getExperienceLevel(final Campaign campaign, final boolean secondary)
SkillType.S_SURGERY,
SkillType.S_MEDTECH,
SkillType.S_ASTECH,
SkillType.S_COMMUNICATIONS,
SkillType.S_COMMUNICATIONS, SkillType.S_ART_COOKING,
SkillType.S_SENSOR_OPERATIONS);
int highestExperienceLevel = SkillType.EXP_NONE;
for (String relevantSkill : relevantSkills) {
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public String getTooltip() {
SkillType.S_SURGERY,
SkillType.S_MEDTECH,
SkillType.S_ASTECH,
SkillType.S_COMMUNICATIONS,
SkillType.S_COMMUNICATIONS, SkillType.S_ART_COOKING,
SkillType.S_SENSOR_OPERATIONS);
skills.addAll(relevantSkills);
} else {
Expand Down
Loading
0