Merge branch 'master' of https://github.com/ThomasRahm/starpocalypse

Author: ThomasRahm

assets/starpocalypse.json

@@ -83,7 +83,8 @@
     # Black Market handling fee (bribe) as a fraction of the Open Market tariff. If tariff is 30%, Black Market bribe will be 15%.
     "blackMarketFenceCut": 0.5,# vanilla: 0
     # Black market access requires a pirate contact at that location.
-    "blackMarketRequiresContact": true, # vanilla: false If Nexerelin is present: No contact will be required if the planet is in rebellion. Restrictions below will still apply though.
+    "blackMarketRequiresContact": true, # vanilla: false If Nexerelin is present: No contact will be required if the planet is in rebellion.
+    "blackMarketGoodStuffRequiresContact": true, # vanilla: false Accessing black market can be done but good stuff is sold by contacts as below.
     # Not every contact can get you the good stuff. At least this importance is required of the blackMarket contact to enable you buying this
     # 0: No Contact required
     # 1: Very Low

src/starpocalypse/helper/ConfigHelper.java

@@ -58,6 +58,9 @@ public class ConfigHelper {
     @Getter
     private static boolean blackMarketRequiresContact = false;
 
+    @Getter
+    private static boolean blackMarketGoodStuffRequiresContact = false;
+
     @Getter
     private static int blackMarketWeaponT0 = 0;
 
@@ -275,6 +278,7 @@ private static void loadConfig(JSONObject settings) {
         regulationMaxTier = settings.optInt("regulationMaxLegalTier", 0);
         shyBlackMarket = settings.optBoolean("shyBlackMarket", true);
         blackMarketRequiresContact = settings.optBoolean("blackMarketRequiresContact", true);
+        blackMarketGoodStuffRequiresContact = settings.optBoolean("blackMarketGoodStuffRequiresContact", true);
 
         blackMarketWeaponT0 = settings.optInt("blackMarketWeaponT0", 0);
         blackMarketWeaponT1 = settings.optInt("blackMarketWeaponT1", 0);

src/starpocalypse/submarket/RegulatedBlackMarket.java

@@ -145,7 +145,7 @@ public boolean isIllegalOnSubmarket(CargoStackAPI stack, TransferAction action)
             return false;
         }
 
-        if(ConfigHelper.isBlackMarketRequiresContact())
+        if(ConfigHelper.isBlackMarketGoodStuffRequiresContact())
         {
             return bestContactLevel < getContactLevelFor(stack);
         }
@@ -203,7 +203,7 @@ public boolean isIllegalOnSubmarket(FleetMemberAPI member, TransferAction action
             return false;
         }
 
-        if(ConfigHelper.isBlackMarketRequiresContact())
+        if(ConfigHelper.isBlackMarketGoodStuffRequiresContact())
         {
             return bestContactLevel < getContactLevelFor(member);
         }
@@ -239,7 +239,7 @@ else if(member.isCapital())
     public void updateCargoPrePlayerInteraction()
     {
         super.updateCargoPrePlayerInteraction();
-        if(ConfigHelper.isBlackMarketRequiresContact())
+        if(ConfigHelper.isBlackMarketGoodStuffRequiresContact())
         {
             getBestContact();
         }