Change plant clipping mechanics (#25326)

Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.
This commit is contained in:
Flesh
2024-02-17 06:02:12 +01:00
committed by GitHub
parent 95c9500630
commit dab2c48849
4 changed files with 34 additions and 9 deletions

View File

@@ -15,6 +15,12 @@ namespace Content.Server.Botany.Components
[DataField("seed")] [DataField("seed")]
public SeedData? Seed; public SeedData? Seed;
/// <summary>
/// If not null, overrides the plant's initial health. Otherwise, the plant's initial health is set to the Endurance value.
/// </summary>
[DataField]
public float? HealthOverride = null;
/// <summary> /// <summary>
/// Name of a base seed prototype that is used if <see cref="Seed"/> is null. /// Name of a base seed prototype that is used if <see cref="Seed"/> is null.
/// </summary> /// </summary>

View File

@@ -104,11 +104,12 @@ public sealed partial class BotanySystem : EntitySystem
/// <summary> /// <summary>
/// Spawns a new seed packet on the floor at a position, then tries to put it in the user's hands if possible. /// Spawns a new seed packet on the floor at a position, then tries to put it in the user's hands if possible.
/// </summary> /// </summary>
public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user) public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user, float? healthOverride = null)
{ {
var seed = Spawn(proto.PacketPrototype, coords); var seed = Spawn(proto.PacketPrototype, coords);
var seedComp = EnsureComp<SeedComponent>(seed); var seedComp = EnsureComp<SeedComponent>(seed);
seedComp.Seed = proto; seedComp.Seed = proto;
seedComp.HealthOverride = healthOverride;
var name = Loc.GetString(proto.Name); var name = Loc.GetString(proto.Name);
var noun = Loc.GetString(proto.Noun); var noun = Loc.GetString(proto.Noun);

View File

@@ -71,6 +71,17 @@ public sealed class PlantHolderSystem : EntitySystem
} }
} }
private int GetCurrentGrowthStage(Entity<PlantHolderComponent> entity)
{
var (uid, component) = entity;
if (component.Seed == null)
return 0;
var result = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
return result;
}
private void OnExamine(Entity<PlantHolderComponent> entity, ref ExaminedEvent args) private void OnExamine(Entity<PlantHolderComponent> entity, ref ExaminedEvent args)
{ {
if (!args.IsInDetailsRange) if (!args.IsInDetailsRange)
@@ -148,6 +159,7 @@ public sealed class PlantHolderSystem : EntitySystem
if (!_botany.TryGetSeed(seeds, out var seed)) if (!_botany.TryGetSeed(seeds, out var seed))
return; return;
float? seedHealth = seeds.HealthOverride;
var name = Loc.GetString(seed.Name); var name = Loc.GetString(seed.Name);
var noun = Loc.GetString(seed.Noun); var noun = Loc.GetString(seed.Noun);
_popup.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message", _popup.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
@@ -157,7 +169,14 @@ public sealed class PlantHolderSystem : EntitySystem
component.Seed = seed; component.Seed = seed;
component.Dead = false; component.Dead = false;
component.Age = 1; component.Age = 1;
component.Health = component.Seed.Endurance; if (seedHealth is float realSeedHealth)
{
component.Health = realSeedHealth;
}
else
{
component.Health = component.Seed.Endurance;
}
component.LastCycle = _gameTiming.CurTime; component.LastCycle = _gameTiming.CurTime;
QueueDel(args.Used); QueueDel(args.Used);
@@ -262,16 +281,15 @@ public sealed class PlantHolderSystem : EntitySystem
return; return;
} }
component.Health -= (_random.Next(3, 5) * 10); if (GetCurrentGrowthStage(entity) <= 1)
if (!component.Harvest)
{ {
_popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample"), args.User); _popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample-message"), args.User);
return; return;
} }
component.Health -= (_random.Next(3, 5) * 10);
component.Seed.Unique = false; component.Seed.Unique = false;
var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User); var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health);
_randomHelper.RandomOffset(seed, 0.25f); _randomHelper.RandomOffset(seed, 0.25f);
var displayName = Loc.GetString(component.Seed.DisplayName); var displayName = Loc.GetString(component.Seed.DisplayName);
_popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message", _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
@@ -904,7 +922,7 @@ public sealed class PlantHolderSystem : EntitySystem
} }
else if (component.Age < component.Seed.Maturation) else if (component.Age < component.Seed.Maturation)
{ {
var growthStage = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation)); var growthStage = GetCurrentGrowthStage((uid, component));
_appearance.SetData(uid, PlantHolderVisuals.PlantRsi, component.Seed.PlantRsi.ToString(), app); _appearance.SetData(uid, PlantHolderVisuals.PlantRsi, component.Seed.PlantRsi.ToString(), app);
_appearance.SetData(uid, PlantHolderVisuals.PlantState, $"stage-{growthStage}", app); _appearance.SetData(uid, PlantHolderVisuals.PlantState, $"stage-{growthStage}", app);

View File

@@ -32,4 +32,4 @@ plant-holder-component-light-improper-warning = The [color=yellow]improper light
plant-holder-component-heat-improper-warning = The [color=orange]improper temperature level alert[/color] is blinking. plant-holder-component-heat-improper-warning = The [color=orange]improper temperature level alert[/color] is blinking.
plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking. plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking.
plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking. plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking.
plant-holder-component-early-sample = It is not ready to sample, but you cut a bit of the plant anyway. plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet.