From a52221b0338b873b777bfa1ee7aa4ac3916faf5e Mon Sep 17 00:00:00 2001 From: Hactarus Date: Wed, 9 Sep 2020 11:58:32 +0000 Subject: [PATCH] need to edit this --- Mods/AutoGen/Plant/Birch.cs | 34 +++++++++++++++----------- Mods/AutoGen/Plant/Cedar.cs | 32 ++++++++++++++---------- Mods/AutoGen/Plant/Ceiba.cs | 31 ++++++++++++++--------- Mods/AutoGen/Plant/Joshua.cs | 35 +++++++++++++++----------- Mods/AutoGen/Plant/Oak.cs | 27 +++++++++++--------- Mods/AutoGen/Plant/Redwood.cs | 38 +++++++++++++++++------------ Mods/AutoGen/Plant/SaguaroCactus.cs | 33 ++++++++++++++----------- 7 files changed, 136 insertions(+), 94 deletions(-) diff --git a/Mods/AutoGen/Plant/Birch.cs b/Mods/AutoGen/Plant/Birch.cs index 2ea600c..2549f6d 100644 --- a/Mods/AutoGen/Plant/Birch.cs +++ b/Mods/AutoGen/Plant/Birch.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Birch"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Birch(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Birch() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class BirchSpecies : TreeSpecies { public BirchSpecies() : base() @@ -63,22 +68,23 @@ namespace Eco.Mods.Organisms this.Name = "Birch"; this.DisplayName = Localizer.DoStr("Birch"); // Lifetime - this.MaturityAgeDays = 1; + this.MaturityAgeDays = 5; // Generation + this.Height = 1; // Food - this.CalorieValue = 12; + this.CalorieValue = 15; // Resources this.PostHarvestingGrowth = 0; this.ScythingKills = false; this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 50), 1) + new SpeciesResource(typeof(BirchLogItem), new Range(0, 50), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.002f; + this.ReleasesCO2TonsPerDay = -0.1f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; @@ -86,13 +92,13 @@ namespace Eco.Mods.Organisms this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.5f; - this.IdealTemperatureRange = new Range(0.21f, 0.52f); - this.IdealMoistureRange = new Range(0.48f, 0.58f); + this.BlanketSpawnPercent = 0.07f; + this.IdealTemperatureRange = new Range(0.55f, 0.75f); + this.IdealMoistureRange = new Range(0.52f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); this.WaterExtremes = new Range(0, 0.2f); - this.TemperatureExtremes = new Range(0.18f, 0.6f); - this.MoistureExtremes = new Range(0.45f, 0.61f); + this.TemperatureExtremes = new Range(0.5f, 0.8f); + this.MoistureExtremes = new Range(0.5f, 0.6f); this.MaxPollutionDensity = 0.7f; this.PollutionDensityTolerance = 0.1f; this.VoxelsPerEntry = 20; diff --git a/Mods/AutoGen/Plant/Cedar.cs b/Mods/AutoGen/Plant/Cedar.cs index 7b8e927..751beb5 100644 --- a/Mods/AutoGen/Plant/Cedar.cs +++ b/Mods/AutoGen/Plant/Cedar.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Cedar"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Cedar(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Cedar() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class CedarSpecies : TreeSpecies { public CedarSpecies() : base() @@ -63,22 +68,23 @@ namespace Eco.Mods.Organisms this.Name = "Cedar"; this.DisplayName = Localizer.DoStr("Cedar"); // Lifetime - this.MaturityAgeDays = 2; + this.MaturityAgeDays = 5; // Generation + this.Height = 1; // Food - this.CalorieValue = 12; + this.CalorieValue = 15; // Resources this.PostHarvestingGrowth = 0; this.ScythingKills = false; this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 50), 1) + new SpeciesResource(typeof(CedarLogItem), new Range(0, 50), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.002f; + this.ReleasesCO2TonsPerDay = -0.1f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; @@ -86,13 +92,13 @@ namespace Eco.Mods.Organisms this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.5f; - this.IdealTemperatureRange = new Range(0.49f, 0.78f); + this.BlanketSpawnPercent = 0.07f; + this.IdealTemperatureRange = new Range(0.55f, 0.75f); this.IdealMoistureRange = new Range(0.48f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); this.WaterExtremes = new Range(0, 0.2f); - this.TemperatureExtremes = new Range(0.3f, 0.82f); - this.MoistureExtremes = new Range(0.45f, 0.61f); + this.TemperatureExtremes = new Range(0.5f, 0.8f); + this.MoistureExtremes = new Range(0.5f, 0.6f); this.MaxPollutionDensity = 0.7f; this.PollutionDensityTolerance = 0.1f; this.VoxelsPerEntry = 20; diff --git a/Mods/AutoGen/Plant/Ceiba.cs b/Mods/AutoGen/Plant/Ceiba.cs index cad665f..06a67e0 100644 --- a/Mods/AutoGen/Plant/Ceiba.cs +++ b/Mods/AutoGen/Plant/Ceiba.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Ceiba"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Ceiba(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Ceiba() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class CeibaSpecies : TreeSpecies { public CeibaSpecies() : base() @@ -63,29 +68,31 @@ namespace Eco.Mods.Organisms this.Name = "Ceiba"; this.DisplayName = Localizer.DoStr("Ceiba"); // Lifetime - this.MaturityAgeDays = 2.5f; + this.MaturityAgeDays = 6; // Generation + this.Height = 1; // Food - this.CalorieValue = 12; + this.CalorieValue = 15; // Resources this.PostHarvestingGrowth = 0; this.ScythingKills = false; this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 60), 1) + new SpeciesResource(typeof(CeibaLogItem), new Range(0, 60), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.004f; + this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 1 }); - this.BlanketSpawnPercent = 0.3f; + 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.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 index 4941806..3717233 100644 --- a/Mods/AutoGen/Plant/Joshua.cs +++ b/Mods/AutoGen/Plant/Joshua.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Joshua"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Joshua(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Joshua() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class JoshuaSpecies : TreeSpecies { public JoshuaSpecies() : base() @@ -63,8 +68,9 @@ namespace Eco.Mods.Organisms this.Name = "Joshua"; this.DisplayName = Localizer.DoStr("Joshua"); // Lifetime - this.MaturityAgeDays = 3; + this.MaturityAgeDays = 7; // Generation + this.Height = 1; // Food this.CalorieValue = 12; // Resources @@ -73,25 +79,26 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 40), 1) + new SpeciesResource(typeof(JoshuaLogItem), new Range(0, 40), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.001f; + this.ReleasesCO2TonsPerDay = -0.05f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 1 }); - this.BlanketSpawnPercent = 0.13f; - this.IdealTemperatureRange = new Range(0.75f, 0.85f); - this.IdealMoistureRange = new Range(0.2f, 0.32f); + 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 = 30 }); + this.BlanketSpawnPercent = 0.05f; + this.IdealTemperatureRange = new Range(0.7f, 0.85f); + this.IdealMoistureRange = new Range(0.2f, 0.3f); this.IdealWaterRange = new Range(0, 0.1f); this.WaterExtremes = new Range(0, 0.2f); this.TemperatureExtremes = new Range(0.65f, 0.9f); - this.MoistureExtremes = new Range(0.12f, 0.38f); + this.MoistureExtremes = new Range(0.12f, 0.32f); this.MaxPollutionDensity = 0.7f; this.PollutionDensityTolerance = 0.1f; this.VoxelsPerEntry = 20; diff --git a/Mods/AutoGen/Plant/Oak.cs b/Mods/AutoGen/Plant/Oak.cs index bf7bfcf..162f1c7 100644 --- a/Mods/AutoGen/Plant/Oak.cs +++ b/Mods/AutoGen/Plant/Oak.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Oak"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Oak(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Oak() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class OakSpecies : TreeSpecies { public OakSpecies() : base() @@ -63,8 +68,9 @@ namespace Eco.Mods.Organisms this.Name = "Oak"; this.DisplayName = Localizer.DoStr("Oak"); // Lifetime - this.MaturityAgeDays = 4; + this.MaturityAgeDays = 7; // Generation + this.Height = 1; // Food this.CalorieValue = 12; // Resources @@ -73,21 +79,20 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 80), 1) + new SpeciesResource(typeof(OakLogItem), new Range(0, 80), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.004f; + this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.2f }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 45 }); - this.GenerationSpawnCountPerPoint = new Range(1, 3); - this.GenerationSpawnPointMultiplier = 0.03f; + this.BlanketSpawnPercent = 0.07f; 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 d595f10..33b7876 100644 --- a/Mods/AutoGen/Plant/Redwood.cs +++ b/Mods/AutoGen/Plant/Redwood.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Redwood"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public Redwood(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public Redwood() { } static TreeSpecies species; + + [Ecopedia("Plants", "Trees", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class RedwoodSpecies : TreeSpecies { public RedwoodSpecies() : base() @@ -63,36 +68,37 @@ namespace Eco.Mods.Organisms this.Name = "Redwood"; this.DisplayName = Localizer.DoStr("Redwood"); // Lifetime - this.MaturityAgeDays = 2; + this.MaturityAgeDays = 6; // Generation + this.Height = 1; // Food - this.CalorieValue = 12; + this.CalorieValue = 15; // Resources this.PostHarvestingGrowth = 0; this.ScythingKills = false; this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 60), 1) + new SpeciesResource(typeof(RedwoodLogItem), new Range(0, 60), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.004f; + this.ReleasesCO2TonsPerDay = -0.2f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); - this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 1 }); + this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.7f }); + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "FertileGround", ConsumedCapacityPerPop = 4 }); this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 20 }); - this.BlanketSpawnPercent = 0.3f; - this.IdealTemperatureRange = new Range(0.22f, 0.48f); - this.IdealMoistureRange = new Range(0.42f, 0.48f); + this.BlanketSpawnPercent = 0.05f; + this.IdealTemperatureRange = new Range(0.35f, 0.48f); + this.IdealMoistureRange = new Range(0.52f, 0.58f); this.IdealWaterRange = new Range(0, 0.1f); this.WaterExtremes = new Range(0, 0.2f); - this.TemperatureExtremes = new Range(0.18f, 0.52f); - this.MoistureExtremes = new Range(0.39f, 0.51f); + this.TemperatureExtremes = new Range(0.32f, 0.5f); + this.MoistureExtremes = new Range(0.5f, 0.6f); this.MaxPollutionDensity = 0.7f; this.PollutionDensityTolerance = 0.1f; this.VoxelsPerEntry = 20; diff --git a/Mods/AutoGen/Plant/SaguaroCactus.cs b/Mods/AutoGen/Plant/SaguaroCactus.cs index 083c6c4..e4084ef 100644 --- a/Mods/AutoGen/Plant/SaguaroCactus.cs +++ b/Mods/AutoGen/Plant/SaguaroCactus.cs @@ -1,7 +1,10 @@ +// Copyright (c) Strange Loop Games. All rights reserved. +// See LICENSE file in the project root for full license information. +// + namespace Eco.Mods.TechTree { - // [DoNotLocalize] -} + } // WORLD LAYER INFO namespace Eco.Mods.WorldLayers { @@ -22,12 +25,11 @@ namespace Eco.Mods.WorldLayers this.RenderRange = new Range(0f, 0.05f); this.MinColor = new Color(1f, 1f, 1f); this.MaxColor = new Color(0f, 1f, 0f); - this.Percent = false; this.SumRelevant = true; this.Unit = "Saguaro Cactus"; this.VoxelsPerEntry = 20; this.Category = WorldLayerCategory.Plant; - this.ValueType = WorldLayerValueType.Percent; + this.ValueType = WorldLayerValueType.FillRate; this.AreaDescription = ""; } } @@ -35,7 +37,8 @@ namespace Eco.Mods.WorldLayers namespace Eco.Mods.Organisms { - using System.Collections.Generic; + using System.Collections.Generic; + using Eco.Core.Items; using Eco.Gameplay.Plants; using Eco.Mods.TechTree; using Eco.Shared.Localization; @@ -51,6 +54,8 @@ namespace Eco.Mods.Organisms public SaguaroCactus(WorldPosition3i mapPos, PlantPack plantPack) : base(species, mapPos, plantPack) { } public SaguaroCactus() { } static TreeSpecies species; + + [Ecopedia("Plants", "Plants", createAsSubPage: true, display: InPageTooltip.DynamicTooltip)] public partial class SaguaroCactusSpecies : TreeSpecies { public SaguaroCactusSpecies() : base() @@ -63,8 +68,9 @@ namespace Eco.Mods.Organisms this.Name = "SaguaroCactus"; this.DisplayName = Localizer.DoStr("Saguaro Cactus"); // Lifetime - this.MaturityAgeDays = 1.5f; + this.MaturityAgeDays = 6; // Generation + this.Height = 1; // Food this.CalorieValue = 12; // Resources @@ -73,27 +79,26 @@ namespace Eco.Mods.Organisms this.PickableAtPercent = 0; this.ResourceList = new List() { - new SpeciesResource(typeof(LogItem), new Range(0, 30), 1) + new SpeciesResource(typeof(SaguaroRibItem), new Range(0, 30), 1) }; this.ResourceBonusAtGrowth = 0.9f; // Visuals // Climate - this.ReleasesCO2ppmPerDay = -0.001f; + this.ReleasesCO2TonsPerDay = -0.05f; // WorldLayers this.MaxGrowthRate = 0.01f; this.MaxDeathRate = 0.005f; this.SpreadRate = 0.001f; - this.ResourceConstraints.Add(new ResourceConstraint() { LayerName = "SoilMoisture", HalfSpeedConcentration = 0.1f, MaxResourceContent = 0.1f }); + 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 = 19 }); - this.GenerationSpawnCountPerPoint = new Range(3, 7); - this.GenerationSpawnPointMultiplier = 0.09f; + this.CapacityConstraints.Add(new CapacityConstraint() { CapacityLayerName = "CanopySpace", ConsumedCapacityPerPop = 15 }); + this.BlanketSpawnPercent = 0.08f; this.IdealTemperatureRange = new Range(0.8f, 0.9f); - this.IdealMoistureRange = new Range(0.1f, 0.2f); + this.IdealMoistureRange = new Range(0.05f, 0.25f); this.IdealWaterRange = new Range(0, 0.1f); this.WaterExtremes = new Range(0, 0.2f); this.TemperatureExtremes = new Range(0.7f, 1); - this.MoistureExtremes = new Range(0, 0.38f); + this.MoistureExtremes = new Range(0, 0.3f); this.MaxPollutionDensity = 0.7f; this.PollutionDensityTolerance = 0.1f; this.VoxelsPerEntry = 20;