ok we're here

nikothedude · Jul 11, 2024 · 4e0afb0 · 4e0afb0
1 parent dd56a49
commit 4e0afb0
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 13 deletions.
diff --git a/More Planetary Conditions.7z b/More Planetary Conditions.7z
diff --git a/changelog.txt b/changelog.txt
@@ -1,11 +1,12 @@
-3.3.4:
+3.4.0:
 SAVE COMPATIBLE
 
 Overgrown Nanoforge
     Clarified that overgrown nanoforges give a very powerful item when culled
     Added a button to the core UI that toggles the built-in commodity weighting
         TLDR is that supply adjustments previously had a super high chance of picking a commodity the nanoforge already produces
         Now you can toggle it
+    Can now generate with indevo's ship components
 
 Ultra-Magnetic fields
     Fixed a bug where ultra-magnetic fields would have null names (and cause crashes)

diff --git a/jars/niko_morePlanetaryConditions.jar b/jars/niko_morePlanetaryConditions.jar
diff --git a/mod_info.json b/mod_info.json
@@ -3,7 +3,7 @@
 	"name":"More Planetary Conditions", # Displayed to the player
 	"author":"Niko",
     "utility":"false",
-	"version":"3.3.4BETAc",
+	"version":"3.4.0",
 	"description":"Adds a bunch of misc. planetary conditions to the game, many, if not most, with custom scripted effects that go beyond what most other conditions, vanilla or modded, do.",
     "gameVersion": "0.97a-RC11",
   	"jars":["jars/niko_morePlanetaryConditions.jar"],

diff --git a/niko_MPC.version b/niko_MPC.version
@@ -31,7 +31,7 @@
     "modVersion":
     {
         "major":3,
-        "minor":3,
-        "patch":4 # Can be a number, character or string (1, 2, a, b, "-RC2", etc)
+        "minor":4,
+        "patch":0 # Can be a number, character or string (1, 2, a, b, "-RC2", etc)
     },
 }
diff --git a/src/data/niko_MPC_modPlugin.kt b/src/data/niko_MPC_modPlugin.kt
@@ -33,6 +33,7 @@ import data.scripts.campaign.econ.conditions.defenseSatellite.handlers.niko_MPC_
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.handler.overgrownNanoforgeJunkHandler
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.industries.overgrownNanoforgeOptionsProvider
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.listeners.overgrownNanoforgeDiscoveryListener
+import data.scripts.campaign.econ.conditions.overgrownNanoforge.overgrownNanoforgeCommodityDataStore
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.sources.effects.effectTypes.spawnFleet.overgrownNanoforgeSpawnFleetScript
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.sources.effects.overgrownNanoforgeEffectPrototypes
 import data.scripts.campaign.econ.conditions.terrain.hyperspace.niko_MPC_realspaceHyperspace
