Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…

…ngines into merge-of-the-e-and-the-e

Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs

@@ -0,0 +1,28 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles increase or decrease of plant potency.
+/// </summary>
+
+public sealed partial class PlantAdjustPotency : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        if (plantHolderComp.Seed == null)
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+
+        plantHolderComp.Seed.Potency = Math.Max(plantHolderComp.Seed.Potency + Amount, 1);
+    }
+}

Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs

@@ -0,0 +1,42 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles removal of seeds on a plant.
+/// </summary>
+
+public sealed partial class PlantDestroySeeds : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (
+            !args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+            || plantHolderComp.Seed == null
+            || plantHolderComp.Dead
+            || plantHolderComp.Seed.Immutable
+        )
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var popupSystem = args.EntityManager.System<SharedPopupSystem>();
+
+        if (plantHolderComp.Seed.Seedless == false)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            popupSystem.PopupEntity(
+                Loc.GetString("botany-plant-seedsdestroyed"),
+                args.TargetEntity,
+                PopupType.SmallCaution
+            );
+            plantHolderComp.Seed.Seedless = true;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-remove", ("chance", Probability));
+}

Content.Server/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs

@@ -0,0 +1,38 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles restoral of seeds on a plant.
+/// </summary>
+
+public sealed partial class PlantRestoreSeeds : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (
+            !args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+            || plantHolderComp.Seed == null
+            || plantHolderComp.Dead
+            || plantHolderComp.Seed.Immutable
+        )
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var popupSystem = args.EntityManager.System<SharedPopupSystem>();
+
+        if (plantHolderComp.Seed.Seedless)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            popupSystem.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), args.TargetEntity);
+            plantHolderComp.Seed.Seedless = false;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-add", ("chance", Probability));
+}

Content.Server/Shuttles/Components/ShuttleComponent.cs

@@ -64,5 +64,17 @@ public sealed partial class ShuttleComponent : Component
 
         [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
         public float AngularDamping = 0.05f;
+
+        /// <summary>
+        ///     How far from the shuttle's bounding box will it crush and destroy things?
+        /// </summary>
+        [DataField]
+        public float SmimshDistance = 0.2f;
+
+        /// <summary>
+        ///     Whether or not the shuttle calls the DoTheDinosaur function upon FTL'ing. I'm not explaining this, you owe it to yourself to do a code search for it.
+        /// </summary>
+        [DataField]
+        public bool DoTheDinosaur = true;
     }
 }

Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs

@@ -20,5 +20,35 @@ public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleCompon
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("whitelistSpecific")]
         public List<EntityUid> FTLWhitelist = new List<EntityUid>();
+
+        /// <summary>
+        ///     How far the shuttle is allowed to jump(in meters).
+        ///     TODO: This technically won't work until this component is migrated to Shared. The client console screen will only ever know the hardcoded 512 meter constant otherwise. Fix it in ShuttleMapControl.xaml.cs when that's done.
+        /// </summary>
+        [DataField]
+        public float FTLRange = 512f;
+
+        /// <summary>
+        ///     If the shuttle is allowed to "Forcibly" land on planet surfaces, destroying anything it lands on. Used for SSTO capable shuttles.
+        /// </summary>
+        [DataField]
+        public bool FtlToPlanets;
+
+        /// <summary>
+        ///     If the shuttle is allowed to forcibly land on stations, smimshing everything it lands on. This is where the hypothetical "Nukie drop pod" comes into play.
+        /// </summary>
+        [DataField]
+        public bool IgnoreExclusionZones;
+
+        /// <summary>
+        ///     If the shuttle is only ever allowed to FTL once. Also used for the hypothetical "Nukie drop pod."
+        /// </summary>
+        [DataField]
+        public bool OneWayTrip;
+
+        /// <summary>
+        ///     Tracks whether or not the above "One way trip" has been taken.
+        /// </summary>
+        public bool OneWayTripTaken;
     }
 }

Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs

@@ -114,6 +114,12 @@ private void GetExclusions(ref List<ShuttleExclusionObject>? exclusions)
     /// </summary>
     private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates targetCoordinates, Angle targetAngle, MapId targetMap)
     {
+        if (ent.Comp.OneWayTrip && ent.Comp.OneWayTripTaken)
+        {
+            // TODO: Play a popup and a message in chat explaining you've already taken the one way trip.
+            return;
+        }
+
         var consoleUid = GetDroneConsole(ent.Owner);
 
         if (consoleUid == null)
@@ -143,7 +149,7 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         List<ShuttleExclusionObject>? exclusions = null;
         GetExclusions(ref exclusions);
 
-        if (!_shuttle.FTLFree(shuttleUid.Value, targetCoordinates, targetAngle, exclusions))
+        if (!_shuttle.FTLFree(shuttleUid.Value, targetCoordinates, targetAngle, exclusions, ent.Comp.FtlToPlanets, ent.Comp.IgnoreExclusionZones, ent.Comp.FTLRange))
         {
             return;
         }
@@ -163,5 +169,7 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         RaiseLocalEvent(ref ev);
 
         _shuttle.FTLToCoordinates(shuttleUid.Value, shuttleComp, adjustedCoordinates, targetAngle);
+        if (ent.Comp.OneWayTrip)
+            ent.Comp.OneWayTripTaken = true;
     }
 }

Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs

@@ -381,7 +381,9 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         var uid = entity.Owner;
         var comp = entity.Comp1;
         var xform = _xformQuery.GetComponent(entity);
-        DoTheDinosaur(xform);
+
+        if (entity.Comp2.DoTheDinosaur)
+            DoTheDinosaur(xform);
 
         comp.State = FTLState.Travelling;
         var fromMapUid = xform.MapUid;
@@ -558,7 +560,7 @@ private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
         comp.StateTime = StartEndTime.FromCurTime(_gameTiming, FTLCooldown);
         _console.RefreshShuttleConsoles(uid);
         _mapManager.SetMapPaused(mapId, false);
-        Smimsh(uid, xform: xform);
+        Smimsh(uid, xform: xform, smimshDistance: entity.Comp2.SmimshDistance);
 
         var ftlEvent = new FTLCompletedEvent(uid, _mapSystem.GetMap(mapId));
         RaiseLocalEvent(uid, ref ftlEvent, true);
