[Feature] Lavaland real

Content.Client/Lathe/UI/LatheBoundUserInterface.cs

@@ -1,3 +1,4 @@
+using Content.Shared._DV.Salvage; // DeltaV
 using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using JetBrains.Annotations;
@@ -31,6 +32,8 @@ protected override void Open()
             {
                 SendMessage(new LatheQueueRecipeMessage(recipe, amount));
             };
+
+            _menu.OnClaimMiningPoints += () => SendMessage(new LatheClaimMiningPointsMessage()); // DeltaV
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)

Content.Client/Lathe/UI/LatheMenu.xaml

@@ -132,6 +132,12 @@
                 HorizontalExpand="True">
                 <ui:MaterialStorageControl Name="MaterialsList" SizeFlagsStretchRatio="8"/>
             </BoxContainer>
+            <!-- Begin DeltaV Additions: Mining points -->
+            <BoxContainer Orientation="Horizontal" Name="MiningPointsContainer" Visible="False">
+                <Label Name="MiningPointsLabel" HorizontalExpand="True"/>
+                <Button Name="MiningPointsClaimButton" Text="{Loc 'lathe-menu-mining-points-claim-button'}"/>
+            </BoxContainer>
+            <!-- End DeltaV Additions: Mining points -->
         </BoxContainer>
         </BoxContainer>
 

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -1,31 +1,38 @@
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
+using Content.Shared._DV.Salvage.Components; // DeltaV
+using Content.Shared._DV.Salvage.Systems; // DeltaV
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing; // DeltaV
 
 namespace Content.Client.Lathe.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class LatheMenu : DefaultWindow
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!; // DeltaV
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private readonly SpriteSystem _spriteSystem;
     private readonly LatheSystem _lathe;
     private readonly MaterialStorageSystem _materialStorage;
+    private readonly MiningPointsSystem _miningPoints; // DeltaV
 
     public event Action<BaseButton.ButtonEventArgs>? OnServerListButtonPressed;
     public event Action<string, int>? RecipeQueueAction;
+    public event Action? OnClaimMiningPoints; // DeltaV
 
     public List<ProtoId<LatheRecipePrototype>> Recipes = new();
 
@@ -35,6 +42,8 @@ public sealed partial class LatheMenu : DefaultWindow
 
     public EntityUid Entity;
 
+    private uint? _lastMiningPoints; // DeltaV: used to avoid Loc.GetString every frame
+
     public LatheMenu()
     {
         RobustXamlLoader.Load(this);
@@ -43,6 +52,7 @@ public LatheMenu()
         _spriteSystem = _entityManager.System<SpriteSystem>();
         _lathe = _entityManager.System<LatheSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
+        _miningPoints = _entityManager.System<MiningPointsSystem>(); // DeltaV
 
         SearchBar.OnTextChanged += _ =>
         {
@@ -70,9 +80,31 @@ public void SetEntity(EntityUid uid)
             }
         }
 
+        // Begin DeltaV Additions: Mining points UI
+        MiningPointsContainer.Visible = _entityManager.TryGetComponent<MiningPointsComponent>(Entity, out var points);
+        MiningPointsClaimButton.OnPressed += _ => OnClaimMiningPoints?.Invoke();
+        if (points != null)
+            UpdateMiningPoints(points.Points);
+        // End DeltaV Additions
+
         MaterialsList.SetOwner(Entity);
     }
 
+    /// <summary>
+    /// DeltaV: Updates the UI elements for mining points.
+    /// </summary>
+    private void UpdateMiningPoints(uint points)
+    {
+        MiningPointsClaimButton.Disabled = points == 0 ||
+            _player.LocalSession?.AttachedEntity is not {} player ||
+            _miningPoints.TryFindIdCard(player) == null;
+        if (points == _lastMiningPoints)
+            return;
+
+        _lastMiningPoints = points;
+        MiningPointsLabel.Text = Loc.GetString("lathe-menu-mining-points", ("points", points));
+    }
+
     protected override void Opened()
     {
         base.Opened();
@@ -83,6 +115,17 @@ protected override void Opened()
         }
     }
 
