Revert "Try to predict"

This reverts commit 48a5620099.

Content.Client/_CP14/Fishing/CP14FishingOverlay.cs

@@ -0,0 +1,149 @@
+using System.Numerics;
+using Content.Client.Resources;
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Prototypes;
+using Content.Shared._CP14.Fishing.Systems;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CP14.Fishing;
+
+public sealed class CP14FishingOverlay : Overlay
+{
+    [Dependency] private readonly IComponentFactory _factory = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    private readonly SpriteSystem _sprite;
+    private readonly TransformSystem _transform;
+    private readonly CP14SharedFishingProcessSystem _sharedFishingProcess;
+
+    private Texture _backgroundTexture = default!;
+    private Texture _handleTopTexture = default!;
+    private Texture _handleMiddleTexture = default!;
+    private Texture _handleBottomTexture = default!;
+
+    private Texture _lootTexture = default!;
+
+    private Vector2 _backgroundOffset;
+    private Vector2 _backgroundHandleOffset;
+    private Vector2 _backgroundHandleSize;
+
+    private Vector2 _progressOffset;
+    private Vector2 _progressSize;
+
+    private EntityUid _process = EntityUid.Invalid;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    public CP14FishingOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+
+        _sprite = _entity.System<SpriteSystem>();
+        _transform = _entity.System<TransformSystem>();
+        _sharedFishingProcess = _entity.System<CP14SharedFishingProcessSystem>();
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (_player.LocalEntity is not { } localEntity)
+            return;
+
+        if (!_sharedFishingProcess.TryGetByUser(localEntity, out var fishingProcess))
+            return;
+
+        // Refresh the texture cache, with a new fishing process
+        if (_process != fishingProcess.Value.Owner)
+        {
+            _process = fishingProcess.Value.Owner;
+
+            UpdateCachedStyleSheet(_sharedFishingProcess.GetStyle(fishingProcess.Value));
+
+            var prototype = _prototype.Index(fishingProcess.Value.Comp.LootProtoId);
+            var iconPath = CP14FishingIconComponent.DefaultTexturePath;
+
+            if (prototype.Components.TryGetComponent(_factory.GetComponentName(typeof(CP14FishingIconComponent)), out var iconComponent))
+            {
+                var comp = (CP14FishingIconComponent) iconComponent;
+                iconPath = comp.TexturePath;
+            }
+
+            _lootTexture = _resourceCache.GetTexture(iconPath);
+        }
+
+        // Getting the position of the player we will be working from
+        var worldPosition = _transform.GetWorldPosition(localEntity);
+
+        // Calculate the shift of the player relative to the bottom of the coordinates
+        var playerOffset = fishingProcess.Value.Comp.PlayerPositionNormalized * _backgroundHandleSize;
+        var playerHalfSize = fishingProcess.Value.Comp.PlayerHalfSizeNormalized * _backgroundHandleSize;
+
+        var lootOffset = fishingProcess.Value.Comp.LootPositionNormalized * _backgroundHandleSize + Vector2.UnitX * _backgroundHandleSize.X / 2;
+
+        DrawBackground(args.WorldHandle, worldPosition - _backgroundOffset);
+        DrawProgress(args.WorldHandle, worldPosition - _backgroundOffset + _progressOffset, _progressSize, fishingProcess.Value.Comp.Progress);
+        DrawHandle(args.WorldHandle, worldPosition - _backgroundOffset + _backgroundHandleOffset + playerOffset, playerHalfSize);
+        DrawLoot(args.WorldHandle, worldPosition - _backgroundOffset + _backgroundHandleOffset + lootOffset);
+    }
+
+    private void DrawBackground(DrawingHandleWorld handle, Vector2 position)
+    {
+        handle.DrawTexture(_backgroundTexture, position);
+    }
+
+    private void DrawProgress(DrawingHandleWorld handle, Vector2 position, Vector2 size, float progress)
+    {
+        var vectorA = position;
+        var vectorB = position + new Vector2(size.X, size.Y * progress);
+        var box = new Box2(vectorA, vectorB);
+
+        handle.DrawRect(box, Color.Aqua);
+    }
+
+    private void DrawHandle(DrawingHandleWorld handle, Vector2 position, Vector2 halfSize)
+    {
+        var cursor = position - halfSize;
+
+        // Bottom
+        handle.DrawTexture(_handleBottomTexture, cursor);
+        cursor += new Vector2(0, _handleBottomTexture.Height / 32f);
+
+        // Middle
+        while (cursor.Y < position.Y + halfSize.Y - _handleTopTexture.Height / 32f)
+        {
+            handle.DrawTexture(_handleMiddleTexture, cursor);
+            cursor += new Vector2(0, _handleMiddleTexture.Height / 32f);
+        }
+
+        // Front
+        handle.DrawTexture(_handleTopTexture, cursor);
+    }
+
+    private void DrawLoot(DrawingHandleWorld handle, Vector2 position)
+    {
+        handle.DrawTexture(_lootTexture, position - _lootTexture.Size / 64f);
+    }
+
+    private void UpdateCachedStyleSheet(CP14FishingProcessStyleSheetPrototype styleSheet)
+    {
+        _backgroundTexture = _resourceCache.GetTexture(styleSheet.Background.Texture);
+        _handleTopTexture = _resourceCache.GetTexture(styleSheet.Handle.TopTexture);
+        _handleMiddleTexture = _resourceCache.GetTexture(styleSheet.Handle.MiddleTexture);
+        _handleBottomTexture = _resourceCache.GetTexture(styleSheet.Handle.BottomTexture);
+
+        _backgroundOffset = styleSheet.Background.Offset + Vector2.UnitX * _backgroundTexture.Width / 32f;
+
+        _backgroundHandleOffset = styleSheet.Background.HandleOffset;
+        _backgroundHandleSize = styleSheet.Background.HandleSize;
+
+        _progressOffset = styleSheet.Background.ProgressOffset;
+        _progressSize = styleSheet.Background.ProgressSize;
+    }
+}

Content.Client/_CP14/Fishing/CP14FishingOverlaySystem.cs

@@ -0,0 +1,23 @@
+using Content.Client.Overlays;
+using Robust.Client.Graphics;
+
+namespace Content.Client._CP14.Fishing;
+
+public sealed class CP14FishingOverlaySystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _overlay.AddOverlay(new CP14FishingOverlay());
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _overlay.RemoveOverlay<StencilOverlay>();
+    }
+}

Content.Client/_CP14/Fishing/CP14FishingProcessSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared._CP14.Fishing.Systems;
+
+namespace Content.Client._CP14.Fishing;
+
+public sealed class CP14FishingProcessSystem : CP14SharedFishingProcessSystem;

Content.Client/_CP14/Fishing/CP14FishingRodSystem.cs

@@ -0,0 +1,35 @@
+using Content.Client.Hands.Systems;
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Systems;
+using Robust.Client.GameObjects;
+using Robust.Shared.Input;
+using Robust.Shared.Timing;
+
+namespace Content.Client._CP14.Fishing;
+
+public sealed class CP14FishingRodSystem : CP14SharedFishingRodSystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly InputSystem _input = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var handUid = _hands.GetActiveHandEntity();
+
+        if (!TryComp<CP14FishingRodComponent>(handUid, out var fishingRodComponent))
+            return;
+
+        var reelKey = _input.CmdStates.GetState(EngineKeyFunctions.UseSecondary) == BoundKeyState.Down;
+
+        if (fishingRodComponent.Reeling == reelKey)
+            return;
+
+        RaisePredictiveEvent(new RequestFishingRodReelMessage(reelKey));
+    }
+}

