More bugfixes (#28)

- Fix Black Market suspicion resetting at each dock.
- Fix incorrect Black Market description (was not matching its new behaviour).
- Fix illegal commodities (usually drugs and organs) always being legal on Open Market.
- Add missing HMI factions to reputation change blacklist (`mess` and `mess_remnants`).
- Add support for negation in legal list (`item` will be always legal and !item will be always illegal).
- New configuration: max tier and fleet points at which items and combat ships are considered legal.
- New feature: remove endgame ships (capitals) and cargo (tier3) from Military Markets.

Author: jaghaimo

README.md

@@ -8,15 +8,14 @@ This mod makes the following changes to the campaign layer of Starsector:
 1. Lawless factions (e.g. pirates and pathers) and independents do not submit to this rule of law. You can still find
    high tier weapons and combat ships at their bases (both core and raider).
 1. There are no pristine ships any more, everything is d-modded. Including your starting fleet.
-1. Contraband can happen, and when stability is low, some weapons and ships "disappear" from Military Market and
-   "magically" show up in the Black Market instead.
+1. Contraband can happen, and when stability is low, some weapons and ships from Military Market can become "legal".
 1. Access to most Black Markets is impossible while legally docked at the station. Speaking of access, you will need to
    use a fence who will ask for a cut (displayed as tariff for now).
 1. Factions are armed to the teeth. Any non-hidden market has at least an orbiting station, ground defences, and patrol
    HQ. Hidden bases (pirates and pathers raider bases) only get ground defences.
 1. Your actions have consequences. When defeating a fleet, your reputation with seemingly unrelated factions changes as
    well. Enemies of your enemy start to like you a bit, while their friends, less.
-1. Similarly, targetting a any colony item will be deemed as an act of war.
+1. Similarly, targetting any colony item will be deemed as an act of war.
 
 All changes are optional, and can be disabled via `starpocalypse.json`.
 
@@ -57,10 +56,10 @@ The list of raid-protected items (special item ids) is present in `raidProtector
 
 ### Submarket changes
 
-1. Remove larger combat ships (>5 FP), and high tier (>0) weapons, LPCs, and modspecs from open markets if it is not a
-   pirate or Luddic Path market.
+1. Remove combat ships, and high tier weapons, LPCs, and modspecs from open markets if it is not a pirate or Luddic
+   Path market.
 1. When the stability is low, some of the initially illegal items and ships on Military Market will become legal.
-1. Finally, damage all pristine ships by putting a random number of d-mods.
+1. Finally, damage all pristine ships by putting a random number of d-mods on them.
 
 Decision which factions have their Open Market regulated regulated is made via `militaryRegulationFaction.csv` file.
 Same submarkets and factions can additionally have contraband applied to their Military Market in

assets/data/campaign/submarkets.csv

@@ -4,13 +4,13 @@ Market",,"The open market. Only legal goods may be traded here, and transactions
 
 Selling enough of a commodity will temporarily resolve a shortage.",starpocalypse.submarket.RegulatedOpenMarket,,0
 black_market,"Black
-Market",pirates,"The black market. Anything and everything can be bought or sold, and there are no tariffs. More goods are available when stability is low.
+Market",pirates,"The black market. Anything and everything can be bought or sold. More goods are available when stability is low.
 
 Selling a commodity will not resolve a shortage.
 
-Black market transactions may catch the eye of authorities, resulting in cargo scans and reduced faction standing, unless the trades are carried out with the transponder turned off.
+Black market transactions will catch the eye of authorities, resulting in cargo scans and reduced faction standing.
 
-Engaging in legitimate trade as a ""cover"" also reduces the probability of attracting the attention of authorities.",starpocalypse.submarket.RegulatedBlackMarket,graphics/factions/black_market.png,999
+Engaging in legitimate trade as a ""cover"" reduces the probability of attracting the attention of authorities.",starpocalypse.submarket.RegulatedBlackMarket,graphics/factions/black_market.png,999
 generic_military,,,"Trade with $theFaction military base.
 
 Weapons and other military hardware can be bought and sold here even if they're illegal on the open market. A commission and better standing with $theFaction results in higher-grade hardware being available.

assets/data/starpocalypse/reputationBlacklist.csv

@@ -17,4 +17,6 @@ blade_breakers
 cabal
 domres
 hmi_nightmare
+mess
+mess_remnant
 plague

assets/mod_info.json

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

assets/starpocalypse.json

@@ -12,9 +12,15 @@
     ## MILITARY REGULATIONS
     # Buying or selling military wares Open Market is illegal unless you are commissioned with the owner of the market.
     # Uses same logic as Military market with the addition of:
-    # - Legal list is applied to make item or ship always legal,
+    # - Legal list is applied to make item or ship always legal (or illegal, if !negated),
     # - All civ-grade or civ-hint ships are always legal.
     "militaryRegulations": true,
+    # LPC, weapon, and modspec tier and combat ship FP at which they are still legal.
+    "regulationMaxLegalTier": 0, # easy mode: 1
+    "regulationMaxLegalFP": 0, # easy mode: 5
+    # Remove endgame ships (all capitals) and items (tier3 LPC, modspecs, and weapons) from Military Markets.
+    "removeMilitaryEndgameCargo": true,
+    "removeMilitaryEndgameShips": true,
     # Suspicion level will grow even with transponder off. It is still useful to sell illegal wares.
     "transparentMarket": true,
     # Setting this to 0 essentially disabled the feature. Setting this to 1 makes it behave as if the transponder was on

assets/starpocalypse.version

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

src/starpocalypse/StarpocalypseMod.java

@@ -2,13 +2,14 @@
 
 import com.fs.starfarer.api.BaseModPlugin;
 import com.fs.starfarer.api.Global;
+import com.fs.starfarer.api.campaign.CampaignUIAPI;
 import com.fs.starfarer.api.fleet.FleetMemberAPI;
 import com.fs.starfarer.api.impl.campaign.ids.Industries;
 import com.fs.starfarer.api.impl.campaign.shared.SharedData;
 import java.util.List;
 import lombok.extern.log4j.Log4j;
 import org.json.JSONObject;
-import starpocalypse.helper.ConfigUtils;
+import starpocalypse.helper.ConfigHelper;
 import starpocalypse.market.IndustryAdder;
 import starpocalypse.market.MarketListener;
 import starpocalypse.market.StationAdder;
@@ -25,7 +26,7 @@ public class StarpocalypseMod extends BaseModPlugin {
     @Override
     public void onApplicationLoad() throws Exception {
         settings = Global.getSettings().loadJSON("starpocalypse.json");
-        ConfigUtils.init(settings, log);
+        ConfigHelper.init(settings, log);
     }
 
     @Override
@@ -46,17 +47,9 @@ public void onGameLoad(boolean newGame) {
 
     @Override
     public void afterGameSave() {
-        JSONObject globalSettings = Global.getSettings().getSettingsJSON();
-        if (!globalSettings.optBoolean("hasStarpocalypse", false)) {
+        if (ConfigHelper.isUninstall()) {
             SharedData.getData().getPlayerActivityTracker().advance(0);
-            Global
-                .getSector()
-                .getCampaignUI()
-                .showMessageDialog(
-                    "Starpocalypse has been removed from this save. You can now quit the game and disable this mod." +
-                    "\n\nThank you for playing with Starpocalypse. I hope you had a bad day." +
-                    "\n\nYours, Jaghaimo."
-                );
+            showUninstalledDialog();
         }
     }
 
@@ -134,4 +127,16 @@ private void militaryRegulations() {
             SubmarketSwapper.register();
         }
     }
+
+    private void showUninstalledDialog() {
+        CampaignUIAPI campaignUi = Global.getSector().getCampaignUI();
+        if (campaignUi == null) {
+            return;
+        }
+        campaignUi.showMessageDialog(
+            "Starpocalypse has been removed from this save. You can now quit the game and disable this mod." +
+            "\n\nThank you for playing with Starpocalypse. I hope you had a bad day." +
+            "\n\nYours, Jaghaimo."
+        );
+    }
 }

src/starpocalypse/config/SimpleSet.java

@@ -27,15 +27,23 @@ public boolean has(String value) {
         if (set.contains(value)) {
             return true;
         }
-        if (set.contains(NOT + value)) {
+        if (hasNot(value)) {
             return false;
         }
-        if (set.contains(ALL)) {
+        if (hasAll()) {
             return true;
         }
         return false;
     }
 
+    public boolean hasAll() {
+        return set.contains(ALL);
+    }
+
+    public boolean hasNot(String value) {
+        return set.contains(NOT + value);
+    }
+
     @Override
     protected void loadData(String column, String file) throws JSONException, IOException {
         JSONArray data = readCsv(column, file);

src/starpocalypse/helper/CargoUtils.java

@@ -0,0 +1,44 @@
+package starpocalypse.helper;
+
+import com.fs.starfarer.api.campaign.CargoStackAPI;
+import com.fs.starfarer.api.combat.ShipVariantAPI;
+import com.fs.starfarer.api.fleet.FleetMemberAPI;
+import com.fs.starfarer.api.impl.campaign.DModManager;
+import com.fs.starfarer.api.loading.FighterWingSpecAPI;
+import com.fs.starfarer.api.loading.HullModSpecAPI;
+import com.fs.starfarer.api.loading.WeaponSpecAPI;
+import java.util.Random;
+import lombok.extern.log4j.Log4j;
+
+/**
+ * Cargo as defined by Starsector - cargo stacks and mothballed fleet
+ */
+@Log4j
+public class CargoUtils {
+
+    public static void damageShip(String location, FleetMemberAPI ship, int minDmods, int maxDmods) {
+        String hullName = ship.getHullSpec().getHullName();
+        ShipVariantAPI variant = ship.getVariant();
+        Random random = new Random();
+        if (DModManager.setDHull(variant)) {
+            log.info(location + ": Damaging " + hullName);
+            int numberOfDmods = random.nextInt(maxDmods - minDmods) + minDmods;
+            DModManager.addDMods(variant, true, numberOfDmods, random);
+        }
+    }
+
+    public static int getTier(CargoStackAPI stack) {
+        int tier = 0;
+        if (stack.isWeaponStack()) {
+            WeaponSpecAPI spec = stack.getWeaponSpecIfWeapon();
+            tier = spec.getTier();
+        } else if (stack.isModSpecStack()) {
+            HullModSpecAPI spec = stack.getHullModSpecIfHullMod();
+            tier = spec.getTier();
+        } else if (stack.isFighterWingStack()) {
+            FighterWingSpecAPI spec = stack.getFighterWingSpecIfWing();
+            tier = spec.getTier();
+        }
+        return tier;
+    }
+}

src/starpocalypse/helper/ConfigUtils.java …c/starpocalypse/helper/ConfigHelper.javasrc/starpocalypse/helper/ConfigUtils.java renamed to src/starpocalypse/helper/ConfigHelper.java src/starpocalypse/helper/ConfigUtils.java renamed to src/starpocalypse/helper/ConfigHelper.java

@@ -7,7 +7,7 @@
 import starpocalypse.config.SimpleMap;
 import starpocalypse.config.SimpleSet;
 
-public class ConfigUtils {
+public class ConfigHelper {
 
     @Getter
     private static float blackMarketFenceCut = 0.5f;
@@ -20,6 +20,12 @@ public class ConfigUtils {
 
     private static boolean regulation = true;
 
+    @Getter
+    private static float regulationMaxTier = 0;
+
+    @Getter
+    private static float regulationMaxFP = 0;
+
     private static final SimpleSet regulationFaction = new SimpleSet("faction", "militaryRegulationFaction.csv");
 
     @Getter
@@ -39,6 +45,12 @@ public class ConfigUtils {
         "militaryRegulationStability.csv"
     );
 
+    @Getter
+    private static boolean removeEndgameCargo = true;
+
+    @Getter
+    private static boolean removeEndgameShips = true;
+
     @Getter
     private static boolean shyBlackMarket = false;
 
@@ -56,6 +68,11 @@ public static void init(JSONObject settings, Logger log) {
         transparentMarket(settings, log);
     }
 
+    public static boolean isUninstall() {
+        JSONObject settings = Global.getSettings().getSettingsJSON();
+        return !settings.optBoolean("hasStarpocalypse", false);
+    }
+
     public static boolean wantsRegulation(String factionId) {
         return regulation && regulationFaction.has(factionId);
     }
@@ -72,7 +89,11 @@ private static void loadConfig(JSONObject settings) {
         minDmods = clamp(settings.optInt("minimumDmods", 2), 1, 5);
         maxDmods = clamp(settings.optInt("maximumDmods", 4), minDmods, 5);
         regulation = settings.optBoolean("militaryRegulations", true);
-        shyBlackMarket = settings.optBoolean("shyBlackMarket", false);
+        regulationMaxFP = settings.optInt("regulationMaxLegalFP", 0);
+        regulationMaxTier = settings.optInt("regulationMaxLegalTier", 0);
+        removeEndgameCargo = settings.optBoolean("removeMilitaryEndgameCargo", true);
+        removeEndgameShips = settings.optBoolean("removeMilitaryEndgameShips", true);
+        shyBlackMarket = settings.optBoolean("shyBlackMarket", true);
     }
 
     private static void transparentMarket(JSONObject settings, Logger log) {