From 7be4df6edace48a0471a83ed59880ae3d3ad33c6 Mon Sep 17 00:00:00 2001 From: The Cecil Date: Thu, 9 Sep 2021 23:22:18 -0400 Subject: [PATCH] Cleanup --- .idea/workspace.xml | 43 ++++++++---------- jars/StarSectorIndustry.jar | Bin 32330 -> 34639 bytes .../econ/impl/AuthoritarianRegime.java | 2 +- .../github/alycecil/econ/impl/ChopShop.java | 2 +- .../alycecil/econ/impl/PoliceState.java | 2 +- .../econ/impl/common/PollutingIndustry.java | 11 ++--- .../impl/common/PopulationAwareExtension.java | 8 +++- .../common/SupportInfraGrowsPopulation.java | 4 +- .../econ/model/QuantityCommodityChange.java | 2 +- .../alycecil/econ/util/AliceCommon.java | 7 +++ 10 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 src/main/java/com/github/alycecil/econ/util/AliceCommon.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f82e16c..01c0c21 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,35 +1,17 @@ - - - - - + + + - - - - - - - - - - - - - - - - @@ -131,6 +123,7 @@ - \ No newline at end of file diff --git a/jars/StarSectorIndustry.jar b/jars/StarSectorIndustry.jar index 2269eb128065b83964a98876c0393b0e19f0a4a7..319f1cb6098a9e04a1e0b469cea7a107fe87ebc3 100644 GIT binary patch delta 27712 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 delta 25549 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 Wf*(ZjJzxef1H|F{+fz6k0Qi3dG=cp9 diff --git a/src/main/java/com/github/alycecil/econ/impl/AuthoritarianRegime.java b/src/main/java/com/github/alycecil/econ/impl/AuthoritarianRegime.java index c9bed04..7d939db 100644 --- a/src/main/java/com/github/alycecil/econ/impl/AuthoritarianRegime.java +++ b/src/main/java/com/github/alycecil/econ/impl/AuthoritarianRegime.java @@ -7,7 +7,7 @@ //TODO ALERT FACTIONS LUDDIC_*, HEGEMONY, and the League on trade or advance. Quickly causing war. public class AuthoritarianRegime extends SupportInfraGrowsPopulation { - public static final String CRIMES_AGAINST_HUMANITY = "Crimes against humanity."; + public static final String CRIMES_AGAINST_HUMANITY = "Crimes against humanity"; public AuthoritarianRegime() { super(-0.05f, diff --git a/src/main/java/com/github/alycecil/econ/impl/ChopShop.java b/src/main/java/com/github/alycecil/econ/impl/ChopShop.java index eaab9ee..3a80a24 100644 --- a/src/main/java/com/github/alycecil/econ/impl/ChopShop.java +++ b/src/main/java/com/github/alycecil/econ/impl/ChopShop.java @@ -9,7 +9,7 @@ //TODO ALERT FACTIONS LUDDIC_*, HEGEMONY, and the League on trade or advance. Slowly causing war. public class ChopShop extends AddsMarket { - public static final String CRIMES_AGAINST_HUMANITY = "Organ Harvesting."; + public static final String CRIMES_AGAINST_HUMANITY = "Organ Harvesting"; public ChopShop() { super(-0.05f, diff --git a/src/main/java/com/github/alycecil/econ/impl/PoliceState.java b/src/main/java/com/github/alycecil/econ/impl/PoliceState.java index e6f5842..236691a 100644 --- a/src/main/java/com/github/alycecil/econ/impl/PoliceState.java +++ b/src/main/java/com/github/alycecil/econ/impl/PoliceState.java @@ -7,7 +7,7 @@ //TODO ALERT FACTIONS LUDDIC_*, HEGEMONY, and the League on trade or advance. Quickly causing war. public class PoliceState extends SupportInfraGrowsPopulation { - public static final String CRIMES_AGAINST_HUMANITY = "Police state."; + public static final String CRIMES_AGAINST_HUMANITY = "Police state"; public PoliceState() { super(-0.05f, diff --git a/src/main/java/com/github/alycecil/econ/impl/common/PollutingIndustry.java b/src/main/java/com/github/alycecil/econ/impl/common/PollutingIndustry.java index 8bb8f4c..ae4442b 100644 --- a/src/main/java/com/github/alycecil/econ/impl/common/PollutingIndustry.java +++ b/src/main/java/com/github/alycecil/econ/impl/common/PollutingIndustry.java @@ -5,8 +5,7 @@ import com.fs.starfarer.api.ui.TooltipMakerAPI; import com.fs.starfarer.api.util.Misc; import com.github.alycecil.econ.model.IndustryEffect; - -import java.awt.*; +import com.github.alycecil.econ.util.AliceCommon; public abstract class PollutingIndustry extends PopulationAwareExtension { @@ -14,8 +13,6 @@ public abstract class PollutingIndustry extends PopulationAwareExtension { public static float DAYS_BEFORE_POLLUTION = 90f; public static float DAYS_BEFORE_POLLUTION_PERMANENT = 360f; - public static final Color WARNING = Color.YELLOW.darker(); - public PollutingIndustry(IndustryEffect... bonuses) { super(bonuses); } @@ -74,13 +71,13 @@ protected void updatePollutionStatus(boolean add) { protected void addPostSupplySection(TooltipMakerAPI tooltip, boolean hasSupply, IndustryTooltipMode mode) { super.addPostSupplySection(tooltip, hasSupply, mode); if (addedPollution && permaPollution) { - tooltip.addPara("The pollution caused by this industry is %s.", 10f, WARNING, Misc.getHighlightColor(), "PERMANENT"); + tooltip.addPara("The pollution caused by this industry is %s.", 10f, AliceCommon.WARNING, Misc.getHighlightColor(), "PERMANENT"); } else if (addedPollution || market.hasCondition(POLLUTION_ID)) { String daysLeft = String.valueOf(Math.max(0, DAYS_BEFORE_POLLUTION_PERMANENT - daysWithPolluter)); - tooltip.addPara("There are %s days left before the pollution becomes permanent, from this source.", 10f, WARNING, Misc.getHighlightColor(), daysLeft); + tooltip.addPara("There are %s days left before the pollution becomes permanent, from this source.", 10f, AliceCommon.WARNING, Misc.getHighlightColor(), daysLeft); } else if (!market.hasCondition(POLLUTION_ID)) { String daysLeft = String.valueOf(Math.max(0, DAYS_BEFORE_POLLUTION - daysWithPolluter)); - tooltip.addPara("There are %s days left before the pollution becomes a colony issue, from this source.", 10f, WARNING, Misc.getHighlightColor(), daysLeft); + tooltip.addPara("There are %s days left before the pollution becomes a colony issue, from this source.", 10f, AliceCommon.WARNING, Misc.getHighlightColor(), daysLeft); } } diff --git a/src/main/java/com/github/alycecil/econ/impl/common/PopulationAwareExtension.java b/src/main/java/com/github/alycecil/econ/impl/common/PopulationAwareExtension.java index 24d0699..58e7748 100644 --- a/src/main/java/com/github/alycecil/econ/impl/common/PopulationAwareExtension.java +++ b/src/main/java/com/github/alycecil/econ/impl/common/PopulationAwareExtension.java @@ -4,6 +4,8 @@ import com.fs.starfarer.api.ui.TooltipMakerAPI; import com.github.alycecil.econ.model.IndustryEffect; +import java.awt.*; + public abstract class PopulationAwareExtension extends IndustryExtension implements MarketImmigrationModifier { public PopulationAwareExtension(IndustryEffect... bonuses) { super(bonuses); @@ -20,7 +22,9 @@ public void unapply() { } @Override - protected void addPostUpkeepSection(TooltipMakerAPI tooltip, IndustryTooltipMode mode) { - tooltip.addPara("Population Breakdown:\n"+market.getPopulation().toString(), 10f); + protected void addPostSupplySection(TooltipMakerAPI tooltip, boolean hasSupply, IndustryTooltipMode mode) { + super.addPostSupplySection(tooltip, hasSupply, mode); + + tooltip.addPara("Population Breakdown:\n"+market.getPopulation().toString(), Color.lightGray, 10f); } } diff --git a/src/main/java/com/github/alycecil/econ/impl/common/SupportInfraGrowsPopulation.java b/src/main/java/com/github/alycecil/econ/impl/common/SupportInfraGrowsPopulation.java index 76cf542..7ce74c4 100644 --- a/src/main/java/com/github/alycecil/econ/impl/common/SupportInfraGrowsPopulation.java +++ b/src/main/java/com/github/alycecil/econ/impl/common/SupportInfraGrowsPopulation.java @@ -5,13 +5,13 @@ import com.fs.starfarer.api.ui.TooltipMakerAPI; import com.fs.starfarer.api.util.Misc; import com.github.alycecil.econ.model.IndustryEffect; +import com.github.alycecil.econ.util.AliceCommon; import com.github.alycecil.econ.util.Incoming; import java.awt.*; public abstract class SupportInfraGrowsPopulation extends SupportInfrastructure { - public static final Color COLOR = Color.YELLOW.darker(); public SupportInfraGrowsPopulation(float perMarketSize, IndustryEffect... bonuses) { super(perMarketSize, bonuses); @@ -31,7 +31,7 @@ protected void addPostSupplySection(TooltipMakerAPI tooltip, boolean hasSupply, if (value > 0.01f) { tooltip.addPara("Increasing growth rate by %s.", 10f, Misc.getHighlightColor(), String.valueOf(value)); } else if (value < -0.01f) { - tooltip.addPara("Decreasing growth rate by %s.", 10f, COLOR, Misc.getNegativeHighlightColor(), String.valueOf(value)); + tooltip.addPara("Decreasing growth rate by %s.", 10f, AliceCommon.WARNING, Misc.getNegativeHighlightColor(), String.valueOf(value)); } } } diff --git a/src/main/java/com/github/alycecil/econ/model/QuantityCommodityChange.java b/src/main/java/com/github/alycecil/econ/model/QuantityCommodityChange.java index 341b3e0..51bca2d 100644 --- a/src/main/java/com/github/alycecil/econ/model/QuantityCommodityChange.java +++ b/src/main/java/com/github/alycecil/econ/model/QuantityCommodityChange.java @@ -16,7 +16,7 @@ public QuantityCommodityChange(String commodityId, String desc) { @Override public void apply(Industry industry, String modId, float mult) { if (industry == null) return; - String desc = this.desc + industry.getNameForModifier(); + String desc = this.desc +" for "+ industry.getNameForModifier(); MutableCommodityQuantity modifier = getModifier(industry); if (modifier == null) return; MutableStat quantityStat = modifier.getQuantity(); diff --git a/src/main/java/com/github/alycecil/econ/util/AliceCommon.java b/src/main/java/com/github/alycecil/econ/util/AliceCommon.java new file mode 100644 index 0000000..7f40490 --- /dev/null +++ b/src/main/java/com/github/alycecil/econ/util/AliceCommon.java @@ -0,0 +1,7 @@ +package com.github.alycecil.econ.util; + +import java.awt.*; + +public class AliceCommon { + public static final Color WARNING = Color.YELLOW.darker(); +}