@@ -959,7 +961,7 @@ public bool TryFTLProximity(Entity<TransformComponent?> shuttle, EntityCoordinat
     /// <summary>
     /// Flattens / deletes everything under the grid upon FTL.
     /// </summary>
-    private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridComponent? grid = null, TransformComponent? xform = null)
+    private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridComponent? grid = null, TransformComponent? xform = null, float smimshDistance = 0.2f)
     {
         if (!Resolve(uid, ref manager, ref grid, ref xform) || xform.MapUid == null)
             return;
@@ -981,7 +983,7 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
 
             // Shift it slightly
             // Create a small border around it.
-            aabb = aabb.Enlarged(0.2f);
+            aabb = aabb.Enlarged(smimshDistance);
             aabbs.Add(aabb);
 
             // Handle clearing biome stuff as relevant.

Content.Server/Station/Components/StationBiomeComponent.cs

@@ -1,5 +1,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Parallax.Biomes;
+using Content.Shared.Parallax.Biomes.Markers;
+using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Station.Components;
@@ -13,6 +15,24 @@ public sealed partial class StationBiomeComponent : Component
     [DataField(required: true)]
     public ProtoId<BiomeTemplatePrototype> Biome = "Grasslands";
 
+    /// <summary>
+    ///     Adds a list of biome marker layers after creating the planet. Useful if you wish to make your planet station also have ores to mine.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<BiomeMarkerLayerPrototype>> BiomeLayers;
+
+    /// <summary>
+    ///     Whether your station comes with one or more complimentary dungeons somewhere in the world.
+    /// </summary>
+    [DataField]
+    public List<DungeonConfigPrototype> Dungeons;
+
+    [DataField]
+    public float DungeonMinDistance = 100f;
+
+    [DataField]
+    public float DungeonMaxDistance = 500f;
+
     // If null, its random
     [DataField]
     public int? Seed = null;

Content.Server/Station/Systems/StationBiomeSystem.cs

@@ -1,17 +1,22 @@
 using Content.Server.Parallax;
+using Content.Server.Procedural;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Server.Station.Systems;
-using Robust.Shared.Map;
+using Content.Shared.Parallax.Biomes;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 
 namespace Content.Server.Station.Systems;
 public sealed partial class StationBiomeSystem : EntitySystem
 {
     [Dependency] private readonly BiomeSystem _biome = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
+    [Dependency] private readonly DungeonSystem _dungeon = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -28,8 +33,32 @@ private void OnStationPostInit(Entity<StationBiomeComponent> map, ref StationPos
         if (station == null) return;
 
         var mapId = Transform(station.Value).MapID;
-        var mapUid = _mapManager.GetMapEntityId(mapId);
+        if (!_mapSystem.TryGetMap(mapId, out var mapUid)
+            || mapUid is null) // WHAT, IT'S LITERALLY CALLED TRYGET. WHY DO I NEED TO CHECK NULL?
+            return;
+
+        _biome.EnsurePlanet(mapUid!.Value, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
+
+        if (!TryComp<BiomeComponent>(mapUid, out var biomeComp))
+            return; // Yea we JUST made a biome component one line above this trycomp. It turns out I need an engine PR to retrieve the component just added.
+                    // Imagine my frustration. On the other hand AddComps like above aren't guaranteed to return a component anyway.
+
+        foreach (var layer in map.Comp.BiomeLayers)
+        {
+            if (biomeComp.MarkerLayers.Contains(layer))
+                continue;
+
+            biomeComp.MarkerLayers.Add(layer);
+            biomeComp.ForcedMarkerLayers.Add(layer);
+        }
+        if (!TryComp(mapUid, out MapGridComponent? mapGrid))
+            return;
 
-        _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
+        foreach (var dungeonProto in map.Comp.Dungeons)
+        {
+            // TODO: Pester TCJ about adding a _random.NextVector2i to Supermatter Engine, as well as adding methods for "officially" casting vector 2s as integer vectors.
+            var distVector = (Vector2i) _random.NextVector2(map.Comp.DungeonMinDistance, map.Comp.DungeonMaxDistance).Rounded();
+            _dungeon.GenerateDungeon(dungeonProto, mapUid!.Value, mapGrid, distVector, _random.Next());
+        }
     }
 }

Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 
 namespace Content.Server.WhiteDream.BloodCult.Runes.Revive;
@@ -14,9 +14,12 @@ public sealed partial class CultRuneReviveComponent : Component
     {
         DamageDict = new Dictionary<string, FixedPoint2>
         {
-            ["Brute"] = -100,
-            ["Burn"] = -100,
-            ["Heat"] = -100,
+            ["Blunt"] = -33,
+            ["Slash"] = -33,
+            ["Piercing"] = -33,
+            ["Heat"] = -33,
+            ["Cold"] = -33,
+            ["Shock"] = -33,
             ["Asphyxiation"] = -100,
             ["Bloodloss"] = -100,
             ["Poison"] = -50,

Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibComponent.cs

@@ -0,0 +1,16 @@
+using Content.Shared.Atmos;
+
+namespace Content.Server._EE.SpawnGasOnGib;
+
+// <summary>
+//   Spawns a gas mixture upon being gibbed.
+// </summary>
+[RegisterComponent]
+public sealed partial class SpawnGasOnGibComponent : Component
+{
+    // <summary>
+    //   The gas mixture to spawn.
+    // </summary>
+    [DataField("gasMixture", required: true)]
+    public GasMixture Gas = new();
+}

Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibSystem.cs

@@ -0,0 +1,24 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
+
+namespace Content.Server._EE.SpawnGasOnGib;
+
+public sealed partial class SpawnGasOnGibSystem : EntitySystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmos = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpawnGasOnGibComponent, BeingGibbedEvent>(OnBeingGibbed);
+    }
+
+    private void OnBeingGibbed(EntityUid uid, SpawnGasOnGibComponent comp, BeingGibbedEvent args)
+    {
+        if (_atmos.GetContainingMixture(uid, false, true) is not { } air)
+            return;
+
+        _atmos.Merge(air, comp.Gas);
+    }
+}