new BUI for planting

Author: SkaldetSkaeg

Content.Shared/SS220/CultYogg/MiGo/CultYoggSeedsPrototype.cs

@@ -0,0 +1,29 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Content.Shared.Stacks;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.SS220.CultYogg.MiGo;
+
+[Prototype("cultYoggSeeds")]
+[Serializable, NetSerializable]
+public sealed partial class CultYoggSeedsPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// What type of seed we will plant
+    /// </summary>
+    [DataField("seed", required: true)]
+    public EntProtoId SeedProtoId { get; private set; }
+
+    /// <summary>
+    /// What type of plant we will get in result
+    /// Required to see result
+    /// </summary>
+    [DataField("plant")]
+    public EntProtoId PlantProtoId { get; private set; }
+}

Content.Shared/SS220/CultYogg/MiGo/MiGoErectBuiState.cs

@@ -14,9 +14,10 @@ public sealed class MiGoErectBuiState : BoundUserInterfaceState
 }
 
 [Serializable, NetSerializable]
-public enum MiGoErectUiKey : byte
+public enum MiGoUiKey : byte
 {
-    Key
+    Erect,
+    Plant
 }
 
 [Serializable, NetSerializable]

Content.Shared/SS220/CultYogg/MiGo/MiGoPlantBuiState.cs

@@ -1,20 +1,11 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
-using Content.Shared.SS220.CultYogg.Buildings;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SS220.CultYogg.MiGo;
 
 [Serializable, NetSerializable]
 public sealed class MiGoPlantBuiState : BoundUserInterfaceState
 {
-    public List<CultYoggBuildingPrototype> Seeds = [];
-}
-
-[Serializable, NetSerializable]
-public enum MiGoPlantUiKey : byte
-{
-    Key
+    public List<CultYoggSeedsPrototype> Seeds = [];
 }

Content.Shared/SS220/CultYogg/MiGo/SharedMiGoErectSystem.cs

@@ -20,7 +20,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace Content.Shared.SS220.CultYogg.MiGo;
 
@@ -46,7 +45,6 @@ public sealed class SharedMiGoErectSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<MiGoComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
         SubscribeLocalEvent<MiGoComponent, MiGoErectBuildMessage>(OnBuildMessage);
         SubscribeLocalEvent<MiGoComponent, MiGoErectEraseMessage>(OnEraseMessage);
         SubscribeLocalEvent<MiGoComponent, MiGoErectDoAfterEvent>(OnDoAfterErect);
@@ -62,15 +60,7 @@ public override void Initialize()
 
     public void OpenUI(Entity<MiGoComponent> entity, ActorComponent actor)
     {
-        _userInterfaceSystem.TryToggleUi(entity.Owner, MiGoErectUiKey.Key, actor.PlayerSession);
-    }
-
-    private void OnBoundUIOpened(Entity<MiGoComponent> entity, ref BoundUIOpenedEvent args)
-    {
-        _userInterfaceSystem.SetUiState(args.Entity, MiGoErectUiKey.Key, new MiGoErectBuiState()
-        {
-            Buildings = _prototypeManager.GetInstances<CultYoggBuildingPrototype>().Values.ToList(),
-        });
+        _userInterfaceSystem.TryToggleUi(entity.Owner, MiGoUiKey.Erect, actor.PlayerSession);
     }
 
     private void OnBuildMessage(Entity<MiGoComponent> entity, ref MiGoErectBuildMessage args)

Content.Shared/SS220/CultYogg/MiGo/SharedMiGoPalntSystem.cs

@@ -1,6 +1,5 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
-using Content.Shared.SS220.CultYogg.Buildings;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using System.Linq;
@@ -18,18 +17,8 @@ public override void Initialize()
         //SubscribeLocalEvent<MiGoComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
     }
 
