Merge pull request #4151 from IllianiCBT/vehicleGunnerSkillLevel

Updated Vehicle Gunner's Experience Level Calculation to Optionally Include Artillery Skill

Author: SJuliez

Diff for: MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -223,7 +223,7 @@ chkUseInitiativeBonus.toolTipText=Give each pilot an individual initiative bonus
 chkUseToughness.text=Use Toughness
 chkUseToughness.toolTipText=Give each pilot a toughness bonus to KO checks
 chkUseArtillery.text=Use Artillery Skill
-chkUseArtillery.toolTipText=Give each pilot an artillery skill which is separate from the gunnery skill
+chkUseArtillery.toolTipText=Give each pilot an artillery skill which is separate from the gunnery skill. For vehicle gunners, experience level is based on Gunnery/Vehicle or Artillery (whichever is better).
 chkUseAbilities.text=Allow Special Abilities
 chkUseAbilities.toolTipText=Allow personnel to have special abilities
 chkUseEdge.text=Use Edge

Diff for: MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -2577,7 +2577,19 @@ public int getExperienceLevel(final Campaign campaign, final boolean secondary)
             case VTOL_PILOT:
                 return hasSkill(SkillType.S_PILOT_VTOL) ? getSkill(SkillType.S_PILOT_VTOL).getExperienceLevel() : SkillType.EXP_NONE;
             case VEHICLE_GUNNER:
-                return hasSkill(SkillType.S_GUN_VEE) ? getSkill(SkillType.S_GUN_VEE).getExperienceLevel() : SkillType.EXP_NONE;
+                if (!campaign.getCampaignOptions().isUseArtillery()) {
+                    return hasSkill(SkillType.S_GUN_VEE) ? getSkill(SkillType.S_GUN_VEE).getExperienceLevel() : SkillType.EXP_NONE;
+                } else {
+                    if ((hasSkill(SkillType.S_GUN_VEE)) && (hasSkill(SkillType.S_ARTILLERY))) {
+                        return Math.max((getSkill(SkillType.S_GUN_VEE).getExperienceLevel()), (getSkill(SkillType.S_ARTILLERY).getExperienceLevel()));
+                    } else if (hasSkill(SkillType.S_GUN_VEE)) {
+                        return getSkill(SkillType.S_GUN_VEE).getExperienceLevel();
+                    } else if (hasSkill(SkillType.S_ARTILLERY)) {
+                        return getSkill(SkillType.S_ARTILLERY).getExperienceLevel();
+                    } else {
+                        return SkillType.EXP_NONE;
+                    }
+                }
             case VEHICLE_CREW:
                 return hasSkill(SkillType.S_TECH_MECHANIC) ? getSkill(SkillType.S_TECH_MECHANIC).getExperienceLevel() : SkillType.EXP_NONE;
             case AEROSPACE_PILOT: