Enhanced alcoholism v2

Content.Client/Bank/UI/BankATMMenu.xaml.cs

@@ -1,3 +1,8 @@
+/*
+ * New Frontiers - This file is licensed under AGPLv3
+ * Copyright (c) 2024 New Frontiers Contributors
+ * See AGPLv3.txt for details.
+ */
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -22,13 +27,16 @@ public BankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
-        DepositLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        if (amount >= 0) // Valid
+            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        else
+            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
 
     public void SetEnabled(bool enabled)

Content.Client/Bank/UI/StationBankATMMenu.xaml.cs

@@ -1,3 +1,8 @@
+/*
+ * New Frontiers - This file is licensed under AGPLv3
+ * Copyright (c) 2024 New Frontiers Contributors
+ * See AGPLv3.txt for details.
+ */
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -36,13 +41,16 @@ private void OnReasonSelected(OptionButton.ItemSelectedEventArgs args)
     }
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
-        DepositLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        if (amount >= 0) // Valid
+            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        else
+            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
 
     public void SetEnabled(bool enabled)

Content.Client/Bank/UI/WithdrawBankATMMenu.cs

@@ -1,3 +1,8 @@
+/*
+ * New Frontiers - This file is licensed under AGPLv3
+ * Copyright (c) 2024 New Frontiers Contributors
+ * See AGPLv3.txt for details.
+ */
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,7 +26,7 @@ public WithdrawBankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
     }
 
     public void SetEnabled(bool enabled)

Content.Client/Shuttles/UI/NavScreen.xaml

@@ -80,5 +80,16 @@
                         <controls:Label Text="{controls:Loc 'shuttle-console-iff-search'}"></controls:Label>
                         <controls:LineEdit Name="IffSearchCriteria" Access="Public" HorizontalExpand="True"></controls:LineEdit>
                     </controls:BoxContainer>
+
+                    <!-- Frontier - Maximum IFF Distance -->
+                    <controls:BoxContainer Orientation="Vertical" HorizontalExpand="True" Name="MaximumIFFDistanceBox">
+                        <controls:Label Text="{controls:Loc 'shuttle-console-maximum-iff-distance'}"/>
+                        <controls:SliderIntInput Name="MaximumIFFDistanceValue"
+                                         Access="Public"
+                                         MinValue="0"
+                                         MaxValue="3000"
+                                         Value="3000"
+                                         HorizontalExpand="True"/>
+                    </controls:BoxContainer>
                 </controls:BoxContainer>
             </controls:BoxContainer>

Content.Client/Shuttles/UI/NavScreen.xaml.cs

@@ -35,6 +35,10 @@ public NavScreen()
 
         // Frontier - IFF search
         IffSearchCriteria.OnTextChanged += args => OnIffSearchChanged(args.Text);
+
+        // Frontier - Maximum IFF Distance
+        MaximumIFFDistanceValue.GetChild(0).GetChild(1).Margin = new Thickness(8,0,0,0);
+        MaximumIFFDistanceValue.OnValueChanged += args => OnRangeFilterChanged(args);
     }
 
     // Frontier - IFF search
@@ -51,6 +55,12 @@ private void OnIffSearchChanged(string text)
             };
     }
 
+    // Frontier - Maximum IFF Distance
+    private void OnRangeFilterChanged(int value)
+    {
+        NavRadar.MaximumIFFDistance = (float) value;
+    }
+
     public void SetShuttle(EntityUid? shuttle)
     {
         _shuttleEntity = shuttle;

Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs

@@ -38,6 +38,8 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
     public bool ShowIFFShuttles { get; set; } = true;
     public bool ShowDocks { get; set; } = true;
 
+    public float MaximumIFFDistance { get; set; } = -1f; // Frontier
+
     /// <summary>
     ///   If present, called for every IFF. Must determine if it should or should not be shown.
     /// </summary>
@@ -224,6 +226,20 @@ protected override void Draw(DrawingHandleScreen handle)
                 shouldDrawIFF &= ShowIFFShuttles;
             }
 
+            // New Frontiers - Maximum IFF Distance - checks distance to object, draws if closer than max range
+            // This code is licensed under AGPLv3. See AGPLv3.txt
+            if (shouldDrawIFF && MaximumIFFDistance >= 0.0f)
+            {
+                var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
+                var distance = gridCentre.Length();
+
+                if (distance > MaximumIFFDistance)
+                {
+                    shouldDrawIFF = false;
+                }
+            }
+            // End of modified code
+
             if (shouldDrawIFF)
             {
                 var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);

Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs

@@ -2,7 +2,6 @@
 using Content.Client.UserInterface.Controls;
 using Content.Shared.VendingMachines;
 using Content.Shared.Cargo.Components;
-using Content.Shared._NF.Cargo.Components;
 using Content.Shared.Stacks;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -150,9 +149,9 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                 }
 
                 // This block exists to allow the VendPrice flag to set a vending machine item price.
-                if (prototype != null && prototype.TryGetComponent<VendPriceComponent>(out var vendPriceComponent) && vendPriceComponent.Price != 0 && cost <= (float) vendPriceComponent.Price)
+                if (prototype != null && prototype.TryGetComponent<StaticPriceComponent>(out var vendPriceComponent) && vendPriceComponent.VendPrice != 0 && cost <= (float) vendPriceComponent.VendPrice)
                 {
-                    var price = (float) vendPriceComponent.Price;
+                    var price = (float) vendPriceComponent.VendPrice;
                     cost = (int) price;
                 }
                 // This block exists to allow the VendPrice flag to set a vending machine item price.

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -6,7 +6,6 @@
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
 using Content.Shared.Cargo.Components;
