From 45a93682a2f98053520451b0f797f4d91fbec814 Mon Sep 17 00:00:00 2001 From: Hactarus Date: Fri, 4 Dec 2020 11:26:38 +0000 Subject: [PATCH] V0.9.1.8 --- Configs/Civics.eco.template | 6 ++---- Configs/Difficulty.eco.template | 1 - Configs/Users.eco.template | 16 +++++++++++----- Mods/AutoGen/Plant/Birch.cs | 14 +++++++------- Mods/AutoGen/Plant/Cedar.cs | 14 +++++++------- Mods/AutoGen/Plant/Ceiba.cs | 10 +++++----- Mods/AutoGen/Plant/Joshua.cs | 10 +++++----- Mods/AutoGen/Plant/Oak.cs | 14 +++++++------- Mods/AutoGen/Plant/Redwood.cs | 14 +++++++------- Mods/AutoGen/Plant/SaguaroCactus.cs | 10 +++++----- 10 files changed, 56 insertions(+), 53 deletions(-) mode change 100644 => 100755 Configs/Civics.eco.template mode change 100644 => 100755 Configs/Difficulty.eco.template mode change 100644 => 100755 Configs/Users.eco.template mode change 100644 => 100755 Mods/AutoGen/Plant/Ceiba.cs mode change 100644 => 100755 Mods/AutoGen/Plant/Joshua.cs diff --git a/Configs/Civics.eco.template b/Configs/Civics.eco.template old mode 100644 new mode 100755 index c3347c3..c9c0b82 --- a/Configs/Civics.eco.template +++ b/Configs/Civics.eco.template @@ -1,8 +1,8 @@ { "AllowOverthrow": true, "ValueAdditionToOverthrow": 50.0, - "DayRangeForActiveDemographic": 2.0, - "HoursPlayedToBeActiveDemographic": 2.0, + "DayRangeForActiveDemographic": 1.5, + "HoursPlayedToBeActiveDemographic": 0.5, "DayRangeForAbandonedDemographic": 7.0, "HoursPlayedToBeAbandonedDemographic": 0.0, "MinutesBetweenCivicsUpdates": 5.0, @@ -11,11 +11,9 @@ "AllowLawsToPreventLoginOrPlay": false, "BasicElectionSettings": { "MaximumElectionHours": 24.0, - "MinimumElectionHours": 2.0, "MinimumPercentOfEligibleVotersRequired": 10.0, "EndElectionEarlyWhenThisPercentHaveVoted": 95.0, "MinimumDaysBetweenElectionsOfThisType": 0.0, - "MajorityRequiredForInstantWin": 90.0, "AnonymousVoting": false } } \ No newline at end of file diff --git a/Configs/Difficulty.eco.template b/Configs/Difficulty.eco.template old mode 100644 new mode 100755 index f70c7b0..f01e283 --- a/Configs/Difficulty.eco.template +++ b/Configs/Difficulty.eco.template @@ -3,7 +3,6 @@ "DifficultyModifiers": { "SpecialtyCostMultiplier": 1.0, "SkillGainMultiplier": 1.0, - "SpecialtyExperienceDivisor": 20.0, "SpecialtyExperiencePerLevel": 25.0, "CraftResourceModifier": 1.0, "CraftTimeModifier": 1.0, diff --git a/Configs/Users.eco.template b/Configs/Users.eco.template old mode 100644 new mode 100755 index 9a12cdc..05a6935 --- a/Configs/Users.eco.template +++ b/Configs/Users.eco.template @@ -3,28 +3,33 @@ "MaxRepFromOnePerson": 30.0, "MinRepFromOnePerson": -10.0, "AllowDebugCalls": false, - "AdminCommandsLoggingLevel": "LogFileAndNotifyEveryone", "WhiteList": { "System.String": { - "$type": "System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib", + "$type": "System.Collections.Generic.List`1[[System.String, System.Private.CoreLib]], System.Private.CoreLib", "$values": [] } }, "BlackList": { "System.String": { - "$type": "System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib", + "$type": "System.Collections.Generic.List`1[[System.String, System.Private.CoreLib]], System.Private.CoreLib", + "$values": [] + } + }, + "MuteList": { + "System.String": { + "$type": "System.Collections.Generic.List`1[[System.String, System.Private.CoreLib]], System.Private.CoreLib", "$values": [] } }, "Admins": { "System.String": { - "$type": "System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib", + "$type": "System.Collections.Generic.List`1[[System.String, System.Private.CoreLib]], System.Private.CoreLib", "$values": [] } }, "Reputations": { "Eco.Gameplay.Economy.ReputationTitle": { - "$type": "System.Collections.Generic.List`1[[Eco.Gameplay.Economy.ReputationTitle, Eco.Gameplay]], mscorlib", + "$type": "System.Collections.Generic.List`1[[Eco.Gameplay.Economy.ReputationTitle, Eco.Gameplay]], System.Private.CoreLib", "$values": [ { "MaxReputation": -500.0, @@ -125,6 +130,7 @@ } }, "UnStuckDisableTime": 60.0, + "AdminCommandsLoggingLevel": "LogFileAndNotifyEveryone", "DelayNearbyFoodCheckMinutes": 4.0, "NearbyFoodSpawnLocationRadius": 20.0, "NearbyFoodSpawnCount": 5, diff --git a/Mods/AutoGen/Plant/Birch.cs b/Mods/AutoGen/Plant/Birch.cs index cf0e754..aebde69 100755 --- a/Mods/AutoGen/Plant/Birch.cs +++ b/Mods/AutoGen/Plant/Birch.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(BirchLogItem), new Range(0, 50), 1) + new SpeciesResource(typeof(BirchLogItem), new Range(0, 50), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.1f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.07f; + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 10 }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 30 }); + this.BlanketSpawnPercent = 0.5f; this.IdealTemperatureRange = new Range(0.55f, 0.75f); this.IdealMoistureRange = new Range(0.52f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/Cedar.cs b/Mods/AutoGen/Plant/Cedar.cs index dbe284b..15a5ed3 100755 --- a/Mods/AutoGen/Plant/Cedar.cs +++ b/Mods/AutoGen/Plant/Cedar.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(CedarLogItem), new Range(0, 50), 1) + new SpeciesResource(typeof(CedarLogItem), new Range(0, 50), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.1f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.07f; + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 10 }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 30 }); + this.BlanketSpawnPercent = 0.5f; this.IdealTemperatureRange = new Range(0.55f, 0.75f); this.IdealMoistureRange = new Range(0.48f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/Ceiba.cs b/Mods/AutoGen/Plant/Ceiba.cs old mode 100644 new mode 100755 index 06a67e0..f08f80e --- a/Mods/AutoGen/Plant/Ceiba.cs +++ b/Mods/AutoGen/Plant/Ceiba.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(CeibaLogItem), new Range(0, 60), 1) + new SpeciesResource(typeof(CeibaLogItem), new Range(0, 60), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 4 }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 4 }); - this.BlanketSpawnPercent = 0.06f; + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 40 }); + this.BlanketSpawnPercent = 0.5f; this.IdealTemperatureRange = new Range(0.65f, 0.75f); this.IdealMoistureRange = new Range(0.75f, 0.95f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/Joshua.cs b/Mods/AutoGen/Plant/Joshua.cs old mode 100644 new mode 100755 index 3717233..90aaaad --- a/Mods/AutoGen/Plant/Joshua.cs +++ b/Mods/AutoGen/Plant/Joshua.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(JoshuaLogItem), new Range(0, 40), 1) + new SpeciesResource(typeof(JoshuaLogItem), new Range(0, 40), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.05f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 4 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 30 }); - this.BlanketSpawnPercent = 0.05f; + this.BlanketSpawnPercent = 0.8f; this.IdealTemperatureRange = new Range(0.7f, 0.85f); this.IdealMoistureRange = new Range(0.2f, 0.3f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/Oak.cs b/Mods/AutoGen/Plant/Oak.cs index bc54733..d14974a 100755 --- a/Mods/AutoGen/Plant/Oak.cs +++ b/Mods/AutoGen/Plant/Oak.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(OakLogItem), new Range(0, 80), 1) + new SpeciesResource(typeof(OakLogItem), new Range(0, 80), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 45 }); - this.BlanketSpawnPercent = 0.07f; + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.2f }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 20 }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 50 }); + this.BlanketSpawnPercent = 0.5f; this.IdealTemperatureRange = new Range(0.45f, 0.76f); this.IdealMoistureRange = new Range(0.43f, 0.47f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/Redwood.cs b/Mods/AutoGen/Plant/Redwood.cs index 9409513..b98fe39 100755 --- a/Mods/AutoGen/Plant/Redwood.cs +++ b/Mods/AutoGen/Plant/Redwood.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(RedwoodLogItem), new Range(0, 60), 1) + new SpeciesResource(typeof(RedwoodLogItem), new Range(0, 60), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 4 }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.05f; + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.7f }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 20 }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 26 }); + this.BlanketSpawnPercent = 0.4f; this.IdealTemperatureRange = new Range(0.35f, 0.48f); this.IdealMoistureRange = new Range(0.52f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); diff --git a/Mods/AutoGen/Plant/SaguaroCactus.cs b/Mods/AutoGen/Plant/SaguaroCactus.cs index 889bc33..cd93e71 100755 --- a/Mods/AutoGen/Plant/SaguaroCactus.cs +++ b/Mods/AutoGen/Plant/SaguaroCactus.cs @@ -79,20 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(SaguaroRibItem), new Range(0, 30), 1) + new SpeciesResource(typeof(SaguaroRibItem), new Range(0, 30), 1), }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate this.ReleasesCO2TonsPerDay = -0.05f; // WorldLayers - this.MaxGrowthRate = 0.01f; - this.MaxDeathRate = 0.005f; + this.MaxGrowthRate = 0.02f; + this.MaxDeathRate = 0.01f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.0f, MaxResourceContent = 1.0f }); + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.2f }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 4 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 15 }); - this.BlanketSpawnPercent = 0.08f; + this.BlanketSpawnPercent = 0.6f; this.IdealTemperatureRange = new Range(0.8f, 0.9f); this.IdealMoistureRange = new Range(0.05f, 0.25f); this.IdealWaterRange = new Range(0, 0.1f);