Ed 10 12 2024 aah (#656)

* fix ghost zlevel moving

* stairways autorotation

* ladders sprite update

* slow space swimming

* fix wrong wood spawn

* deadly ocean

* Update zLevels.yml

Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs

@@ -108,9 +108,9 @@ public sealed class CP14SpawnRandomDemiplaneJob : Job<bool>
         }
 
         //Setup gravity
-        var gravity = _entManager.EnsureComponent<GravityComponent>(DemiplaneMapUid);
+        var gravity = _entManager.EnsureComponent<GravityComponent>(grid);
         gravity.Enabled = true;
-        _entManager.Dirty(DemiplaneMapUid, gravity, metadata);
+        _entManager.Dirty(grid, gravity, metadata);
 
         // Setup default atmos
         var moles = new float[Atmospherics.AdjustedNumberOfGases];

Content.Server/_CP14/MapDamage/CP14DamageableByMapComponent.cs

@@ -0,0 +1,17 @@
+namespace Content.Server._CP14.MapDamage;
+
+/// <summary>
+/// can take damage from being directly on the map (not on the grid)
+/// </summary>
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class CP14DamageableByMapComponent : Component
+{
+    [DataField, AutoPausedField]
+    public TimeSpan NextDamageTime = TimeSpan.Zero;
+
+    [DataField]
+    public bool Enabled = false;
+
+    [DataField]
+    public Entity<CP14MapDamageComponent>? CurrentMap;
+}

Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs

@@ -0,0 +1,24 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server._CP14.MapDamage;
+
+/// <summary>
+/// The map deals damage to entities that are on it (not on the grid)
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14MapDamageComponent : Component
+{
+    //Damage every second
+    [DataField]
+    public DamageSpecifier Damage = new()
+    {
+        DamageDict = new Dictionary<string, FixedPoint2>()
+        {
+            {"Asphyxiation", 10}
+        }
+    };
+
+    [DataField]
+    public float StaminaDamage = 7f;
+}

Content.Server/_CP14/MapDamage/CP14MapDamageSystem.cs

@@ -0,0 +1,82 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server._CP14.MapDamage;
+
+public sealed partial class CP14MapDamageSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly StaminaSystem _stamina = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14DamageableByMapComponent, EntParentChangedMessage>(OnParentChanged);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<CP14DamageableByMapComponent, DamageableComponent, MobStateComponent>();
+        while (query.MoveNext(out var uid, out var damage, out var damageable, out var mobState))
+        {
+            if (!damage.Enabled)
+                continue;
+
+            if (damage.NextDamageTime > _timing.CurTime)
+                continue;
+
+            damage.NextDamageTime = _timing.CurTime + TimeSpan.FromSeconds(2f);
+
+            if (damage.CurrentMap is null)
+                continue;
+
+            if (!_mobState.IsAlive(uid, mobState))
+                continue;
+
+            _damageable.TryChangeDamage(uid, damage.CurrentMap.Value.Comp.Damage, damageable: damageable);
+            _stamina.TakeStaminaDamage(uid, damage.CurrentMap.Value.Comp.StaminaDamage);
+        }
+    }
+
+    private void OnParentChanged(Entity<CP14DamageableByMapComponent> ent, ref EntParentChangedMessage args)
+    {
+        DisableDamage(ent);
+        if (args.OldParent == null || TerminatingOrDeleted(ent))
+            return;
+
+        var newParent = _transform.GetParentUid(ent);
+        if (!TryComp<CP14MapDamageComponent>(newParent, out var mapDamage))
+            return;
+
+        EnableDamage(ent, (newParent, mapDamage));
+    }
+
+    private void DisableDamage(Entity<CP14DamageableByMapComponent> ent)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        ent.Comp.Enabled = false;
+        ent.Comp.CurrentMap = null;
+        Dirty(ent);
+    }
+
+    private void EnableDamage(Entity<CP14DamageableByMapComponent> ent, Entity<CP14MapDamageComponent> map)
+    {
+        if (ent.Comp.Enabled)
+            return;
+
+        ent.Comp.Enabled = true;
+        ent.Comp.CurrentMap = map;
+        Dirty(ent);
+    }
+}

Content.Server/_CP14/ZLevels/EntitySystems/CP14StationZLevelsSystem.Portals.cs

@@ -44,6 +44,7 @@ public sealed partial class CP14StationZLevelsSystem
 
         var otherSidePortal = Spawn(autoPortal.Comp.OtherSideProto, targetMapPos);
 
+        _transform.SetWorldRotation(otherSidePortal, _transform.GetWorldRotation(autoPortal));
         if (_linkedEntity.TryLink(autoPortal, otherSidePortal, true))
             RemComp<CP14ZLevelAutoPortalComponent>(autoPortal);
     }