Nex integration and bugfixing (#29)

- Fix Nexerlin alliance state (commission check in Military Market).
- Fix game crash in ship damager when minDmods is equal maxDmods.

Author: jaghaimo

assets/mod_info.json

@@ -3,7 +3,7 @@
     "name": " Starpocalypse",
     "author": "Jaghaimo",
     "utility": true,
-    "version": "2.2.2",
+    "version": "2.2.3",
     "description": "More apocalyptic settings",
     "gameVersion": "0.95.1a-RC6",
     "modPlugin": "starpocalypse.StarpocalypseMod",

assets/starpocalypse.version

@@ -5,7 +5,7 @@
     "modVersion": {
         "major": 2,
         "minor": 2,
-        "patch": 2
+        "patch": 3
     },
-    "directDownloadURL": "https://github.com/jaghaimo/starpocalypse/releases/download/2.2.2/starpocalypse-2.2.2.zip"
+    "directDownloadURL": "https://github.com/jaghaimo/starpocalypse/releases/download/2.2.3/starpocalypse-2.2.3.zip"
 }

build.gradle

@@ -15,6 +15,15 @@ repositories {
             artifact()
         }
     }
+    ivy {
+        url 'https://github.com/'
+        patternLayout {
+            artifact '/[organization]/[module]/raw/master/jars/[revision]'
+        }
+        metadataSources {
+            artifact()
+        }
+    }
 }
 
 // project level config
@@ -40,6 +49,7 @@ build {
 // compile time dependencies
 dependencies {
     implementation "jaghaimo:starsector-api:[email protected]"
+    implementation "Histidine91:Nexerelin:ExerelinCore.jar"
 
     // game dependencies
     implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10'

src/starpocalypse/helper/CargoUtils.java

@@ -22,7 +22,7 @@ public static void damageShip(String location, FleetMemberAPI ship, int minDmods
         Random random = new Random();
         if (DModManager.setDHull(variant)) {
             log.info(location + ": Damaging " + hullName);
-            int numberOfDmods = random.nextInt(maxDmods - minDmods) + minDmods;
+            int numberOfDmods = getNumberOfDmods(random, minDmods, maxDmods);
             DModManager.addDMods(variant, true, numberOfDmods, random);
         }
     }
@@ -41,4 +41,12 @@ public static int getTier(CargoStackAPI stack) {
         }
         return tier;
     }
+
+    private static int getNumberOfDmods(Random random, int minDmods, int maxDmods) {
+        int numDmods = minDmods;
+        if (maxDmods > minDmods) {
+            numDmods += random.nextInt(maxDmods - minDmods);
+        }
+        return numDmods;
+    }
 }

src/starpocalypse/submarket/RegulatedMilitaryMarket.java

@@ -1,5 +1,6 @@
 package starpocalypse.submarket;
 
+import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CargoAPI;
 import com.fs.starfarer.api.campaign.CargoStackAPI;
 import com.fs.starfarer.api.campaign.FleetDataAPI;
@@ -8,6 +9,9 @@
 import com.fs.starfarer.api.campaign.econ.SubmarketAPI;
 import com.fs.starfarer.api.fleet.FleetMemberAPI;
 import com.fs.starfarer.api.impl.campaign.submarkets.MilitarySubmarketPlugin;
+import exerelin.campaign.AllianceManager;
+import exerelin.campaign.PlayerFactionStore;
+import exerelin.utilities.NexUtilsFaction;
 import lombok.extern.log4j.Log4j;
 import starpocalypse.config.SimpleMap;
 import starpocalypse.helper.CargoUtils;
@@ -65,6 +69,32 @@ public void updateCargoPrePlayerInteraction() {
         }
     }
 
+    @Override
+    protected boolean hasCommission() {
+        if (Global.getSettings().getModManager().isModEnabled("nexerelin")) {
+            return hasCommissionNex();
+        }
+        return super.hasCommission();
+    }
+
+    private boolean hasCommissionNex() {
+        String commissionFaction = NexUtilsFaction.getCommissionFactionId();
+        if (hasCommissionNex(commissionFaction)) {
+            return true;
+        }
+        if (hasCommissionNex(PlayerFactionStore.getPlayerFactionId())) {
+            return true;
+        }
+        return submarket.getFaction().getId().equals(commissionFaction);
+    }
+
+    private boolean hasCommissionNex(String factionId) {
+        if (factionId == null) {
+            return false;
+        }
+        return AllianceManager.areFactionsAllied(factionId, submarket.getFaction().getId());
+    }
+
     private boolean isStabilityLegal(SimpleMap stabilityMap, float baseValue) {
         if (!ConfigHelper.wantsRegulation(market.getFactionId())) {
             return false;

src/starpocalypse/submarket/ShipDamager.java

@@ -33,7 +33,7 @@ public void reportSubmarketCargoAndShipsUpdated(SubmarketAPI submarket) {
         apply(location, submarket.getCargo().getMothballedShips().getMembersListCopy());
     }
 
-    private static boolean canDamageShips(SubmarketAPI submarket) {
+    private boolean canDamageShips(SubmarketAPI submarket) {
         boolean hasSubmarket = ConfigHelper.getShipDamageSubmarket().has(submarket.getSpecId());
         boolean hasFaction = ConfigHelper.getShipDamageFaction().has(submarket.getMarket().getFactionId());
         return hasSubmarket && hasFaction;