From 192e789528b6d0f2b0ccecb8067d72ca896686ad Mon Sep 17 00:00:00 2001 From: Daniel L- <103902653+IllianiBird@users.noreply.github.com> Date: Wed, 7 May 2025 20:02:29 -0500 Subject: [PATCH 1/3] Update MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java b/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java index 4704a538413..c7488fc3bda 100644 --- a/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java +++ b/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java @@ -627,7 +627,9 @@ public boolean isAdministrator() { } /** - * @return {@code true} if the character's assigned role is a civilian role, {@code false} otherwise. + * @return {@code true} if the character's assigned role has a subtype of {@link PersonnelRoleSubType#CIVILIAN}, + * {@code false} otherwise. This method no longer considers roles such as {@code DEPENDENT} or {@code NONE} + * as civilian roles, as in previous implementations. */ public boolean isCivilian() { return isSubType(PersonnelRoleSubType.CIVILIAN); From 6b2d958c3759a72157d9f3d7f8023f39daa51abd Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Wed, 7 May 2025 20:03:52 -0500 Subject: [PATCH 2/3] Copilot change --- MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java b/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java index c7488fc3bda..1a0345d058d 100644 --- a/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java +++ b/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java @@ -569,7 +569,7 @@ public boolean isVesselCrewMember() { * otherwise. */ public boolean isSupport() { - return isSubType(PersonnelRoleSubType.SUPPORT) || isSubType(PersonnelRoleSubType.CIVILIAN); + return isSupport(true); } /** From b0b7407fd310c061e9c31b12257437b8b44e5eff Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Wed, 7 May 2025 21:42:28 -0500 Subject: [PATCH 3/3] Fixed failing test --- .../mekhq/campaign/personnel/enums/PersonnelRoleTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java b/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java index d6dcc57ab20..4c47f17181d 100644 --- a/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java +++ b/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java @@ -557,8 +557,8 @@ void testIsSupport() { assertTrue(PersonnelRole.MEK_TECH.isSupport()); assertTrue(PersonnelRole.ASTECH.isSupport()); assertTrue(PersonnelRole.ADMINISTRATOR_COMMAND.isSupport()); - assertTrue(PersonnelRole.DEPENDENT.isSupport()); - assertTrue(PersonnelRole.NONE.isSupport()); + assertFalse(PersonnelRole.DEPENDENT.isSupport()); + assertFalse(PersonnelRole.NONE.isSupport()); assertFalse(PersonnelRole.MEKWARRIOR.isSupport(true)); assertFalse(PersonnelRole.VESSEL_NAVIGATOR.isSupport(true)); assertTrue(PersonnelRole.MEK_TECH.isSupport(true));