Update src/ to 0.97a-RC11

jaghaimo · Feb 23, 2024 · f1f911e · f1f911e
1 parent e6ada24
commit f1f911e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/com/fs/starfarer/api/impl/campaign/econ/LuddicMajority.java b/src/com/fs/starfarer/api/impl/campaign/econ/LuddicMajority.java
@@ -138,7 +138,7 @@ protected void createTooltipAfterDescription(TooltipMakerAPI tooltip, boolean ex
 	}
 
 	public static void addConditions(TooltipMakerAPI tooltip, MarketAPI market, float opad) {
-		boolean madeDeal = LuddicChurchHostileActivityFactor.isMadeDeal();
+		boolean madeDeal = LuddicChurchHostileActivityFactor.isMadeDeal() && market.isPlayerOwned();
 		boolean freePort = market.isFreePort();
 		freePort = false;
 		boolean habitable = market.hasCondition(Conditions.HABITABLE);

diff --git a/src/com/fs/starfarer/api/impl/campaign/intel/events/HostileActivityEventIntel.java b/src/com/fs/starfarer/api/impl/campaign/intel/events/HostileActivityEventIntel.java
@@ -115,7 +115,7 @@ protected void setup() {
 		factors.clear();
 		stages.clear();
 
-		setMaxProgress(600);
+		setMaxProgress(MAX_PROGRESS);
 		addStage(Stage.START, 0);
 		addStage(Stage.MINOR_EVENT, 300, StageIconSize.MEDIUM);
 		addStage(Stage.HA_EVENT, 600, true, StageIconSize.LARGE);

diff --git a/src/com/fs/starfarer/api/impl/campaign/intel/events/SindrianDiktatHostileActivityFactor.java b/src/com/fs/starfarer/api/impl/campaign/intel/events/SindrianDiktatHostileActivityFactor.java
@@ -147,10 +147,11 @@ public CampaignFleetAPI createFleet(StarSystemAPI system, Random random) {
 		m.triggerSetPirateFleet();
 		m.triggerMakeHostile();
 		m.triggerMakeNonHostileToFaction(Factions.DIKTAT);
-		m.triggerMakeHostileToAllTradeFleets();
 		m.triggerMakeNonHostileToFaction(Factions.PIRATES);
 		m.triggerMakeLowRepImpact();
 		m.triggerFleetAllowLongPursuit();
+		m.triggerMakeHostileToAllTradeFleets();
+		m.triggerMakeEveryoneJoinBattleAgainst();
 
 		m.triggerSetFleetFlag(RAIDER_FLEET);
 

diff --git a/src/com/fs/starfarer/api/impl/campaign/intel/events/ht/HyperspaceTopographyEventIntel.java b/src/com/fs/starfarer/api/impl/campaign/intel/events/ht/HyperspaceTopographyEventIntel.java
@@ -611,7 +611,10 @@ public float gerSensorArrayBonusFor(MarketAPI market, float range) {
 		}
 
 		float bonus = Math.min(countDomain, MAX_SENSOR_ARRAYS) * RANGE_PER_DOMAIN_SENSOR_ARRAY;
-		bonus += Math.min(Math.max(0, countMakeshift - countDomain), MAX_SENSOR_ARRAYS) * RANGE_PER_MAKESHIFT_SENSOR_ARRAY;
+		float useMakeshift = Math.min(MAX_SENSOR_ARRAYS - countDomain, countMakeshift);
+		if (useMakeshift < 0) useMakeshift = 0;
+		bonus += useMakeshift * RANGE_PER_MAKESHIFT_SENSOR_ARRAY;
+		//bonus += Math.min(Math.max(0, countMakeshift - countDomain), MAX_SENSOR_ARRAYS) * RANGE_PER_MAKESHIFT_SENSOR_ARRAY;
 
 		return bonus;
 	}

diff --git a/src/com/fs/starfarer/api/impl/campaign/procgen/themes/MiscellaneousThemeGenerator.java b/src/com/fs/starfarer/api/impl/campaign/procgen/themes/MiscellaneousThemeGenerator.java
@@ -1256,7 +1256,7 @@ protected void addLOCRMinersPlanet(ThemeGenContext context) {
 					if (curr.getMarket().hasCondition(Conditions.WATER_SURFACE)) continue; // don't want to write around this.
 					if (curr.isGasGiant()) continue;
 					if (!( curr.getMarket().hasCondition(Conditions.VOLATILES_PLENTIFUL) || 
-							curr.getMarket().hasCondition(Conditions.ORGANICS_ABUNDANT) ||
+							curr.getMarket().hasCondition(Conditions.ORGANICS_PLENTIFUL) ||
 							curr.getMarket().hasCondition(Conditions.RARE_ORE_ULTRARICH) ) ) continue;	
 					//		curr.getMarket().hasCondition(Conditions.ORE_ULTRARICH) ) ) continue;