Botany Rework Part 1: Mutations

Content.Server/Botany/Components/PlantHolderComponent.cs

@@ -6,90 +6,90 @@ namespace Content.Server.Botany.Components;
 [RegisterComponent]
 public sealed partial class PlantHolderComponent : Component
 {
-    [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextUpdate = TimeSpan.Zero;
-    [ViewVariables(VVAccess.ReadWrite), DataField("updateDelay")]
+    [DataField]
     public TimeSpan UpdateDelay = TimeSpan.FromSeconds(3);
 
-    [DataField("lastProduce")]
+    [DataField]
     public int LastProduce;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("missingGas")]
+    [DataField]
     public int MissingGas;
 
-    [DataField("cycleDelay")]
+    [DataField]
     public TimeSpan CycleDelay = TimeSpan.FromSeconds(15f);
 
-    [DataField("lastCycle", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan LastCycle = TimeSpan.Zero;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("updateSpriteAfterUpdate")]
+    [DataField]
     public bool UpdateSpriteAfterUpdate;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("drawWarnings")]
+    [DataField]
     public bool DrawWarnings = false;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("waterLevel")]
+    [DataField]
     public float WaterLevel = 100f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("nutritionLevel")]
+    [DataField]
     public float NutritionLevel = 100f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("pestLevel")]
+    [DataField]
     public float PestLevel;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("weedLevel")]
+    [DataField]
     public float WeedLevel;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("toxins")]
+    [DataField]
     public float Toxins;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("age")]
+    [DataField]
     public int Age;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("skipAging")]
+    [DataField]
     public int SkipAging;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("dead")]
+    [DataField]
     public bool Dead;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("harvest")]
+    [DataField]
     public bool Harvest;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("sampled")]
+    [DataField]
     public bool Sampled;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("yieldMod")]
+    [DataField]
     public int YieldMod = 1;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("mutationMod")]
+    [DataField]
     public float MutationMod = 1f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("mutationLevel")]
+    [DataField]
     public float MutationLevel;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("health")]
+    [DataField]
     public float Health;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("weedCoefficient")]
+    [DataField]
     public float WeedCoefficient = 1f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("seed")]
+    [DataField]
     public SeedData? Seed;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("improperHeat")]
+    [DataField]
     public bool ImproperHeat;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("improperPressure")]
+    [DataField]
     public bool ImproperPressure;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("improperLight")]
+    [DataField]
     public bool ImproperLight;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("forceUpdate")]
+    [DataField]
     public bool ForceUpdate;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("solution")]
+    [DataField]
     public string SoilSolutionName = "soil";
 
     [DataField]

Content.Server/Botany/Components/ProduceComponent.cs

@@ -13,12 +13,12 @@ public sealed partial class ProduceComponent : SharedProduceComponent
     /// <summary>
     ///     Seed data used to create a <see cref="SeedComponent"/> when this produce has its seeds extracted.
     /// </summary>
-    [DataField("seed")]
+    [DataField]
     public SeedData? Seed;
 
     /// <summary>
     ///     Seed data used to create a <see cref="SeedComponent"/> when this produce has its seeds extracted.
     /// </summary>
-    [DataField("seedId", customTypeSerializer: typeof(PrototypeIdSerializer<SeedPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SeedPrototype>))]
     public string? SeedId;
 }

Content.Server/Botany/SeedPrototype.cs

@@ -2,6 +2,7 @@
 using Content.Server.Botany.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.EntityEffects;
