@@ -56,7 +56,6 @@ public enum PersonnelRole {
5656 // region Enum Declarations
5757 MEKWARRIOR (PersonnelRoleSubType .COMBAT , KeyEvent .VK_M , 4 , 4 , 5 , 5 , 4 , 4 , 4 ),
5858 LAM_PILOT (PersonnelRoleSubType .COMBAT , KeyEvent .VK_UNDEFINED , 4 , 4 , 5 , 5 , 4 , 4 , 4 ),
59- COMBAT_TECHNICIAN (PersonnelRoleSubType .SUPPORT , KeyEvent .VK_UNDEFINED , 4 , 4 , 5 , 3 , 5 , 5 , 4 ),
6059 VEHICLE_CREW_GROUND (PersonnelRoleSubType .COMBAT , KeyEvent .VK_UNDEFINED , 4 , 4 , 5 , 5 , 4 , 4 , 4 ),
6160 VEHICLE_CREW_NAVAL (PersonnelRoleSubType .COMBAT , KeyEvent .VK_UNDEFINED , 4 , 4 , 5 , 5 , 4 , 4 , 4 ),
6261 VEHICLE_CREW_VTOL (PersonnelRoleSubType .COMBAT , KeyEvent .VK_UNDEFINED , 4 , 4 , 5 , 5 , 4 , 4 , 4 ),
@@ -354,16 +353,18 @@ public enum PersonnelRole {
354353 @ Deprecated (since = "0.50.10" , forRemoval = true )
355354 VEHICLE_GUNNER (KeyEvent .VK_UNDEFINED ),
356355 @ Deprecated (since = "0.50.10" , forRemoval = true )
357- VEHICLE_CREW (KeyEvent .VK_UNDEFINED );
356+ VEHICLE_CREW (KeyEvent .VK_UNDEFINED ),
357+ @ Deprecated (since = "0.50.10" , forRemoval = true )
358+ COMBAT_TECHNICIAN (KeyEvent .VK_UNDEFINED );
358359 // endregion Enum Declarations
359360
360361 // region Variable Declarations
361362 private static final MMLogger logger = MMLogger .create (PersonnelRole .class );
362363 private static final String RESOURCE_BUNDLE = "mekhq.resources.PersonnelRole" ;
363364
364- public static final List <PersonnelRole > VEHICLE_CREW_EXTENDED_ROLES = List .of (COMBAT_TECHNICIAN , MEK_TECH ,
365- AERO_TEK , MECHANIC , BA_TECH , ASTECH , DOCTOR , MEDIC , COMMS_OPERATOR , TECH_COMMUNICATIONS , SENSOR_TECHNICIAN ,
366- SOLDIER , ADMINISTRATOR_COMMAND , ADMINISTRATOR_TRANSPORT , ADMINISTRATOR_LOGISTICS , ADMINISTRATOR_HR , CHEF );
365+ public static final List <PersonnelRole > VEHICLE_CREW_EXTENDED_ROLES = List .of (MEK_TECH , AERO_TEK , MECHANIC ,
366+ BA_TECH , ASTECH , DOCTOR , MEDIC , COMMS_OPERATOR , TECH_COMMUNICATIONS , SENSOR_TECHNICIAN , SOLDIER ,
367+ ADMINISTRATOR_COMMAND , ADMINISTRATOR_TRANSPORT , ADMINISTRATOR_LOGISTICS , ADMINISTRATOR_HR , CHEF );
367368
368369 private final PersonnelRoleSubType subType ;
369370 private final boolean hasClanName ;
@@ -641,13 +642,6 @@ public List<String> getSkillsForProfession(boolean isAdminsHaveNegotiation, bool
641642 yield List .of (SkillType .S_TECH_MECHANIC );
642643 }
643644 }
644- case COMBAT_TECHNICIAN -> {
645- if (isTechsUseAdministration ) {
646- yield List .of (SkillType .S_TECH_MECHANIC , SkillType .S_TECH_MEK , SkillType .S_ADMIN );
647- } else {
648- yield List .of (SkillType .S_TECH_MECHANIC , SkillType .S_TECH_MEK );
649- }
650- }
651645 case AEROSPACE_PILOT -> List .of (SkillType .S_GUN_AERO , SkillType .S_PILOT_AERO );
652646 case CONVENTIONAL_AIRCRAFT_PILOT -> List .of (SkillType .S_GUN_JET , SkillType .S_PILOT_JET );
653647 case PROTOMEK_PILOT -> List .of (SkillType .S_GUN_PROTO );
@@ -1011,13 +1005,6 @@ public boolean isVehicleCrewVTOL() {
10111005 return this == VEHICLE_CREW_VTOL ;
10121006 }
10131007
1014- /**
1015- * @return {@code true} if the personnel has the Combat Technician/Engineer role, {@code false} otherwise.
1016- */
1017- public boolean isCombatTechnician () {
1018- return this == COMBAT_TECHNICIAN ;
1019- }
1020-
10211008 /**
10221009 * Returns {@code true} if this profession is suitable for vehicle crew positions.
10231010 *
@@ -1219,31 +1206,28 @@ public boolean isAerospaceGrouping() {
12191206 }
12201207
12211208 /**
1222- * @return {@code true} if the character is assigned to the Vehicle Crew/Ground, or the Combat Technician/Engineer
1223- * role
1209+ * @return {@code true} if the character is assigned to Vehicle Crew/Ground
12241210 */
12251211 public boolean isGroundVehicleCrew () {
1226- return isVehicleCrewGround () || isCombatTechnician () ;
1212+ return isVehicleCrewGround ();
12271213 }
12281214
12291215 /**
1230- * @return {@code true} if the character is assigned to the Vehicle Crew/Naval, or the Combat Technician/Engineer
1231- * role
1216+ * @return {@code true} if the character is assigned to Vehicle Crew/Naval
12321217 */
12331218 public boolean isNavalVehicleCrew () {
1234- return isVehicleCrewNaval () || isCombatTechnician () ;
1219+ return isVehicleCrewNaval ();
12351220 }
12361221
12371222 /**
1238- * @return {@code true} if the character is assigned to the Vehicle Crew/VTOL, or the Combat Technician/Engineer
1239- * role
1223+ * @return {@code true} if the character is assigned to Vehicle Crew/VTOL
12401224 */
12411225 public boolean isVTOLCrew () {
1242- return isVehicleCrewVTOL () || isCombatTechnician () ;
1226+ return isVehicleCrewVTOL ();
12431227 }
12441228
12451229 /**
1246- * @return {@code true} if the character is assigned to the Vehicle Crew/x or Combat Technician/Engineer role
1230+ * @return {@code true} if the character is assigned to the Vehicle Crew/x role
12471231 */
12481232 public boolean isVehicleCrewMember () {
12491233 return isGroundVehicleCrew () || isNavalVehicleCrew () || isVTOLCrew ();
@@ -1289,7 +1273,7 @@ public boolean isSupport(final boolean excludeCivilian) {
12891273 * @return {@code true} if the character is assigned to a technician role, {@code false} otherwise.
12901274 */
12911275 public boolean isTech () {
1292- return isMekTech () || isMechanic () || isCombatTechnician () || isAeroTek () || isBATech () || isVesselCrew ();
1276+ return isMekTech () || isMechanic () || isAeroTek () || isBATech () || isVesselCrew ();
12931277 }
12941278
12951279 /**
@@ -1299,7 +1283,7 @@ public boolean isTech() {
12991283 * @return {@code true} if the character is assigned to a technician role, {@code false} otherwise.
13001284 */
13011285 public boolean isTechSecondary () {
1302- return isMekTech () || isMechanic () || isCombatTechnician () || isAeroTek () || isBATech ();
1286+ return isMekTech () || isMechanic () || isAeroTek () || isBATech ();
13031287 }
13041288
13051289 /**
0 commit comments