@@ -91,6 +92,10 @@ class niko_MPC_modPlugin : BaseModPlugin() {
     @Throws(RuntimeException::class)
     override fun onApplicationLoad() {
         val isLazyLibEnabled = Global.getSettings().modManager.isModEnabled("lw_lazylib")
+        niko_MPC_settings.MCTE_loaded = Global.getSettings().modManager.isModEnabled("niko_moreCombatTerrainEffects")
+        niko_MPC_settings.indEvoEnabled = Global.getSettings().modManager.isModEnabled("IndEvo")
+        AOTD_vaultsEnabled = Global.getSettings().modManager.isModEnabled("aotd_vok")
+        nexLoaded = Global.getSettings().modManager.isModEnabled("nexerelin")
         if (!isLazyLibEnabled) {
             throw RuntimeException("LazyLib is required for more planetary conditions!")
         }
@@ -108,11 +113,6 @@ class niko_MPC_modPlugin : BaseModPlugin() {
             use unused aurorae2 t exture in graphics/planets to make a tachyon field that makes you go fast around stars? \n\
             investigaet dark nebula in graphics/fx. good terrain sprite"
         )*/
-
-        niko_MPC_settings.MCTE_loaded = Global.getSettings().modManager.isModEnabled("niko_moreCombatTerrainEffects")
-        niko_MPC_settings.indEvoEnabled = Global.getSettings().modManager.isModEnabled("IndEvo")
-        AOTD_vaultsEnabled = Global.getSettings().modManager.isModEnabled("aotd_vok")
-        nexLoaded = Global.getSettings().modManager.isModEnabled("nexerelin")
     }
 
     val overgrownNanoforgeItemInstance = overgrownNanoforgeItemEffect(overgrownNanoforgeItemId, 0, 0)

diff --git a/...onditions/overgrownNanoforge/intel/plugins/overgrownNanoforgeIndustryManipulationIntel.kt b/...onditions/overgrownNanoforge/intel/plugins/overgrownNanoforgeIndustryManipulationIntel.kt
@@ -13,6 +13,7 @@ import data.scripts.campaign.econ.conditions.overgrownNanoforge.intel.overgrownN
 import data.scripts.campaign.intel.baseNikoEventStageInterface
 import data.utilities.niko_MPC_settings
 import lunalib.lunaExtensions.addLunaToggleButton
+import lunalib.lunaUI.elements.LunaProgressBar
 
 class overgrownNanoforgeIndustryManipulationIntel(
     brain: overgrownNanoforgeSpreadingBrain,
@@ -49,6 +50,12 @@ class overgrownNanoforgeIndustryManipulationIntel(
     override fun addMiddleDescriptionText(info: TooltipMakerAPI, width: Float, stageId: Any?) {
         super.addMiddleDescriptionText(info, width, stageId)
         val overallSuppressionMeter = overallManipulationMeter?.get() ?: return
+        if (playerCanManipulateGrowth()) {
+            addFocusButton(info, overallSuppressionMeter)
+        }
+    }
+
+    fun addFocusButton(info: TooltipMakerAPI, overallSuppressionMeter: LunaProgressBar) {
         val focusButton = info.addLunaToggleButton(ourHandler.focusingOnExistingCommodities, 100f, overallSuppressionMeter.height)
         focusButton.position.rightOfMid(overallSuppressionMeter.elementPanel, 5f)
         focusButton.onInput { ourHandler.focusingOnExistingCommodities = focusButton.value }

diff --git a/...ripts/campaign/econ/conditions/overgrownNanoforge/overgrownNanoforgeCommodityDataStore.kt b/...ripts/campaign/econ/conditions/overgrownNanoforge/overgrownNanoforgeCommodityDataStore.kt
@@ -3,6 +3,7 @@ package data.scripts.campaign.econ.conditions.overgrownNanoforge
 import com.fs.starfarer.api.impl.campaign.ids.Commodities
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.handler.overgrownNanoforgeHandler
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.handler.overgrownNanoforgeIndustryHandler
+import data.utilities.niko_MPC_settings
 import data.utilities.niko_MPC_settings.OVERGROWN_NANOFORGE_ALREADY_PRODUCING_COMMODITY_WEIGHT_MULT
 
 
@@ -31,10 +32,11 @@ object overgrownNanoforgeCommodityDataStore: HashMap<String, overgrownNanoforgeC
 
     val organicsData = overgrownNanoforgeCommoditySetupData(Commodities.ORGANICS, 12f, 10f, hashMapOf(Pair(Commodities.HEAVY_MACHINERY, 0.35f)))
     val volatilesData = overgrownNanoforgeCommoditySetupData(Commodities.VOLATILES, 17f,8f,  hashMapOf(Pair(Commodities.HEAVY_MACHINERY, 0.5f)))
-    init {
-        reload()
-    }
+
+    val shipComponentsData = overgrownNanoforgeCommoditySetupData("IndEvo_parts", 40f, 5f, hashMapOf(Pair(Commodities.ORE, 0.8f), Pair(Commodities.HEAVY_MACHINERY, 0.1f)))
+
     fun reload() {
+        this.clear()
         this[Commodities.SUPPLIES] = supplyData
         this[Commodities.METALS] = metalData
         this[Commodities.RARE_METALS] = rareMetalData
@@ -51,6 +53,10 @@ object overgrownNanoforgeCommodityDataStore: HashMap<String, overgrownNanoforgeC
         this[Commodities.RARE_ORE] = rareOreData
         this[Commodities.VOLATILES] = volatilesData
         this[Commodities.ORGANICS] = organicsData
+
+        if (niko_MPC_settings.indEvoEnabled) {
+            this["IndEvo_parts"] = shipComponentsData
+        }
     }
 
     fun getWeightForCommodity(commodityId: String, nanoforge: overgrownNanoforgeHandler, negative: Boolean = false): Float {

diff --git a/src/data/scripts/campaign/econ/conditions/terrain/magfield/niko_MPC_hyperMagneticField.kt b/src/data/scripts/campaign/econ/conditions/terrain/magfield/niko_MPC_hyperMagneticField.kt
@@ -16,6 +16,7 @@ import com.fs.starfarer.api.impl.campaign.procgen.StarSystemGenerator
 import com.fs.starfarer.api.impl.campaign.terrain.MagneticFieldTerrainPlugin
 import com.fs.starfarer.api.ui.TooltipMakerAPI
 import com.fs.starfarer.api.util.Misc
+import data.niko_MPC_modPlugin
 import data.scripts.campaign.econ.conditions.hasDeletionScript
 import data.scripts.campaign.econ.conditions.niko_MPC_baseNikoCondition
 import data.scripts.everyFrames.deletionScript

diff --git a/src/data/utilities/niko_MPC_marketUtils.kt b/src/data/utilities/niko_MPC_marketUtils.kt
@@ -35,7 +35,7 @@ object niko_MPC_marketUtils {
 
     val commodities = hashSetOf(Commodities.FUEL, Commodities.DRUGS, Commodities.FOOD, Commodities.DOMESTIC_GOODS,
     Commodities.HEAVY_MACHINERY, Commodities.HAND_WEAPONS, Commodities.METALS, Commodities.ORE, Commodities.RARE_METALS, Commodities.RARE_ORE,
-    Commodities.SHIPS, Commodities.LUXURY_GOODS, Commodities.ORGANICS, Commodities.VOLATILES, Commodities.SUPPLIES)
+    Commodities.SHIPS, Commodities.LUXURY_GOODS, Commodities.ORGANICS, Commodities.VOLATILES, Commodities.SUPPLIES, "IndEvo_parts", )
 
     @JvmStatic
     fun removeNonNanoforgeProducableCommodities(list: MutableSet<String>): MutableSet<String> {

diff --git a/src/data/utilities/niko_MPC_settings.kt b/src/data/utilities/niko_MPC_settings.kt
@@ -4,6 +4,7 @@ import com.fs.starfarer.api.Global
 import data.niko_MPC_modPlugin
 import data.niko_MPC_modPlugin.Companion.modId
 import data.scripts.campaign.econ.conditions.defenseSatellite.handlers.niko_MPC_derelictSatelliteHandler
+import data.scripts.campaign.econ.conditions.overgrownNanoforge.overgrownNanoforgeCommodityDataStore
 import data.scripts.campaign.econ.conditions.overgrownNanoforge.sources.effects.randomizedSourceBudgets
 import data.utilities.niko_MPC_debugUtils.displayError
 import data.utilities.niko_MPC_satelliteUtils.getSatelliteHandlers
@@ -102,6 +103,7 @@ object niko_MPC_settings {
 
         DERELICT_ESCORT_SIMULATE_FLEETS = LunaSettings.getBoolean(modId, "MPC_derelictEscortSimulateFleets")!!
         DERELICT_ESCORT_SPAWN_ON_PATROLS = LunaSettings.getBoolean(modId, "MPC_derelictEscortSpawnOnPatrols")!!
+        overgrownNanoforgeCommodityDataStore.reload()
     }
 
     fun loadNexSettings() {