Content.Server/_CP14/Fishing/CP14FishingProcessSystem.cs

@@ -0,0 +1,121 @@
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Core;
+using Content.Shared._CP14.Fishing.Core.Behaviors;
+using Content.Shared._CP14.Fishing.Events;
+using Content.Shared._CP14.Fishing.Systems;
+using Content.Shared.Throwing;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server._CP14.Fishing;
+
+public sealed class CP14FishingProcessSystem : CP14SharedFishingProcessSystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+    [Dependency] private readonly CP14FishingPoolSystem _pool = default!;
+
+    /*
+    private readonly TimeSpan _dirtyDelay = TimeSpan.FromTicks(10000000000000);
+    private TimeSpan _dirtyDelayTime;
+    */
+
+    public override void Update(float frameTime)
+    {
+        // DON'T CALL BASE METHOD!!!
+
+        var query = EntityQueryEnumerator<CP14FishingProcessComponent>();
+        while (query.MoveNext(out var entityUid, out var processComponent))
+        {
+            Update((entityUid, processComponent), frameTime * 2);
+        }
+    }
+
+    public override void FishPreUpdate(Entity<CP14FishingProcessComponent> process, Fish fish, float frameTime)
+    {
+        base.FishPreUpdate(process, fish, frameTime);
+
+        fish.UpdateSpeed(_random, _timing);
+        Dirty(process);
+    }
+
+    public override void UpdateDirty(Entity<CP14FishingProcessComponent> process)
+    {
+        base.UpdateDirty(process);
+
+        /*
+        if (_timing.CurTime < _dirtyDelayTime)
+            return;
+
+        _dirtyDelayTime = _timing.CurTime + _dirtyDelay;
+        Dirty(process);
+        */
+    }
+
+    public override void Finish(Entity<CP14FishingProcessComponent> process, bool success)
+    {
+        base.Finish(process, success);
+
+        if (success)
+        {
+            Reward(process);
+        }
+
+        // Raising events before deletion
+        var ev = new CP14FishingFinishedEvent(success);
+        RaiseLocalEvent(process, ref ev, true);
+
+        // Either way, we need to delete the process
+        Stop(process);
+    }
+
+    public override void Reward(Entity<CP14FishingProcessComponent> process)
+    {
+        base.Reward(process);
+
+        var pool = GetPool(process);
+        var rod = GetRod(process);
+
+        var coordinates = Transform(pool).Coordinates;
+        var targetCoordinates = Transform(process.Comp.User!.Value).Coordinates;
+
+        var loot = Spawn(process.Comp.LootProtoId, coordinates);
+
+        _throwing.TryThrow(loot, targetCoordinates, rod.Comp.ThrowPower);
+    }
+
+    public Entity<CP14FishingProcessComponent> Start(
+        Entity<CP14FishingRodComponent> fishingRod,
+        Entity<CP14FishingPoolComponent> fishingPool,
+        EntityUid user)
+    {
+        var process = CreateProcess(fishingRod.Owner);
+        var loot = _pool.GetLootPrototypeId(fishingPool);
+        var style = GetStyle(fishingRod);
+
+        // Save entities
+        process.Comp.FishingRod = fishingRod;
+        process.Comp.FishingPool = fishingPool;
+        process.Comp.User = user;
+
+        process.Comp.Player = new Player(fishingRod.Comp.Size);
+        process.Comp.Fish = new Fish(new MixedBehavior(), _timing.CurTime + TimeSpan.FromSeconds(0.5f));
+
+        process.Comp.LootProtoId = loot;
+        process.Comp.StyleSheet = style;
+
+        Dirty(process);
+
+        Log.Debug($"Started new fishing process at {process}");
+        return process;
+    }
+
+    public Entity<CP14FishingProcessComponent> CreateProcess(EntityUid parent)
+    {
+        var entityUid = SpawnAttachedTo(null, Transform(parent).Coordinates);
+        var ensureComponent = AddComp<CP14FishingProcessComponent>(entityUid);
+
+        return (entityUid, ensureComponent);
+    }
+}

Content.Server/_CP14/Fishing/CP14FishingRodSystem.cs

@@ -0,0 +1,31 @@
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Systems;
+using Content.Shared.Interaction;
+
+namespace Content.Server._CP14.Fishing;
+
+public sealed class CP14FishingRodSystem : CP14SharedFishingRodSystem
+{
+    [Dependency] private readonly CP14FishingProcessSystem _fishingProcess = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14FishingPoolComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
+    }
+
+    private void OnAfterInteractUsing(Entity<CP14FishingPoolComponent> entity, ref AfterInteractUsingEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        if (!TryComp<CP14FishingRodComponent>(args.Used, out var fishingRodComponent))
+            return;
+
+        if (fishingRodComponent.Process is not null)
+            return;
+
+        fishingRodComponent.Process = _fishingProcess.Start((args.Used, fishingRodComponent), entity, args.User);
+    }
+}

Content.Shared/_CP14/Fishing/Components/CP14FishingIconComponent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._CP14.Fishing.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14FishingIconComponent : Component
+{
+    public static readonly ResPath DefaultTexturePath = new("/Textures/_CP14/Interface/Fishing/Icons/default.png");
+
+    [DataField]
+    public ResPath TexturePath = DefaultTexturePath;
+}

Content.Shared/_CP14/Fishing/Components/CP14FishingPoolComponent.cs

@@ -0,0 +1,12 @@
+using Content.Shared._CP14.Fishing.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14FishingPoolComponent : Component
+{
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<CP14FishingPoolLootTablePrototype> LootTable = "Default";
+}

Content.Shared/_CP14/Fishing/Components/CP14FishingProcessComponent.cs