-using Content.Shared._NF.Cargo.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Materials;
@@ -385,10 +384,10 @@ private double GetVendPrice(EntityPrototype prototype)
     {
         var price = 0.0;
 
-        if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(VendPriceComponent)), out var vendProto))
+        if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StaticPriceComponent)), out var vendProto))
         {
-            var vendPrice = (VendPriceComponent) vendProto.Component;
-            price += vendPrice.Price;
+            var vendPrice = (StaticPriceComponent) vendProto.Component;
+            price += vendPrice.VendPrice;
         }
 
         return price;

Content.Server/Forensics/Components/FiberComponent.cs

@@ -12,5 +12,8 @@ public sealed partial class FiberComponent : Component
 
         [DataField]
         public string? FiberColor;
+
+        [DataField]
+        public string? Fiberprint; // DeltaV, unique glove fibers
     }
 }

Content.Server/Forensics/Systems/ForensicsSystem.cs

@@ -26,6 +26,7 @@ public sealed class ForensicsSystem : EntitySystem
         public override void Initialize()
         {
             SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
+            SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit); // DeltaV #1455 - unique glove fibers
             SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
             SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
 
@@ -44,6 +45,13 @@ private void OnInteract(EntityUid uid, FingerprintComponent component, ContactIn
             ApplyEvidence(uid, args.Other);
         }
 
+        // DeltaV #1455 - unique glove fibers
+        private void OnFiberInit(EntityUid uid, FiberComponent component, MapInitEvent args)
+        {
+            component.Fiberprint = GenerateFingerprint(length: 7);
+        }
+        // End of DeltaV code
+
         private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
         {
             component.Fingerprint = GenerateFingerprint();
@@ -203,9 +211,9 @@ private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component
                 targetComp.Residues.Add(string.IsNullOrEmpty(residue.ResidueColor) ? Loc.GetString("forensic-residue", ("adjective", residue.ResidueAdjective)) : Loc.GetString("forensic-residue-colored", ("color", residue.ResidueColor), ("adjective", residue.ResidueAdjective)));
         }
 
-        public string GenerateFingerprint()
+        public string GenerateFingerprint(int length = 16) // DeltaV #1455 - allow changing the length of the fingerprint hash
         {
-            var fingerprint = new byte[16];
+            var fingerprint = new byte[length]; // DeltaV #1455 - allow changing the length of the fingerprint hash
             _random.NextBytes(fingerprint);
             return Convert.ToHexString(fingerprint);
         }
@@ -231,8 +239,15 @@ private void ApplyEvidence(EntityUid user, EntityUid target)
             var component = EnsureComp<ForensicsComponent>(target);
             if (_inventory.TryGetSlotEntity(user, "gloves", out var gloves))
             {
+                // DeltaV #1455 - unique glove fibers
                 if (TryComp<FiberComponent>(gloves, out var fiber) && !string.IsNullOrEmpty(fiber.FiberMaterial))
-                    component.Fibers.Add(string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
+                {
+                    var fiberLocale = string.IsNullOrEmpty(fiber.FiberColor)
+                        ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial))
+                        : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial));
+                    component.Fibers.Add(fiberLocale + " ; " + fiber.Fiberprint);
+                }
+                // End of DeltaV code
 
                 if (HasComp<FingerprintMaskComponent>(gloves))
                     return;

Content.Server/Nutrition/EntitySystems/FoodSystem.cs

@@ -292,6 +292,8 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
 
         args.Repeat = !forceFeed;
 
+        _solutionContainer.SetCapacity(soln.Value, soln.Value.Comp.Solution.MaxVolume - transferAmount); // Frontier: remove food capacity after taking a bite.
+
         if (TryComp<StackComponent>(entity, out var stack))
         {
             //Not deleting whole stack piece will make troubles with grinding object

Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs

@@ -62,6 +62,8 @@ private bool TrySliceFood(EntityUid uid, EntityUid user, EntityUid usedItem,
 
             var lostSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume / FixedPoint2.New(component.Count));
 
+            _solutionContainerSystem.SetCapacity(soln.Value, soln.Value.Comp.Solution.MaxVolume - solution.MaxVolume / FixedPoint2.New(component.Count)); // Frontier: remove food capacity after taking a slice.
+
             // Fill new slice
             FillSlice(sliceUid, lostSolution);
 

Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs

@@ -3,8 +3,9 @@
 using Content.Shared.Damage.Events;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.Containers;
 using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared.Wieldable.Components;
+using Robust.Shared.Containers;
 
 namespace Content.Server.Abilities.Oni
 {
@@ -32,8 +33,8 @@ private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedInt
 
             if (TryComp<GunComponent>(args.Entity, out var gun))
             {
-                // Frontier: adjust penalty for wielded malus
-                if (TryComp<GunWieldBonusComponent>(args.Entity, out var bonus))
+                // Frontier: adjust penalty for wielded malus (ensuring it's actually wieldable)
+                if (TryComp<GunWieldBonusComponent>(args.Entity, out var bonus) && HasComp<WieldableComponent>(args.Entity))
                 {
                     //GunWieldBonus values are stored as negative.
                     heldComp.minAngleAdded = (gun.MinAngle + bonus.MinAngle) * GunInaccuracyFactor;