+    /// <summary>
+    /// DeltaV: Update mining points UI whenever it changes.
+    /// </summary>
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (_entityManager.TryGetComponent<MiningPointsComponent>(Entity, out var points))
+            UpdateMiningPoints(points.Points);
+    }
+
     /// <summary>
     /// Populates the list of all the recipes
     /// </summary>

Content.Client/Materials/UI/MaterialStorageControl.xaml.cs

@@ -1,10 +1,11 @@
 using System.Linq;
 using Content.Shared.Materials;
+using Content.Shared.Tag; // Goobstation
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
-
+using Robust.Shared.Prototypes;
 namespace Content.Client.Materials.UI;
 
 /// <summary>
@@ -14,6 +15,8 @@ namespace Content.Client.Materials.UI;
 public sealed partial class MaterialStorageControl : ScrollContainer
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!; // Goobstation
+    private readonly TagSystem _tagSystem; // Goobstation
 
     private EntityUid? _owner;
 
@@ -23,6 +26,8 @@ public MaterialStorageControl()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+
+        _tagSystem = _entityManager.System<TagSystem>(); // Goobstation
     }
 
     public void SetOwner(EntityUid owner)
@@ -44,7 +49,15 @@ protected override void FrameUpdate(FrameEventArgs args)
         }
 
         var canEject = materialStorage.CanEjectStoredMaterials;
-        var mats = materialStorage.Storage.Select(pair => (pair.Key.Id, pair.Value)).ToDictionary();
+        // Goobstation start
+        Dictionary<string, int> storage;
+        Dictionary<string, int> mats;
+        storage = materialStorage.Storage.Select(pair => (pair.Key.Id, pair.Value)).ToDictionary();
+        mats = materialStorage.DisallowOreEjection
+            ? FilterOutOres(storage)
+            : storage;
+
+        // Goobstation end
         if (_currentMaterials.Equals(mats))
             return;
 
@@ -89,4 +102,15 @@ protected override void FrameUpdate(FrameEventArgs args)
         _currentMaterials = mats;
         NoMatsLabel.Visible = MaterialList.ChildCount == 1;
     }
+
+    private Dictionary<string, int> FilterOutOres(Dictionary<string, int> materials)
+    {
+        return materials.Where(pair =>
+            !(_prototypeManager.TryIndex<MaterialPrototype>(pair.Key, out var proto) &&
+            proto.StackEntity != null &&
+            _prototypeManager.TryIndex<EntityPrototype>(proto.StackEntity, out var entityProto) &&
+            entityProto.TryGetComponent<TagComponent>(out var tag) &&
+            _tagSystem.HasTag(tag, "Ore")))
+            .ToDictionary(pair => pair.Key, pair => pair.Value);
+    }
 }

Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs

@@ -1,7 +1,9 @@
 using System.Linq;
 using Content.Client.Message;
+using Content.Shared._DV.Salvage.Systems; // DeltaV
 using Content.Shared.Salvage;
 using Content.Shared.Salvage.Magnet;
+using Robust.Client.Player; // DeltaV
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
@@ -10,12 +12,16 @@ namespace Content.Client.Salvage.UI;
 public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!; // DeltaV
+
+    private readonly MiningPointsSystem _points; // DeltaV
 
     private OfferingWindow? _window;
 
     public SalvageMagnetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
         IoCManager.InjectDependencies(this);
+        _points = _entManager.System<MiningPointsSystem>(); // DeltaV
     }
 
     protected override void Open()
@@ -61,6 +67,21 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 });
             };
 
