tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some mispredict reconciliation issues. (#6319)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Leon Friedrich
2022-01-31 05:34:48 +13:00
committed by GitHub
parent 90b2f716a4
commit d40bcc9168
15 changed files with 110 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -592,30 +592,31 @@ namespace Content.Server.Botany.Components
if (Dead)
{
appearanceComponent.SetData(PlantHolderVisuals.Plant,
new SpriteSpecifier.Rsi(Seed.PlantRsi, "dead"));
appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
appearanceComponent.SetData(PlantHolderVisuals.PlantState, "dead");
}
else if (Harvest)
{
appearanceComponent.SetData(PlantHolderVisuals.Plant,
new SpriteSpecifier.Rsi(Seed.PlantRsi, "harvest"));
appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
appearanceComponent.SetData(PlantHolderVisuals.PlantState, "harvest");
}
else if (Age < Seed.Maturation)
{
var growthStage = Math.Max(1, (int) ((Age * Seed.GrowthStages) / Seed.Maturation));
appearanceComponent.SetData(PlantHolderVisuals.Plant,
new SpriteSpecifier.Rsi(Seed.PlantRsi, $"stage-{growthStage}"));
appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
appearanceComponent.SetData(PlantHolderVisuals.PlantState, $"stage-{growthStage}");
_lastProduce = Age;
}
else
{
appearanceComponent.SetData(PlantHolderVisuals.Plant,
new SpriteSpecifier.Rsi(Seed.PlantRsi, $"stage-{Seed.GrowthStages}"));
appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
appearanceComponent.SetData(PlantHolderVisuals.PlantState, $"stage-{Seed.GrowthStages}");
}
}
else
{
appearanceComponent.SetData(PlantHolderVisuals.Plant, SpriteSpecifier.Invalid);
appearanceComponent.SetData(PlantHolderVisuals.PlantState, "");
appearanceComponent.SetData(PlantHolderVisuals.HealthLight, false);
}