@@ -0,0 +1,65 @@
+using System.Numerics;
+using Content.Shared._CP14.Fishing.Core;
+using Content.Shared._CP14.Fishing.Prototypes;
+using Content.Shared._CP14.Fishing.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Components;
+
+[Access(typeof(CP14SharedFishingProcessSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CP14FishingProcessComponent : Component
+{
+    /**
+     * Boxes
+     */
+
+    [ViewVariables, AutoNetworkedField]
+    public Player? Player;
+
+    [ViewVariables, AutoNetworkedField]
+    public Fish? Fish;
+
+    /**
+     * Progress
+     */
+
+    [ViewVariables, AutoNetworkedField]
+    public float Progress;
+
+    /**
+     * Saved entities
+     */
+
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? FishingRod = null;
+
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? User = null;
+
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? FishingPool = null;
+
+    /**
+     * Loot
+     */
+
+    [ViewVariables, AutoNetworkedField]
+    public EntProtoId LootProtoId;
+
+    /**
+     * Style
+     */
+
+    [ViewVariables]
+    public CP14FishingProcessStyleSheetPrototype? StyleSheet;
+
+    /**
+     * Normalized
+     */
+
+    public Vector2 LootPositionNormalized => Vector2.UnitY * Fish?.Position ?? Vector2.Zero;
+    public Vector2 PlayerPositionNormalized => Vector2.UnitY * Player?.Position ?? Vector2.Zero;
+    public Vector2 PlayerHalfSizeNormalized => Vector2.UnitY * Player?.HalfSize ?? Vector2.Zero;
+}

Content.Shared/_CP14/Fishing/Components/CP14FishingRodComponent.cs

@@ -0,0 +1,45 @@
+using Content.Shared._CP14.Fishing.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CP14FishingRodComponent : Component
+{
+    [ViewVariables]
+    public static readonly ProtoId<CP14FishingProcessStyleSheetPrototype> DefaultStyle = "Default";
+
+    [ViewVariables]
+    public EntityUid? Process;
+
+    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public bool Reeling;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float Speed = 0.1f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float Gravity = 0.075f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float MaxVelocity = 0.3f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float MinVelocity = -0.325f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float Bouncing = 0.07f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float Drag = 0.98f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float Size = 0.25f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float ThrowPower = 10f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<CP14FishingProcessStyleSheetPrototype> Style = DefaultStyle;
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/Behavior.cs

@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class Behavior
+{
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Speed { get; set; } = 0.25f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Difficulty { get; set; } = 2f;
+
+    public abstract float CalculateSpeed(IRobustRandom random);
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/DartBehavior.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+public sealed partial class DartBehavior : Behavior
+{
+    public override float CalculateSpeed(IRobustRandom random)
+    {
+        return Speed * (0.5f + random.NextFloat() * Difficulty);
+    }
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/FloaterBehaviour.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+public sealed partial class FloaterBehaviour : Behavior
+{
+    public override float CalculateSpeed(IRobustRandom random)
+    {
+        return Speed * (0.5f + random.NextFloat() * Difficulty);
+    }
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/MixedBehavior.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+[Serializable, NetSerializable]
+public sealed partial class MixedBehavior : Behavior
+{
+    public override float CalculateSpeed(IRobustRandom random)
+    {
+        return Speed * (random.NextFloat() - 0.5f);
+    }
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/SinkerBehavior.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+public sealed partial class SinkerBehavior : Behavior
+{
+    public override float CalculateSpeed(IRobustRandom random)
+    {
+        return Speed * (1.0f + random.NextFloat() * 0.5f);
+    }
+}

Content.Shared/_CP14/Fishing/Core/Behaviors/SmoothBehavior.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared._CP14.Fishing.Core.Behaviors;
+
+public sealed partial class SmoothBehavior : Behavior
+{
+    public override float CalculateSpeed(IRobustRandom random)
+    {
+        return Speed * (0.5f + random.NextFloat() * Difficulty);
+    }
+}

Content.Shared/_CP14/Fishing/Core/Fish.cs

@@ -0,0 +1,49 @@
+using Content.Shared._CP14.Fishing.Core.Behaviors;
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._CP14.Fishing.Core;
+
+[Serializable, NetSerializable]
+public sealed class Fish
+{
+    private const float MaxPosition = 1f;
+    private const float MinPosition = 0f;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Position { get; private set; }
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    private readonly Behavior _behavior;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    private float _speed;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    private TimeSpan _updateSpeedTime;
+
+    public Fish(Behavior behavior, TimeSpan updateSpeedTime)
+    {
+        _behavior = behavior;
+        _updateSpeedTime = updateSpeedTime;
+    }
+
+    public void Update(float frameTime)
+    {
+        // Update position
+        Position += _speed * frameTime;
+
+        // Clamp position
+        Position = Math.Clamp(Position, MinPosition, MaxPosition);
+    }
+
+    public void UpdateSpeed(IRobustRandom random, IGameTiming timing)
+    {
+        if (_updateSpeedTime > timing.CurTime)
+            return;
+
+        _speed = _behavior.CalculateSpeed(random);
+        _updateSpeedTime = timing.CurTime + TimeSpan.FromSeconds(random.NextFloat(1.5f - 1f / _behavior.Difficulty, 2.5f - 1f / _behavior.Difficulty));
+    }
+}

Content.Shared/_CP14/Fishing/Core/Player.cs

@@ -0,0 +1,25 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CP14.Fishing.Core;
+
+[Serializable, NetSerializable]
+public sealed class Player
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Size;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Position;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Velocity;
+
+    [ViewVariables]
+    public float HalfSize => Size / 2f;
+
+    public Player(float size = 0.25f)
+    {
+        Size = size;
+        Position = HalfSize;
+    }
+}

Content.Shared/_CP14/Fishing/Events/CP14FishingFinishedEvent.cs

@@ -0,0 +1,12 @@
+namespace Content.Shared._CP14.Fishing.Events;
+
+[ByRefEvent]
+public readonly struct CP14FishingFinishedEvent
+{
+    public readonly bool Success;
+
+    public CP14FishingFinishedEvent(bool success)
+    {
+        Success = success;
+    }
+}

Content.Shared/_CP14/Fishing/Prototypes/CP14FishingPoolLootTablePrototype.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Prototypes;
+
+[Prototype("CP14FishingPoolLootTable")]
+public sealed class CP14FishingPoolLootTablePrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = string.Empty;
+
+    [DataField]
+    public List<EntProtoId> Prototypes = [];
+}

Content.Shared/_CP14/Fishing/Prototypes/CP14FishingProcessPrototype.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Prototypes;
+
+[Prototype("CP14FishingProcess")]
+public sealed class CP14FishingProcessPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = string.Empty;
+
+    [DataField, ViewVariables]
+    public EntProtoId LootProtoId;
+}

Content.Shared/_CP14/Fishing/Prototypes/CP14FishingProcessStyleSheetPrototype.cs

@@ -0,0 +1,127 @@
+using System.Numerics;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Prototypes;
+
+/// <summary>
+/// Represents the style sheet for the fishing process, containing UI elements like background and handle configurations.
+/// </summary>
+[Prototype("CP14FishingProcessStyleSheet")]
+public sealed partial class CP14FishingProcessStyleSheetPrototype : IPrototype
+{
+    /// <summary>
+    /// Gets the unique identifier for this fishing process style sheet prototype.
+    /// </summary>
+    [IdDataField]
+    public string ID { get; } = string.Empty;
+
+    /// <summary>
+    /// Background settings for the fishing process UI.
+    /// </summary>
+    [DataField, ViewVariables]
+    public BackgroundData Background = new();
+
+    /// <summary>
+    /// Handle settings for the fishing process UI.
+    /// </summary>
+    [DataField, ViewVariables]
+    public HandleData Handle = new();
+
+    /// <summary>
+    /// Contains data related to the background of the fishing process UI.
+    /// </summary>
+    [DataDefinition, Serializable]
+    public sealed partial class BackgroundData
+    {
+        /// <summary>
+        /// Path to the background texture image.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public string Texture = "/Textures/_CP14/Interface/Fishing/background.png";
+
+        /// <summary>
+        /// Offset of the background texture in pixels.
+        /// </summary>
+        [DataField("offset"), ViewVariables(VVAccess.ReadWrite)]
+        public Vector2 OffsetPixels = new(10, 0);
+
+        /// <summary>
+        /// Offset of the handle in pixels.
+        /// </summary>
+        [DataField("handleOffset"), ViewVariables(VVAccess.ReadWrite)]
+        public Vector2 HandleOffsetPixels = new(16, 4);
+
+        /// <summary>
+        /// Size of the handle in pixels.
+        /// </summary>
+        [DataField("handleSize"), ViewVariables(VVAccess.ReadWrite)]
+        public Vector2 HandleSizePixels = new(149, 0);
+
+        /// <summary>
+        /// Offset of the progress bar in pixels.
+        /// </summary>
+        [DataField("progressOffset"), ViewVariables(VVAccess.ReadWrite)]
+        public Vector2 ProgressOffsetPixels = new(31, 3);
+
+        /// <summary>
+        /// Size of the progress bar in pixels.
+        /// </summary>
+        [DataField("progressSize"), ViewVariables(VVAccess.ReadWrite)]
+        public Vector2 ProgressSizePixels = new(4, 144);
+
+        /// <summary>
+        /// Gets the background offset in units (pixels divided by 32).
+        /// </summary>
+        [ViewVariables]
+        public Vector2 Offset => OffsetPixels / 32f;
+
+        /// <summary>
+        /// Gets the handle offset in units (pixels divided by 32).
+        /// </summary>
+        [ViewVariables]
+        public Vector2 HandleOffset => HandleOffsetPixels / 32f;
+
+        /// <summary>
+        /// Gets the progress bar offset in units (pixels divided by 32).
+        /// </summary>
+        [ViewVariables]
+        public Vector2 ProgressOffset => ProgressOffsetPixels / 32f;
+
+        /// <summary>
+        /// Gets the progress bar size in units (pixels divided by 32).
+        /// </summary>
+        [ViewVariables]
+        public Vector2 ProgressSize => ProgressSizePixels / 32f;
+
+        /// <summary>
+        /// Gets the handle size in units (pixels divided by 32).
+        /// </summary>
+        [ViewVariables]
+        public Vector2 HandleSize => HandleSizePixels / 32f;
+    }
+
+    /// <summary>
+    /// Contains data related to the handle elements of the fishing process UI.
+    /// </summary>
+    [DataDefinition, Serializable]
+    public sealed partial class HandleData
+    {
+        /// <summary>
+        /// Path to the texture for the top part of the handle.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public string TopTexture = "/Textures/_CP14/Interface/Fishing/Handle/top.png";
+
+        /// <summary>
+        /// Path to the texture for the middle part of the handle.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public string MiddleTexture = "/Textures/_CP14/Interface/Fishing/Handle/middle.png";
+
+        /// <summary>
+        /// Path to the texture for the bottom part of the handle.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public string BottomTexture = "/Textures/_CP14/Interface/Fishing/Handle/bottom.png";
+    }
+}

Content.Shared/_CP14/Fishing/Systems/CP14FishingPoolSystem.cs

@@ -0,0 +1,19 @@
+using Content.Shared._CP14.Fishing.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared._CP14.Fishing.Systems;
+
+public sealed class CP14FishingPoolSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public EntProtoId GetLootPrototypeId(Entity<CP14FishingPoolComponent> pool)
+    {
+        var lootTable = _prototype.Index(pool.Comp.LootTable);
+        var loot = _random.Pick(lootTable.Prototypes);
+
+        return loot;
+    }
+}

Content.Shared/_CP14/Fishing/Systems/CP14SharedFishingProcessSystem.Utils.cs

@@ -0,0 +1,43 @@
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Core;
+using Content.Shared._CP14.Fishing.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Systems;
+
+public abstract partial class CP14SharedFishingProcessSystem
+{
+    protected Entity<CP14FishingRodComponent> GetRod(Entity<CP14FishingProcessComponent> process)
+    {
+        var entityUid = process.Comp.FishingRod!.Value;
+        var component = FishingRod.GetComponent(entityUid);
+        return (entityUid, component);
+    }
+
+    protected Entity<CP14FishingPoolComponent> GetPool(Entity<CP14FishingProcessComponent> process)
+    {
+        var entityUid = process.Comp.FishingPool!.Value;
+        var component = FishingPool.GetComponent(entityUid);
+        return (entityUid, component);
+    }
+
+    public CP14FishingProcessStyleSheetPrototype GetStyle(Entity<CP14FishingProcessComponent> process)
+    {
+        return GetStyle(GetRod(process));
+    }
+
+    public CP14FishingProcessStyleSheetPrototype GetStyle(Entity<CP14FishingRodComponent> fishingRod)
+    {
+        if (_prototype.TryIndex(fishingRod.Comp.Style, out var style))
+            return style;
+
+        Log.Error($"Failed to retrieve fishing rod style, {fishingRod.Comp.Style} not found. Reverting to default style.");
+        return _prototype.Index(CP14FishingRodComponent.DefaultStyle);
+    }
+
+    protected static bool Collide(Fish fish, Player player)
+    {
+        var playerMin = player.Position - player.HalfSize;
+        var playerMax = player.Position + player.HalfSize;
+        return fish.Position >= playerMin && fish.Position <= playerMax;
+    }
+}

Content.Shared/_CP14/Fishing/Systems/CP14SharedFishingProcessSystem.cs

@@ -0,0 +1,143 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared._CP14.Fishing.Core;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.Fishing.Systems;
+
+public abstract partial class CP14SharedFishingProcessSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    protected EntityQuery<CP14FishingRodComponent> FishingRod;
+    protected EntityQuery<CP14FishingPoolComponent> FishingPool;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        FishingRod = GetEntityQuery<CP14FishingRodComponent>();
+        FishingPool = GetEntityQuery<CP14FishingPoolComponent>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<CP14FishingProcessComponent>();
+        while (query.MoveNext(out var entityUid, out var processComponent))
+        {
+            Update((entityUid, processComponent), frameTime);
+        }
+    }
+
+    private void UpdateReeling(Entity<CP14FishingProcessComponent> process,
+        Entity<CP14FishingRodComponent> fishingRod,
+        float frameTime)
+    {
+        if (process.Comp.Player is not { } player)
+            return;
+
+        if (fishingRod.Comp.Reeling)
+        {
+            player.Velocity += fishingRod.Comp.Speed * frameTime;
+            return;
+        }
+
+        player.Velocity -= fishingRod.Comp.Gravity * frameTime;
+    }
+
+    private void UpdateVelocity(Entity<CP14FishingProcessComponent> process,
+        Entity<CP14FishingRodComponent> fishingRod)
+    {
+        if (process.Comp.Player is not { } player)
+            return;
+
+        player.Velocity *= fishingRod.Comp.Drag;
+        player.Velocity = Math.Clamp(player.Velocity,
+            fishingRod.Comp.MinVelocity,
+            fishingRod.Comp.MaxVelocity);
+    }
+
+    private void UpdatePosition(Entity<CP14FishingProcessComponent> process,
+        float frameTime)
+    {
+        if (process.Comp.Player is not { } player)
+            return;
+
+        player.Position += process.Comp.Player.Velocity * frameTime;
+
+        var halfSize = process.Comp.Player.HalfSize;
+        process.Comp.Player.Position = Math.Clamp(process.Comp.Player.Position, halfSize, 1 - halfSize);
+    }
+
+    public void Update(Entity<CP14FishingProcessComponent> process, float frameTime)
+    {
+        if (process.Comp.Player is not { } player)
+            return;
+
+        var fishingRod = GetRod(process);
+
+        UpdateReeling(process, fishingRod, frameTime);
+        UpdateVelocity(process, fishingRod);
+        UpdatePosition(process, frameTime);
+
+        if (process.Comp.Fish is { } fish)
+        {
+            FishPreUpdate(process, fish, frameTime);
+
+            fish.Update(frameTime);
+            var collides = Collide(fish, player);
+
+            var progressAdditive = collides ? 0.1f : -0.2f;
+            process.Comp.Progress = Math.Clamp(process.Comp.Progress + progressAdditive * frameTime, 0, 1);
+        }
+
+        UpdateDirty(process);
+
+        if (process.Comp.Progress is 1 or 0)
+            Finish(process, process.Comp.Progress is 1);
+    }
+
+    public virtual void FishPreUpdate(Entity<CP14FishingProcessComponent> process, Fish fish, float frameTime)
+    {
+    }
+
+    public virtual void UpdateDirty(Entity<CP14FishingProcessComponent> process)
+    {
+    }
+
+    public virtual void Finish(Entity<CP14FishingProcessComponent> process, bool success)
+    {
+    }
+
+    public void Stop(Entity<CP14FishingProcessComponent> process)
+    {
+        var rod = GetRod(process);
+        rod.Comp.Process = null;
+        Dirty(rod);
+
+        Del(process);
+    }
+
+    public virtual void Reward(Entity<CP14FishingProcessComponent> process)
+    {
+    }
+
+    public bool TryGetByUser(EntityUid userEntityUid, [NotNullWhen(true)] out Entity<CP14FishingProcessComponent>? process)
+    {
+        process = null;
+
+        var query = EntityQueryEnumerator<CP14FishingProcessComponent>();
+        while (query.MoveNext(out var entityUid, out var processComponent))
+        {
+            if (processComponent.User != userEntityUid)
+                continue;
+
+            process = (entityUid, processComponent);
+            return true;
+        }
+
+        return false;
+    }
+}

Content.Shared/_CP14/Fishing/Systems/CP14SharedFishingRodSystem.cs

@@ -0,0 +1,51 @@
+using Content.Shared._CP14.Fishing.Components;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CP14.Fishing.Systems;
+
+public abstract class CP14SharedFishingRodSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeAllEvent<RequestFishingRodReelMessage>(OnReel);
+        SubscribeLocalEvent<CP14FishingRodComponent, HandDeselectedEvent>(OnDeselected);
+    }
+
+    private void OnReel(RequestFishingRodReelMessage msg, EntitySessionEventArgs args)
+    {
+        var player = args.SenderSession.AttachedEntity;
+
+        if (!TryComp<HandsComponent>(player, out var hands))
+            return;
+
+        if (!TryComp<CP14FishingRodComponent>(hands.ActiveHandEntity, out var fishingRodComponent))
+            return;
+
+        if (fishingRodComponent.Reeling == msg.Reeling)
+            return;
+
+        fishingRodComponent.Reeling = msg.Reeling;
+        Dirty(hands.ActiveHandEntity.Value, fishingRodComponent);
+    }
+
+    private void OnDeselected(Entity<CP14FishingRodComponent> entity, ref HandDeselectedEvent args)
+    {
+        entity.Comp.Reeling = false;
+        Dirty(entity);
+    }
+
+    [Serializable, NetSerializable]
+    protected sealed class RequestFishingRodReelMessage : EntityEventArgs
+    {
+        public bool Reeling;
+
+        public RequestFishingRodReelMessage(bool reeling)
+        {
+            Reeling = reeling;
+        }
+    }
+}

Resources/Locale/en-US/_CP14/tiles/tiles.ftl

@@ -10,7 +10,6 @@ cp14-tiles-sand = sand
 cp14-tiles-snow = snow
 cp14-tiles-snow-deep = deep snow
 cp14-tiles-snow-deep-deep = deep deep snow
-cp14-tiles-marble-cave = marble floor
 
 # Produced
 cp14-tiles-foundation = foundation
@@ -62,7 +61,7 @@ cp14-tiles-stonebricks-small-carved2 = carved brick floor
 cp14-tiles-stonebricks-square-carved = carved brick floor
 cp14-tiles-stonebricks = stonebrick floor
 cp14-tiles-stonebricks-weather = street stonebrick floor
-cp14-tiles-stonebricks-marble = marble brick floor
+cp14-tiles-stonebricks-marble = marble floor
 
 cp14-tiles-lucens-woodplanks = lucens woodplanks
 cp14-tiles-lucens-woodplanks-big = big lucens planks

Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl

@@ -10,7 +10,6 @@ cp14-tiles-sand = песок
 cp14-tiles-snow = снег
 cp14-tiles-snow-deep = глубокий снег
 cp14-tiles-snow-deep-deep = очень глубокий снег
-cp14-tiles-marble-cave = мраморный пол
 
 # Produced
 cp14-tiles-foundation = фундамент