-    /*
     public void OpenUI(Entity<MiGoComponent> entity, ActorComponent actor)
     {
-        _userInterfaceSystem.TryToggleUi(entity.Owner, MiGoPlantUiKey.Key, actor.PlayerSession);
-    }
-    */
-
-    private void OnBoundUIOpened(Entity<MiGoComponent> entity, ref BoundUIOpenedEvent args)
-    {
-        _userInterfaceSystem.SetUiState(args.Entity, MiGoPlantUiKey.Key, new MiGoPlantBuiState()
-        {
-            Seeds = _prototypeManager.GetInstances<CultYoggBuildingPrototype>().Values.ToList(),
-        });
+        _userInterfaceSystem.TryToggleUi(entity.Owner, MiGoUiKey.Plant, actor.PlayerSession);
     }
 }

Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs

@@ -22,6 +22,8 @@
 using System.Linq;
 using Content.Shared.Item;
 using Content.Shared.Hands;
+using Content.Shared.SS220.CultYogg.Buildings;
+using Robust.Shared.Prototypes;
 
 
 namespace Content.Shared.SS220.CultYogg.MiGo;
@@ -35,13 +37,16 @@ public abstract class SharedMiGoSystem : EntitySystem
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedMiGoErectSystem _miGoErectSystem = default!;
+    [Dependency] private readonly SharedMiGoPlantSystem _miGoPlantSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedCultYoggHealSystem _heal = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly SharedEyeSystem _eye = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _userInterfaceSystem = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
 
 
     //[Dependency] private readonly CultYoggRuleSystem _cultYoggRule = default!; //maybe use this for enslavement
@@ -68,6 +73,8 @@ public override void Initialize()
         SubscribeLocalEvent<MiGoComponent, ThrowAttemptEvent>(OnThrowAttempt);
         SubscribeLocalEvent<MiGoComponent, BeingUsedAttemptEvent>(OnBeingUsedAttempt);
         SubscribeLocalEvent<MiGoComponent, GettingPickedUpAttemptEvent>(OnGettingPickedUpAttempt);
+
+        SubscribeLocalEvent<MiGoComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
     }
 
     protected virtual void OnCompInit(Entity<MiGoComponent> uid, ref ComponentStartup args)
@@ -80,7 +87,26 @@ protected virtual void OnCompInit(Entity<MiGoComponent> uid, ref ComponentStartu
         _actions.AddAction(uid, ref uid.Comp.MiGoSacrificeActionEntity, uid.Comp.MiGoSacrificeAction);
     }
 
+    private void OnBoundUIOpened(Entity<MiGoComponent> entity, ref BoundUIOpenedEvent args)
+    {
+        if (args.UiKey.ToString() == "Erect")
+        {
+            _userInterfaceSystem.SetUiState(args.Entity, args.UiKey, new MiGoErectBuiState()
+            {
+                Buildings = _proto.GetInstances<CultYoggBuildingPrototype>().Values.ToList(),
+            });
+            return;
+        }
 
+        if (args.UiKey.ToString() == "Plant")
+        {
+            _userInterfaceSystem.SetUiState(args.Entity, args.UiKey, new MiGoPlantBuiState()
+            {
+                Seeds = _proto.GetInstances<CultYoggSeedsPrototype>().Values.ToList(),
+            });
+            return;
+        }
+    }
 
     #region Heal
     private void MiGoHeal(Entity<MiGoComponent> uid, ref MiGoHealEvent args)
@@ -128,7 +154,7 @@ private void MiGoPlant(Entity<MiGoComponent> entity, ref MiGoPlantEvent args)
         if (!entity.Comp.IsPhysicalForm)
             return;
 
-        _miGoErectSystem.OpenUI(entity, actor);
+        _miGoPlantSystem.OpenUI(entity, actor);
     }
     #endregion
 

Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/migo.yml

@@ -31,8 +31,10 @@
     voice: forester
   - type: UserInterface
     interfaces:
-      enum.MiGoErectUiKey.Key:
+      enum.MiGoUiKey.Erect:
         type: MiGoErectBoundUserInterface
+      enum.MiGoUiKey.Plant:
+        type: FungusMachineBoundUserInterface
   - type: ShowCultYoggIcons
   - type: NpcFactionMember
     factions: