Merge pull request #6567 from goron111/bug-negative-temporaryPrisonerCapacity

Issue 6560: Fix for negative temporary prisoner capacity

Author: IllianiBird

MekHQ/src/mekhq/campaign/Campaign.java

@@ -6407,7 +6407,7 @@ public int getTemporaryPrisonerCapacity() {
     }
 
     public void setTemporaryPrisonerCapacity(int temporaryPrisonerCapacity) {
-        this.temporaryPrisonerCapacity = temporaryPrisonerCapacity;
+        this.temporaryPrisonerCapacity = max(PrisonerEventManager.MINIMUM_TEMPORARY_CAPACITY, temporaryPrisonerCapacity);
     }
 
     public RandomEventLibraries getRandomEventLibraries() {

MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonerEventManager.java

@@ -27,6 +27,7 @@
  */
 package mekhq.campaign.randomEvents.prisoners;
 
+import static java.lang.Math.abs;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.Math.round;
@@ -91,6 +92,9 @@ public class PrisonerEventManager {
     private final int RESPONSE_TARGET_NUMBER = 7;
 
     public static final int DEFAULT_TEMPORARY_CAPACITY = 100;
+    // The temporary prisoner capacity should never go below 0.
+    // But the security forces should be able to guard some prisoners in all cases
+    public static final int MINIMUM_TEMPORARY_CAPACITY = 25;
     public static final double TEMPORARY_CAPACITY_DEGRADE_RATE = 0.1;
 
     // These values are based on CamOps. CamOps states a squad of CI or one squad of BA can
@@ -175,7 +179,8 @@ int degradeTemporaryCapacity() {
         int newCapacity = 0;
 
         if (temporaryCapacityModifier != DEFAULT_TEMPORARY_CAPACITY) {
-            int degreeOfChange = (int) round(temporaryCapacityModifier * TEMPORARY_CAPACITY_DEGRADE_RATE);
+        	double differendInTemporaryCapacity = (double) abs(DEFAULT_TEMPORARY_CAPACITY-temporaryCapacityModifier);
+            int degreeOfChange = max(1,(int) round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
 
             if (temporaryCapacityModifier < DEFAULT_TEMPORARY_CAPACITY) {
                 temporaryCapacityModifier += degreeOfChange;

MekHQ/unittests/mekhq/campaign/randomEvents/prisoners/PrisonerEventManagerTest.java

@@ -27,13 +27,15 @@
  */
 package mekhq.campaign.randomEvents.prisoners;
 
+import static java.lang.Math.abs;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.Math.round;
 import static mekhq.campaign.mission.enums.AtBMoraleLevel.STALEMATE;
 import static mekhq.campaign.randomEvents.prisoners.PrisonerEventManager.DEFAULT_TEMPORARY_CAPACITY;
 import static mekhq.campaign.randomEvents.prisoners.PrisonerEventManager.TEMPORARY_CAPACITY_DEGRADE_RATE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -78,11 +80,13 @@ void testDegradeTemporaryCapacity_DegradeDownTowardsDefault() {
         // Act
         int actualValue = eventManager.degradeTemporaryCapacity();
 
-        int degreeOfChange = (int) round(INITIAL_TEMPORARY_CAPACITY * TEMPORARY_CAPACITY_DEGRADE_RATE);
+        int differendInTemporaryCapacity = abs(DEFAULT_TEMPORARY_CAPACITY-INITIAL_TEMPORARY_CAPACITY);
+        int degreeOfChange = (int) max(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
         int expectedValue = max(DEFAULT_TEMPORARY_CAPACITY, INITIAL_TEMPORARY_CAPACITY - degreeOfChange);
 
         // Assert
         assertEquals(expectedValue, actualValue);
+        assertNotEquals(INITIAL_TEMPORARY_CAPACITY, actualValue);
     }
 
     @Test
@@ -107,6 +111,7 @@ void testDegradeTemporaryCapacity_DegradeDownTowardsDefault_ResultBelowDefault()
 
         // Assert
         assertEquals(expectedValue, actualValue);
+        assertNotEquals(INITIAL_TEMPORARY_CAPACITY, actualValue);
     }
 
     @Test
@@ -128,11 +133,13 @@ void testDegradeTemporaryCapacity_DegradeUpTowardsDefault() {
         // Act
         int actualValue = eventManager.degradeTemporaryCapacity();
 
-        int degreeOfChange = (int) round(INITIAL_TEMPORARY_CAPACITY * TEMPORARY_CAPACITY_DEGRADE_RATE);
+        int differendInTemporaryCapacity = abs(DEFAULT_TEMPORARY_CAPACITY-INITIAL_TEMPORARY_CAPACITY);
+        int degreeOfChange = (int) max(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
         int expectedValue = min(DEFAULT_TEMPORARY_CAPACITY, INITIAL_TEMPORARY_CAPACITY + degreeOfChange);
 
         // Assert
         assertEquals(expectedValue, actualValue);
+        assertNotEquals(INITIAL_TEMPORARY_CAPACITY, actualValue);
     }
 
     @Test
@@ -157,6 +164,7 @@ void testDegradeTemporaryCapacity_DegradeUpTowardsDefault_ResultAboveDefault() {
 
         // Assert
         assertEquals(expectedValue, actualValue);
+        assertNotEquals(INITIAL_TEMPORARY_CAPACITY, actualValue);
     }
 
     @Test