@@ -62,7 +61,7 @@ cp14-tiles-stonebricks-small-carved2 = пол из резного кирпича
 cp14-tiles-stonebricks-square-carved = пол из резного кирпича
 cp14-tiles-stonebricks = каменный кирпичный пол
 cp14-tiles-stonebricks-weather = уличный каменный кирпичный пол
-cp14-tiles-stonebricks-marble = мраморный кирпич
+cp14-tiles-stonebricks-marble = мраморный пол
 
 cp14-tiles-lucens-woodplanks = люценcовые доски
 cp14-tiles-lucens-woodplanks-big = большие люценcовые доски

Resources/Maps/_CP14/Empties/cave_empty.yml

@@ -1,129 +0,0 @@
-meta:
-  format: 7
-  category: Map
-  engineVersion: 250.0.0
-  forkId: ""
-  forkVersion: ""
-  time: 04/08/2025 12:22:24
-  entityCount: 1
-maps:
-- 2
-grids:
-- 2
-orphans: []
-nullspace: []
-tilemap:
-  0: Space
-  9: CP14FloorBase
-  12: CP14FloorBirchWoodPlanksCruciform
-  8: CP14FloorDirt
-  27: CP14FloorFoundation
-  28: CP14FloorGrass
-  29: CP14FloorGrassLight
-  10: CP14FloorGrassTall
-  14: CP14FloorIce
-  13: CP14FloorLucensWoodPlanks
-  32: CP14FloorOakWoodPlanks
-  2: CP14FloorOakWoodPlanksBig
-  4: CP14FloorOakWoodPlanksBroken
-  1: CP14FloorOakWoodPlanksCruciform
-  3: CP14FloorOakWoodPlanksStairways
-  11: CP14FloorRedWoodPlanksCruciform
-  49: CP14FloorStonebricks
-  50: CP14FloorStonebricksSmallCarved1
-  51: CP14FloorStonebricksSmallCarved2
-  7: CP14FloorStonebricksSquareCarved
-  6: CP14FloorWoodPlanksBurned
-  5: CP14FloorWoodPlanksStairwaysBurned
-  53: FloorIce
-entities:
-- proto: ""
-  entities:
-  - uid: 2
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: MapAtmosphere
-      space: False
-      mixture:
-        volume: 2500
-        immutable: True
-        temperature: 293.15
-        moles:
-        - 21.82478
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: CP14WeatherController
-      entries:
-      - weight: 2
-        visuals: null
-      - visuals: CP14Mist
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: MQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAMQAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      canCollide: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      inherent: True
-      enabled: True
-    - type: Biome
-      forcedMarkerLayers: []
-      markerLayers: []
-      loadedMarkers: {}
-      pendingMarkers: {}
-      loadedChunks: []
-      entities: {}
-      decals: {}
-      modifiedTiles: {}
-      template: CP14CavesIndestructibleFill
-      layers: []
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GasTileOverlay
-...

Resources/Maps/_CP14/Empties/grassland_empty.yml

@@ -1,149 +0,0 @@
-meta:
-  format: 7
-  category: Map
-  engineVersion: 250.0.0
-  forkId: ""
-  forkVersion: ""
-  time: 04/08/2025 12:18:15
-  entityCount: 1
-maps:
-- 2
-grids:
-- 2
-orphans: []
-nullspace: []
-tilemap:
-  0: Space
-  9: CP14FloorBase
-  10: CP14FloorBirchWoodPlanks
-  15: CP14FloorBirchWoodPlanksBig
-  21: CP14FloorBirchWoodPlanksCruciform
-  20: CP14FloorDarkWoodPlanksBig
-  8: CP14FloorDarkWoodPlanksStairways
-  2: CP14FloorDirt
-  4: CP14FloorFoundation
-  28: CP14FloorGrass
-  29: CP14FloorGrassLight
-  30: CP14FloorGrassTall
-  31: CP14FloorIce
-  26: CP14FloorLucensWoodPlanksCruciform
-  27: CP14FloorLucensWoodPlanksStairways
-  14: CP14FloorMarble
-  5: CP14FloorOakWoodPlanks
-  19: CP14FloorOakWoodPlanksBig
-  6: CP14FloorOakWoodPlanksCruciform
-  7: CP14FloorOakWoodPlanksStairways
-  1: CP14FloorSand
-  23: CP14FloorSnow
-  24: CP14FloorSnowDeep
-  22: CP14FloorSnowDeepDeep
-  3: CP14FloorStonebricks
-  13: CP14FloorStonebricksSmallCarved1
-  17: CP14FloorStonebricksSmallCarved2
-  25: CP14FloorStonebricksSnowed
-  16: CP14FloorStonebricksSquareCarved
-  11: CP14FloorWoodPlanksBurned
-  12: CP14FloorWoodPlanksStairwaysBurned
-  18: FloorIce
-entities:
-- proto: ""
-  entities:
-  - uid: 2
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: Roof
-      data: {}
-#    - type: BecomesStation
-#      id: Comoss # ENTER YOUR NAME OR DELETE IT
-    - type: CP14WeatherController
-      entries:
-      - weight: 3
-        visuals: null
-      - visuals: CP14Mist
-      - visuals: CP14Rain
-    - type: LightCycle
-    - type: SunShadow
-    - type: SunShadowCycle
-    - type: Biome
-      forcedMarkerLayers: []
-      markerLayers: []
-      loadedMarkers: {}
-      pendingMarkers: {}
-      loadedChunks: []
-      entities: {}
-      decals: {}
-      modifiedTiles: {}
-      template: CP14SandOceanFill
-      layers: []
-    - type: MapGrid
-      chunks:
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,0:
-          ind: 0,0
-          tiles: HgAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHgAAAAAA
-          version: 6
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      canCollide: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: CP14CloudShadows
-    - type: MapLight
-      ambientLightColor: '#D8B059FF'
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      inherent: True
-      enabled: True
-    - type: MapAtmosphere
-      space: False
-      mixture:
-        volume: 2500
-        immutable: True
-        temperature: 293.15
-        moles:
-        - 21.824879
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GasTileOverlay
-...

Resources/Maps/_CP14/dev_map.yml

@@ -43,10 +43,9 @@ entities:
       data: {}
     - type: CP14CloudShadows
     - type: MapLight
-      ambientLightColor: "#DDDDDDFF"
+    - type: LightCycle
     - type: SunShadow
-      alpha: 0.8
-      direction: 1, -1.5
+    - type: SunShadowCycle
     - type: Biome
       forcedMarkerLayers: []
       markerLayers: []

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml

@@ -84,18 +84,4 @@
   - type: Sprite
     sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadStrawHat
-  name: straw hat
-  description: Easy to make, not too bad to lose.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-  - type: Construction
-    graph: CP14StrawHat
-    node: cp14headstrawhat
+    sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml

@@ -137,18 +137,4 @@
         color: green
       - state: frame
   - type: CP14BiomeSpawner
-    biome: CP14LeafMaze
-
-- type: entity
-  id: CP14BiomeSpawnerMarbleCave
-  parent: CP14BaseBiomeSpawner
-  suffix: Marble cave
-  components:
-  - type: Sprite
-    layers:
-      - state: cave
-      - state: frame
-      - sprite: _CP14/Objects/Materials/marble_block.rsi
-        state: stone_3
-  - type: CP14BiomeSpawner
-    biome: CP14MarbleCaves 
+    biome: CP14LeafMaze

Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml

@@ -1,124 +0,0 @@
-- type: entity
-  id: CP14DirtBlock1
-  parent: BaseItem
-  name: dirt block
-  description: A block of excellent black soil.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/dirt_block.rsi
-    layers:
-      - state: dirt
-        map: ["base"]
-  - type: FloorTile
-    placeTileSound:
-      collection: CP14Digging
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorDirt
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Dirt
-    count: 1
-    baseLayer: base
-    layerStates:
-    - dirt
-    - dirt_2
-    - dirt_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Dirt: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
-- type: entity
-  id: CP14DirtBlock10
-  parent: CP14DirtBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14StoneBlock1
-  parent: BaseItem
-  name: stone block
-  description: A block of cold stone.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/stone_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Stone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Stone: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
-- type: entity
-  id: CP14StoneBlock10
-  parent: CP14StoneBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14MarbleBlock1
-  parent: BaseItem
-  name: marble block
-  description: A block of white marble.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/marble_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14MarbleStone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14MarbleStone: 100
-
-- type: entity
-  id: CP14MarbleBlock10
-  parent: CP14MarbleBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10

Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml

@@ -1,3 +1,91 @@
+- type: entity
+  id: CP14DirtBlock1
+  parent: BaseItem
+  name: dirt block
+  description: A block of excellent black soil.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/dirt_block.rsi
+    layers:
+      - state: dirt
+        map: ["base"]
+  - type: FloorTile
+    placeTileSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+    outputs:
+      - CP14FloorDirt
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Dirt
+    count: 1
+    baseLayer: base
+    layerStates:
+    - dirt
+    - dirt_2
+    - dirt_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Dirt: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14DirtBlock10
+  parent: CP14DirtBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14StoneBlock1
+  parent: BaseItem
+  name: stone block
+  description: A block of cold stone.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/stone_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Stone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Stone: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14StoneBlock10
+  parent: CP14StoneBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
 - type: entity
   id: CP14Nail1
   parent: BaseItem

Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml

@@ -66,19 +66,6 @@
   - type: Stack
     stackType: CP14FloorTileMarbleBrick
 
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileMarbleSmallbricks
-  name: marble small brick
-  components:
-  - type: Sprite
-    state: marble_smallbricks
-  - type: FloorTile
-    outputs:
-      - CP14FloorMarbleSmallbricks
-  - type: Stack
-    stackType: CP14FloorTileMarbleSmallbricks
-
 - type: entity
   parent: CP14FloorTileBase
   id: CP14FloorTileOakWoodplanks

Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rod.yml

@@ -0,0 +1,49 @@
+- type: entity
+  parent: BaseItem
+  id: CP14FishingRod
+  name: fishing rod
+  description: Wooden stick with string attached.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    shape:
+    - 0,0,0,1
+  - type: Sprite
+    sprite: _CP14/Objects/Tools/fishing_rod.rsi
+    state: icon
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: CP14ModularCraftStartPoint
+    startSlots:
+    - FishingRodShaft
+  - type: MeleeWeapon
+    angle: 45
+    attackRate: 1
+    wideAnimationRotation: 135
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 0.1
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+  - type: Clothing
+    equipDelay: 0.25
+    unequipDelay: 0.25
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - neck
+  - type: CP14FishingRod

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml

@@ -2,14 +2,14 @@
   parent: BaseStructure
   id: CP14FloorWaterOptimized
   name: water
-  suffix: Optimized, Empty
   description: A trough of plain water. Clean enough for consumption
-  categories: [ ForkFiltered ]
+  categories: [ HideSpawnMenu ]
   placement:
     mode: SnapgridCenter
     snap:
     - Wall
   components:
+  - type: CP14FishingPool
   - type: PlacementReplacement
     key: floorTile
   - type: Sprite
@@ -62,29 +62,11 @@
   - type: TileEntityEffect
     effects:
     - !type:ExtinguishReaction
-  - type: FrictionContacts
-
-- type: entity
-  parent: CP14FloorWaterOptimized
-  id: CP14FloorWaterOptimizedDeep
-  name: deep water
-  suffix: Deep, Air damage
-  components:
-  - type: Sprite
-    color: "#869dc2"
-  - type: SpeedModifierContacts
-    walkSpeedModifier: 0.2
-    sprintSpeedModifier: 0.2
-  - type: FrictionContacts
-  - type: DamageContacts
-    damage:
-      types:
-        Asphyxiation: 2.5
 
 - type: entity
   parent: CP14FloorWaterOptimized
   id: CP14FloorWater
-  suffix: Normal
+  categories: [ ForkFiltered ]
   components:
   - type: DrawableSolution
     solution: pool
@@ -139,4 +121,4 @@
     - CP14GatherableWaterAirLily
     chance: 1
     offset: 0.2
-    deleteSpawnerAfterSpawn: false
+    deleteSpawnerAfterSpawn: false

Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml

@@ -1,7 +1,8 @@
 - type: entity
   parent:
   - BaseStructure
-  id: CP14TableBase
+  - CP14BaseFlammable
+  id: CP14WoodenTableBase
   categories: [ ForkFiltered ]
   abstract: true
   components:
@@ -16,31 +17,6 @@
         - TableMask
         layer:
         - TableLayer
-  - type: Damageable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/picaxe2.ogg
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepHull
-  - type: Climbable
-  - type: PlaceableSurface
-
-- type: entity
-  parent:
-  - CP14TableBase
-  - CP14BaseFlammable
-  id: CP14WoodenTableBase
-  abstract: true
-  components:
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -76,6 +52,8 @@
   - type: FireVisuals
     sprite: _CP14/Effects/fire.rsi
     normalState: full
+  - type: Climbable
+  - type: PlaceableSurface
 
 - type: entity
   parent: CP14WoodenTableBase
@@ -138,25 +116,4 @@
     state: full
   - type: Construction
     graph: CP14TableWoodenCounter
-    node: CP14TableWoodenCounter
-
-- type: entity
-  parent: CP14TableBase
-  id: CP14TableMarble
-  name: marble table
-  description: Exquisite white marble table.
-  components:
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Sprite
-    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
-    state: full
-  - type: IconSmooth
-    key: state
-    base: state
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepFloor
+    node: CP14TableWoodenCounter

Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml

@@ -38,39 +38,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
-- type: entity
-  id: CP14WallMarbleStone
-  name: marble
-  parent: CP14WallStone
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 350
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14MarbleBlock1:
-            min: 2
-            max: 3
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
 
 - type: entity
   id: CP14WallStoneIndestructable

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -71,25 +71,6 @@
     sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
   - type: IconSmooth
     base: stonebricks
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Construction
-    graph: CP14WallMarbleBrick
-    node: CP14WallMarbleBrick
   - type: CP14WallpaperHolder
 
 - type: entity

Resources/Prototypes/_CP14/Fishing/lootTables.yml

@@ -0,0 +1,4 @@
+- type: CP14FishingPoolLootTable
+  id: Default
+  prototypes:
+  - CP14BaseLockpick

Resources/Prototypes/_CP14/Fishing/styleSheets.yml

@@ -0,0 +1,13 @@
+- type: CP14FishingProcessStyleSheet
+  id: Default
+  background:
+    texture: /Textures/_CP14/Interface/Fishing/Styles/Default/background.png
+    offset: 10, 0
+    handleOffset: 14, 5
+    handleSize: 11, 141
+    progressOffset: 4, 4
+    progressSize: 2, 142
+  handle:
+    topTexture: /Textures/_CP14/Interface/Fishing/Styles/Default/Handle/top.png
+    middleTexture: /Textures/_CP14/Interface/Fishing/Styles/Default/Handle/middle.png
+    bottomTexture: /Textures/_CP14/Interface/Fishing/Styles/Default/Handle/bottom.png

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -202,7 +202,6 @@
   - CP14ClothingHeadJestersCap
   - CP14ClothingHeadHuntersHat
   - CP14ClothingHeadJagermeisterHat
-  - CP14ClothingHeadStrawHat
 
 - type: loadout
   id: CP14ClothingHeadMetalHeadband
@@ -224,11 +223,6 @@
   equipment:
     head: CP14ClothingHeadJestersCap
 
-- type: loadout
-  id: CP14ClothingHeadStrawHat
-  equipment:
-    head: CP14ClothingHeadStrawHat
-
 - type: loadout
   id: CP14ClothingHeadHuntersHat
   equipment:

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -25,15 +25,6 @@
   color: "#555963"
   price: 0
 
-- type: material
-  id: CP14MarbleStone
-  stackEntity: CP14MarbleBlock1
-  name: cp14-material-stone-block #TODO
-  unit: materials-unit-chunk
-  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
-  color: "#555963"
-  price: 0
-
 - type: material
   id: CP14Nail
   stackEntity: CP14Nail1

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml

@@ -41,10 +41,6 @@
       biomeTemplate: CP14CavesFloor
       tileMask:
       - CP14FloorGrass
-    - !type:BiomeDunGen
-      biomeTemplate: CP14MarbleCaves
-      tileMask:
-      - CP14FloorMarble
 
 - type: dungeonConfig
   id: CP14DemiplaneCavesRingFloorMaskStone
@@ -106,9 +102,9 @@
   - !type:NoiseDistanceDunGen
     size: 50, 50
     distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.8
+      blendWeight: 0.6
     layers:
-    - tile: CP14FloorMarble
+    - tile: Space
       threshold: 0.50
       noise:
         frequency: 0.010
@@ -116,4 +112,18 @@
         fractalType: FBm
         octaves: 5
         lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 80, 50
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.2
+    layers:
+    - tile: Space
+      threshold: 0.50
+      noise:
+        frequency: 0.08
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
         gain: 0.5

Resources/Prototypes/_CP14/Procedural/fill.yml

@@ -48,7 +48,7 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14SandOceanFill
@@ -61,7 +61,7 @@
       allowedTiles:
         - FloorDesert
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14LavaOceanFill

Resources/Prototypes/_CP14/Procedural/marble_cave.yml

@@ -1,47 +0,0 @@
-- type: biomeTemplate
-  id: CP14MarbleCaves
-  layers:
-    - !type:BiomeTileLayer
-      threshold: -1.0
-      tile: CP14FloorMarbleCave
-    #Rocks
-    - !type:BiomeEntityLayer
-      threshold: 0.4
-      noise:
-        seed: 1
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        frequency: 2
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14RockSmall
-    # Lakes
-    - !type:BiomeEntityLayer
-      threshold: -0.45
-      invert: true
-      noise:
-        seed: 12
-        noiseType: Perlin
-        fractalType: Ridged
-        octaves: 1
-        frequency: 0.1
-        gain: 0.5
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14FloorLava
-    - !type:BiomeEntityLayer
-      threshold: -0.45
-      invert: true
-      noise:
-        seed: 0
-        noiseType: Perlin
-        fractalType: Ridged
-        octaves: 1
-        frequency: 0.1
-        gain: 0.5
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14WallMarbleStone

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml

@@ -1,16 +0,0 @@
-- type: constructionGraph
-  id: CP14WallMarbleBrick
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14WallMarbleBrick
-          completed:
-            - !type:SnapToGrid
-              southRotation: true
-          steps:
-            - material: CP14MarbleStone
-              amount: 3
-              doAfter: 2
-    - node: CP14WallMarbleBrick
-      entity: CP14WallMarbleBrick

Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

@@ -90,7 +90,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: stonebrick wall
+  name: stone wall
   description: Sturdy enough to cover you from threats or cold winds.
   id: CP14WallStonebrick
   graph: CP14WallStonebrick
@@ -106,24 +106,6 @@
   conditions:
     - !type:TileNotBlocked
 
-- type: construction
-  crystallPunkAllowed: true
-  name: marble brick wall
-  description: Sturdy enough to cover you from threats or cold winds.
-  id: CP14WallMarbleBrick
-  graph: CP14WallMarbleBrick
-  startNode: start
-  targetNode: CP14WallMarbleBrick
-  category: construction-category-structures
-  icon:
-    sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
   crystallPunkAllowed: true
   name: iron grille

Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml

@@ -1,17 +0,0 @@
-- type: constructionGraph
-  id: CP14StrawHat
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: cp14headstrawhat
-      steps:
-      - tag: CP14Wheat
-        name: wheat
-        icon:
-          sprite: _CP14/Objects/Flora/Farm/wheat.rsi
-          state: base1
-        doAfter: 4
-
-  - node: cp14headstrawhat
-    entity: CP14ClothingHeadStrawHat

Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml

@@ -11,17 +11,3 @@
   icon:
     sprite: _CP14/Clothing/Head/Produced/wreath.rsi
     state: icon
-
-- type: construction
-  crystallPunkAllowed: true
-  name: straw hat
-  id: cp14headstrawhat
-  graph: CP14StrawHat
-  startNode: start
-  targetNode: cp14headstrawhat
-  category: construction-category-clothing
-  objectType: Item
-  description: Easy to make, not too bad to lose.
-  icon:
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-    state: icon

Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml

@@ -15,22 +15,11 @@
   craftTime: 1
   requirements:
   - !type:StackResource
-    stack: CP14MarbleStone
+    stack: CP14Stone
     count: 1
   result: CP14FloorTileMarbleBrick
   resultCount: 4
 
-- type: CP14Recipe
-  id: CP14FloorTileMarbleSmallbricks
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14MarbleStone
-    count: 1
-  result: CP14FloorTileMarbleSmallbricks
-  resultCount: 4
-
 - type: CP14Recipe
   id: CP14FloorTileStonebricks
   tag: CP14RecipeWorkbench

Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml

@@ -12,13 +12,6 @@
   icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble }
   maxCount: 30
 
-- type: stack
-  id: CP14FloorTileMarbleSmallbricks
-  name: marble small brick
-  spawn: CP14FloorTileMarbleSmallbricks
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks }
-  maxCount: 30
-
 - type: stack
   id: CP14FloorTileOakWoodplanks
   name: oak woodplanks

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -12,13 +12,6 @@
   icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 }
   maxCount: 10
 
-- type: stack
-  id: CP14MarbleStone
-  name: cp14-stack-marble-block
-  spawn: CP14MarbleBlock1
-  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
-  maxCount: 10
-
 - type: stack
   id: CP14WoodenPlanks
   name: cp14-stack-wood-planks

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -40,37 +40,6 @@
   heatCapacity: 10000
   weather: true
 
-- type: tile
-  editorHidden: false
-  id: CP14FloorMarbleCave
-  name: cp14-tiles-marble-cave
-  sprite: /Textures/_CP14/Tiles/marble_cave.png
-  variants: 14
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: CP14FloorBase
-  deconstructTools: [ CP14Digging ]
-  isSubfloor: true
-  itemDrop: CP14MarbleBlock1
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
-
 - type: tile
   editorHidden: false
   id: CP14FloorSand

Resources/Prototypes/_CP14/Tiles/produced.yml

@@ -205,34 +205,6 @@
   deconstructTools: [ Prying ]
   itemDrop: CP14FloorTileMarbleBrick
 
-- type: tile
-  editorHidden: false
-  id: CP14FloorMarbleSmallbricks
-  name: cp14-tiles-stonebricks-marble
-  sprite: /Textures/_CP14/Tiles/Marble/small_bricks.png
-  variants: 9
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  edgeSpritePriority: 102
-  edgeSprites:
-    South: /Textures/_CP14/Tiles/Marble/double_edge_S.png
-  baseTurf: CP14FloorFoundation
-  isSubfloor: false
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileMarbleSmallbricks
-
 - type: tile
   editorHidden: false
   id: CP14FloorDirtSeedbed

Resources/Textures/_CP14/Clothing/Head/Roles/General/straw_hat.rsi/meta.json

@@ -1,18 +0,0 @@
-{
-    "version": 1,
-    "license": "All right reserved",
-    "copyright": "Created by creamy",
-    "size": {
-        "x": 48,
-        "y": 48
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-HELMET",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Interface/Fishing/Icons/attributions.yml

@@ -0,0 +1,11 @@
+- files:
+  - "/fish.png"
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "@omsoyk (Discord)"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14"
+
+- files:
+  - "/default.png"
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "@tornadotech (Discord), Tornado-Technology (Github)"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14"

Resources/Textures/_CP14/Interface/Fishing/Styles/Default/attributions.yml

@@ -0,0 +1,9 @@
+- files:
+  - "/background.png"
+  - "Handle/top.png"
+  - "Handle/middle.png"
+  - "Handle/bottom.png"
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "@omsoyk (Discord)"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14"
+

Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd (Github)",
-  "states": [
-    {
-      "name": "stone"
-    },
-    {
-      "name": "stone_2"
-    },
-    {
-      "name": "stone_3"
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json

@@ -25,9 +25,6 @@
     {
       "name": "marble"
     },
-    {
-      "name": "marble_smallbricks"
-    },
     {
       "name": "oak_woodplanks"
     },

Resources/Textures/_CP14/Objects/Tools/fishing_rod.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "license": "CLA",
+  "copyright": "Created by omsoyk (Discord) ",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/meta.json

@@ -1,46 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd (Github) ",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "state0",
-      "directions": 4
-    },
-    {
-      "name": "state1",
-      "directions": 4
-    },
-    {
-      "name": "state2",
-      "directions": 4
-    },
-    {
-      "name": "state3",
-      "directions": 4
-    },
-    {
-      "name": "state4",
-      "directions": 4
-    },
-    {
-      "name": "state5",
-      "directions": 4
-    },
-    {
-      "name": "state6",
-      "directions": 4
-    },
-    {
-      "name": "state7",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/meta.json

@@ -1,46 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 64
-  },
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Created by TheShuEd (Github) ",
-  "states": [
-    {
-      "name": "wall0",
-      "directions": 4
-    },
-    {
-      "name": "wall1",
-      "directions": 4
-    },
-    {
-      "name": "wall2",
-      "directions": 4
-    },
-    {
-      "name": "wall3",
-      "directions": 4
-    },
-    {
-      "name": "wall4",
-      "directions": 4
-    },
-    {
-      "name": "wall5",
-      "directions": 4
-    },
-    {
-      "name": "wall6",
-      "directions": 4
-    },
-    {
-      "name": "wall7",
-      "directions": 4
-    },
-    {
-      "name": "full"
-    }
-  ]
-}