+using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -132,78 +133,67 @@ public partial class SeedData
     [DataField("productPrototypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
     public List<string> ProductPrototypes = new();
 
-    [DataField("chemicals")] public Dictionary<string, SeedChemQuantity> Chemicals = new();
+    [DataField] public Dictionary<string, SeedChemQuantity> Chemicals = new();
 
-    [DataField("consumeGasses")] public Dictionary<Gas, float> ConsumeGasses = new();
+    [DataField] public Dictionary<Gas, float> ConsumeGasses = new();
 
-    [DataField("exudeGasses")] public Dictionary<Gas, float> ExudeGasses = new();
+    [DataField] public Dictionary<Gas, float> ExudeGasses = new();
 
     #endregion
 
     #region Tolerances
 
-    [DataField("nutrientConsumption")] public float NutrientConsumption = 0.75f;
+    [DataField] public float NutrientConsumption = 0.75f;
 
-    [DataField("waterConsumption")] public float WaterConsumption = 0.5f;
-    [DataField("idealHeat")] public float IdealHeat = 293f;
-    [DataField("heatTolerance")] public float HeatTolerance = 10f;
-    [DataField("idealLight")] public float IdealLight = 7f;
-    [DataField("lightTolerance")] public float LightTolerance = 3f;
-    [DataField("toxinsTolerance")] public float ToxinsTolerance = 4f;
+    [DataField] public float WaterConsumption = 0.5f;
+    [DataField] public float IdealHeat = 293f;
+    [DataField] public float HeatTolerance = 10f;
+    [DataField] public float IdealLight = 7f;
+    [DataField] public float LightTolerance = 3f;
+    [DataField] public float ToxinsTolerance = 4f;
 
-    [DataField("lowPressureTolerance")] public float LowPressureTolerance = 81f;
+    [DataField] public float LowPressureTolerance = 81f;
 
-    [DataField("highPressureTolerance")] public float HighPressureTolerance = 121f;
+    [DataField] public float HighPressureTolerance = 121f;
 
-    [DataField("pestTolerance")] public float PestTolerance = 5f;
+    [DataField] public float PestTolerance = 5f;
 
-    [DataField("weedTolerance")] public float WeedTolerance = 5f;
+    [DataField] public float WeedTolerance = 5f;
 
-    [DataField("weedHighLevelThreshold")] public float WeedHighLevelThreshold = 10f;
+    [DataField] public float WeedHighLevelThreshold = 10f;
 
     #endregion
 
     #region General traits
 
-    [DataField("endurance")] public float Endurance = 100f;
+    [DataField] public float Endurance = 100f;
 
-    [DataField("yield")] public int Yield;
-    [DataField("lifespan")] public float Lifespan;
-    [DataField("maturation")] public float Maturation;
-    [DataField("production")] public float Production;
-    [DataField("growthStages")] public int GrowthStages = 6;
+    [DataField] public int Yield;
+    [DataField] public float Lifespan;
+    [DataField] public float Maturation;
+    [DataField] public float Production;
+    [DataField] public int GrowthStages = 6;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("harvestRepeat")] public HarvestType HarvestRepeat = HarvestType.NoRepeat;
+    [DataField] public HarvestType HarvestRepeat = HarvestType.NoRepeat;
 
-    [DataField("potency")] public float Potency = 1f;
+    [DataField] public float Potency = 1f;
 
     /// <summary>
     ///     If true, cannot be harvested for seeds. Balances hybrids and
     ///     mutations.
     /// </summary>
-    [DataField("seedless")] public bool Seedless = false;
+    [DataField] public bool Seedless = false;
 
     /// <summary>
     ///     If false, rapidly decrease health while growing. Used to kill off
     ///     plants with "bad" mutations.
     /// </summary>
-    [DataField("viable")] public bool Viable = true;
-
-    /// <summary>
-    ///     If true, fruit slips players.
-    /// </summary>
-    [DataField("slip")] public bool Slip = false;
-
-    /// <summary>
-    ///     If true, fruits are sentient.
-    /// </summary>
-    [DataField("sentient")] public bool Sentient = false;
+    [DataField] public bool Viable = true;
 
     /// <summary>
     ///     If true, a sharp tool is required to harvest this plant.
     /// </summary>
-    [DataField("ligneous")] public bool Ligneous;
+    [DataField] public bool Ligneous;
 
     // No, I'm not removing these.
     // if you re-add these, make sure that they get cloned.
@@ -222,36 +212,35 @@ public partial class SeedData
 
     #region Cosmetics
 
-    [DataField("plantRsi", required: true)]
+    [DataField(required: true)]
     public ResPath PlantRsi { get; set; } = default!;
 
-    [DataField("plantIconState")] public string PlantIconState { get; set; } = "produce";
+    [DataField] public string PlantIconState { get; set; } = "produce";
 
     /// <summary>
-    /// Screams random sound, could be strict sound SoundPathSpecifier or collection SoundCollectionSpecifier
-    /// base class is SoundSpecifier
+    /// Screams random sound from collection SoundCollectionSpecifier
     /// </summary>
-    [DataField("screamSound")]
+    [DataField]
     public SoundSpecifier ScreamSound = new SoundCollectionSpecifier("PlantScreams", AudioParams.Default.WithVolume(-10));
 
     [DataField("screaming")] public bool CanScream;
 
-    [DataField("bioluminescent")] public bool Bioluminescent;
-    [DataField("bioluminescentColor")] public Color BioluminescentColor { get; set; } = Color.White;
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] public string KudzuPrototype = "WeakKudzu";
 
