diff --git a/changelog.txt b/changelog.txt index 74b6281..bf4812d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +3.9.0 + +Added a lunalib setting for condensing all overgrown nanoforge intel into one tab + 3.8.0 Added a lunalib setting for disabling the generation of the magnetar system diff --git a/data/config/LunaSettings.csv b/data/config/LunaSettings.csv index 16e2935..557449e 100644 --- a/data/config/LunaSettings.csv +++ b/data/config/LunaSettings.csv @@ -21,6 +21,7 @@ MPC_nanoforgeBudgetMultMin,Budget minimum mult,Double,0.8,,"The higher the budge MPC_nanoforgeBudgetMultMax,Budget maximum mult,Double,1.2,,,,,Conditions MPC_nanoforgeMinTimeBetweenSpreads,Min time between spreading attempts (Days),Int,30,,,,,Conditions MPC_nanoforgeMaxTimeBetweenSpreads,Max time between spreading attempts (Days),Int,90,,,,,Conditions +MPC_condenseOvergrownNanoforgeIntel,Puts all overgrown nanoforge into one intel tab,Boolean,false,,,,,Conditions ,,,,,,,, MPC_derelictEscortHeader,Derelict Escort Config,Header,Derelict Escort Config,,,,,Conditions MPC_derelictEscortSimulateFleets,Force simulation of escorted fleets,Boolean,true,,"If true, escorted fleets will be forcefully spawned (contrary to usual behavior where they are despawned if you are far away to save performance). Disabling will improve performance, but will make escorts return home if the fleet gets too far away from the player.",,,Conditions diff --git a/jars/niko_morePlanetaryConditions.jar b/jars/niko_morePlanetaryConditions.jar index 875fd28..8a1f6cc 100644 Binary files a/jars/niko_morePlanetaryConditions.jar and b/jars/niko_morePlanetaryConditions.jar differ diff --git a/src/data/scripts/campaign/econ/conditions/overgrownNanoforge/intel/plugins/baseOvergrownNanoforgeIntel.kt b/src/data/scripts/campaign/econ/conditions/overgrownNanoforge/intel/plugins/baseOvergrownNanoforgeIntel.kt index 9b93189..eb2f041 100644 --- a/src/data/scripts/campaign/econ/conditions/overgrownNanoforge/intel/plugins/baseOvergrownNanoforgeIntel.kt +++ b/src/data/scripts/campaign/econ/conditions/overgrownNanoforge/intel/plugins/baseOvergrownNanoforgeIntel.kt @@ -20,6 +20,7 @@ import data.scripts.campaign.intel.baseNikoEventStageInterface import data.scripts.campaign.intel.baseNikoIntelPlugin import data.utilities.niko_MPC_ids.INTEL_OVERGROWN_NANOFORGES import data.utilities.niko_MPC_ids.INTEL_OVERGROWN_NANOFORGES_MARKET +import data.utilities.niko_MPC_settings import data.utilities.niko_MPC_settings.OVERGROWN_NANOFORGE_SUPPRESSION_DISCOUNT_MULT import data.utilities.niko_MPC_settings.OVERGROWN_NANOFORGE_SUPPRESSION_DISCOUNT_THRESHOLD import data.utilities.niko_MPC_settings.OVERGROWN_NANOFORGE_SUPPRESSION_EXTRA_COST_MULT @@ -466,7 +467,11 @@ abstract class baseOvergrownNanoforgeIntel( override fun getIntelTags(map: SectorMapAPI?): MutableSet { val tags = super.getIntelTags(map) - tags += INTEL_OVERGROWN_NANOFORGES_MARKET + getMarket().name + if (niko_MPC_settings.CONDENSE_OVERGROWN_NANOFORGE_INTEL) { + tags += INTEL_OVERGROWN_NANOFORGES + } else { + tags += INTEL_OVERGROWN_NANOFORGES_MARKET + getMarket().name + } return tags } diff --git a/src/data/utilities/niko_MPC_settings.kt b/src/data/utilities/niko_MPC_settings.kt index 6e31caa..bdb694e 100644 --- a/src/data/utilities/niko_MPC_settings.kt +++ b/src/data/utilities/niko_MPC_settings.kt @@ -32,6 +32,8 @@ object niko_MPC_settings { var AOTD_vaultsEnabled = false var SOTF_enabled = false + var CONDENSE_OVERGROWN_NANOFORGE_INTEL = false + const val OVERGROWN_NANOFORGE_INDUSTRY_NAME = "Overgrown Nanoforge" const val OVERGROWN_NANOFORGE_JUNK_NAME = "Nanoforge Growth" @@ -107,6 +109,7 @@ object niko_MPC_settings { OVERGROWN_NANOFORGE_RANDOM_BUDGET_MULT_MAX = LunaSettings.getFloat(modId, "MPC_nanoforgeBudgetMultMax")!! OVERGROWN_NANOFORGE_MIN_TIME_BETWEEN_SPREADS = LunaSettings.getInt(modId, "MPC_nanoforgeMinTimeBetweenSpreads")!! OVERGROWN_NANOFORGE_MAX_TIME_BETWEEN_SPREADS = LunaSettings.getInt(modId, "MPC_nanoforgeMaxTimeBetweenSpreads")!! + CONDENSE_OVERGROWN_NANOFORGE_INTEL = LunaSettings.getBoolean(modId, "MPC_condenseOvergrownNanoforgeIntel")!! DERELICT_ESCORT_SIMULATE_FLEETS = LunaSettings.getBoolean(modId, "MPC_derelictEscortSimulateFleets")!! DERELICT_ESCORT_SPAWN_ON_PATROLS = LunaSettings.getBoolean(modId, "MPC_derelictEscortSpawnOnPatrols")!!