+            // Begin DeltaV Additions: Mining points cost for wrecks
+            if (offer.Cost > 0)
+            {
+                if (_player.LocalSession?.AttachedEntity is not {} user || !_points.UserHasPoints(user, offer.Cost))
+                    option.Disabled = true;
+
+                var label = new Label
+                {
+                    Text = Loc.GetString("salvage-magnet-mining-points-cost", ("points", offer.Cost)),
+                    HorizontalAlignment = Control.HAlignment.Center
+                };
+                option.AddContent(label);
+            }
+            // End DeltaV Additions
+
             switch (offer)
             {
                 case AsteroidOffering asteroid:

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -1,5 +1,7 @@
 using System.Linq;
+using System.Numerics;
 using Content.Client.Gameplay;
+using Content.Shared._White.Blink;
 using Content.Shared.CombatMode;
 using Content.Shared.Effects;
 using Content.Shared.Hands.Components;
@@ -9,6 +11,7 @@
 using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -30,6 +33,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly InputSystem _inputSystem = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly TransformSystem _transform = default!; // Goobstation
 
     private EntityQuery<TransformComponent> _xformQuery;
 
@@ -90,6 +94,12 @@ public override void Update(float frameTime)
 
         // TODO using targeted actions while combat mode is enabled should NOT trigger attacks.
 
+        // TODO: Need to make alt-fire melee its own component I guess?
+        // Melee and guns share a lot in the middle but share virtually nothing at the start and end so
+        // it's kinda tricky.
+        // I think as long as we make secondaries their own component it's probably fine
+        // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
+
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
         if (mousePos.MapId == MapId.Nullspace)
@@ -107,28 +117,28 @@ public override void Update(float frameTime)
         {
             coordinates = TransformSystem.ToCoordinates(_map.GetMap(mousePos.MapId), mousePos);
         }
-        
+
         // If the gun has AltFireComponent, it can be used to attack.
         if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
         {
             if (!TryComp<AltFireMeleeComponent>(weaponUid, out var altFireComponent) || altDown != BoundKeyState.Down)
                 return;
-            
+
             switch(altFireComponent.AttackType)
             {
                 case AltFireAttackType.Light:
                     ClientLightAttack(entity, mousePos, coordinates, weaponUid, weapon);
                     break;
-                
+
                 case AltFireAttackType.Heavy:
                     ClientHeavyAttack(entity, coordinates, weaponUid, weapon);
                     break;
-                
+
                 case AltFireAttackType.Disarm:
                     ClientDisarm(entity, mousePos, coordinates);
                     break;
             }
-            
+
             return;
         }
 
@@ -222,7 +232,7 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
         var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
         RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
     }
-    
+
     private void ClientDisarm(EntityUid attacker, MapCoordinates mousePos, EntityCoordinates coordinates)
     {
         EntityUid? target = null;
@@ -232,7 +242,7 @@ private void ClientDisarm(EntityUid attacker, MapCoordinates mousePos, EntityCoo
 
         RaisePredictiveEvent(new DisarmAttackEvent(GetNetEntity(target), GetNetCoordinates(coordinates)));
     }
-    
+
     private void ClientLightAttack(EntityUid attacker, MapCoordinates mousePos, EntityCoordinates coordinates, EntityUid weaponUid, MeleeWeaponComponent meleeComponent)
     {
         var attackerPos = TransformSystem.GetMapCoordinates(attacker);

Content.Client/_DV/Salvage/UI/MiningVoucherBoundUserInterface.cs

@@ -0,0 +1,27 @@
+using Content.Shared._DV.Salvage;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._DV.Salvage.UI;
+
+public sealed class MiningVoucherBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private MiningVoucherMenu? _menu;
+
+    public MiningVoucherBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<MiningVoucherMenu>();
+        _menu.SetEntity(Owner);
+        _menu.OnSelected += i =>
+        {
+            SendMessage(new MiningVoucherSelectMessage(i));
+            Close();
+        };
+    }
+}

Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml

@@ -0,0 +1,10 @@
+<ui:RadialMenu xmlns="https://spacestation14.io"
+        xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+        BackButtonStyleClass="RadialMenuBackButton"
+        CloseButtonStyleClass="RadialMenuCloseButton"
+        VerticalExpand="True"
+        HorizontalExpand="True"
+        MinSize="450 450">
+    <!-- Populated in SetEntity -->
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" InitialRadius="64"/>
+</ui:RadialMenu>