-    public float BioluminescentRadius = 2f;
-
-    [DataField("kudzuPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] public string KudzuPrototype = "WeakKudzu";
-
-    [DataField("turnIntoKudzu")] public bool TurnIntoKudzu;
-    [DataField("splatPrototype")] public string? SplatPrototype { get; set; }
+    [DataField] public bool TurnIntoKudzu;
+    [DataField] public string? SplatPrototype { get; set; }
 
     #endregion
 
+    /// <summary>
+    /// The mutation effects that have been applied to this plant.
+    /// </summary>
+    [DataField] public List<RandomPlantMutation> Mutations { get; set; } = new();
+
     /// <summary>
     ///     The seed prototypes this seed may mutate into when prompted to.
     /// </summary>
-    [DataField("mutationPrototypes", customTypeSerializer: typeof(PrototypeIdListSerializer<SeedPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<SeedPrototype>))]
     public List<string> MutationPrototypes = new();
 
     public SeedData Clone()
@@ -295,17 +284,14 @@ public SeedData Clone()
 
             Seedless = Seedless,
             Viable = Viable,
-            Slip = Slip,
-            Sentient = Sentient,
             Ligneous = Ligneous,
 
             PlantRsi = PlantRsi,
             PlantIconState = PlantIconState,
-            Bioluminescent = Bioluminescent,
             CanScream = CanScream,
             TurnIntoKudzu = TurnIntoKudzu,
-            BioluminescentColor = BioluminescentColor,
             SplatPrototype = SplatPrototype,
+            Mutations = Mutations,
 
             // Newly cloned seed is unique. No need to unnecessarily clone if repeatedly modified.
             Unique = true,
@@ -356,18 +342,16 @@ public SeedData SpeciesChange(SeedData other)
             HarvestRepeat = HarvestRepeat,
             Potency = Potency,
 
+            Mutations = Mutations,
+
             Seedless = Seedless,
             Viable = Viable,
-            Slip = Slip,
-            Sentient = Sentient,
             Ligneous = Ligneous,
 
             PlantRsi = other.PlantRsi,
             PlantIconState = other.PlantIconState,
-            Bioluminescent = Bioluminescent,
             CanScream = CanScream,
             TurnIntoKudzu = TurnIntoKudzu,
-            BioluminescentColor = BioluminescentColor,
             SplatPrototype = other.SplatPrototype,
 
             // Newly cloned seed is unique. No need to unnecessarily clone if repeatedly modified.

Content.Server/Botany/Systems/BotanySystem.Produce.cs

@@ -1,4 +1,5 @@
 using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 
 namespace Content.Server.Botany.Systems;
@@ -10,6 +11,15 @@ public void ProduceGrown(EntityUid uid, ProduceComponent produce)
         if (!TryGetSeed(produce, out var seed))
             return;
 
+        foreach (var mutation in seed.Mutations)
+        {
+            if (mutation.AppliesToProduce)
+            {
+                var args = new EntityEffectBaseArgs(uid, EntityManager);
+                mutation.Effect.Effect(args);
+            }
+        }
+
         if (!_solutionContainerSystem.EnsureSolution(uid,
                 produce.SolutionName,
                 out var solutionContainer,