Merge branch 'EMP-Guns' of https://github.com/dvir001/frontier-statio…

…n-14 into EMP-Guns

Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml

@@ -4,6 +4,10 @@
 
         <!-- New Contract Details -->
         <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
+            <BoxContainer Orientation="Horizontal" Margin="4,4,4,4">
+                <Label Text="{Loc 'bounty-contracts-ui-create-category'}" MinWidth="80"/>
+                <OptionButton Name="CategorySelector" HorizontalExpand="True" />
+            </BoxContainer>
             <BoxContainer Orientation="Horizontal" Margin="4,4,4,4">
                 <Label Text="{Loc 'bounty-contracts-ui-create-name'}" MinWidth="80"/>
                 <OptionButton Name="NameSelector" HorizontalExpand="True"/>
@@ -13,7 +17,7 @@
                 <Button Name="CustomNameButton" Text="{Loc 'bounty-contracts-ui-create-custom'}"
                         ToggleMode="True"/>
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4,4,4,4">
+            <BoxContainer Name="DnaBox" Orientation="Horizontal" Margin="4,4,4,4">
                 <Label Text="{Loc 'bounty-contracts-ui-create-dna'}" MinWidth="80"/>
                 <Label Name="DnaLabel" Text="{Loc 'bounty-contracts-ui-create-dna-unknown'}"
                           HorizontalExpand="True"/>
@@ -41,7 +45,7 @@
                 <PanelContainer StyleClasses="LowDivider" />
             </BoxContainer>
             <RichTextLabel Name="DisclaimerLabel" Margin="4,4,4,4"
-                           HorizontalExpand="True"/>
+                           HorizontalExpand="True" Visible="False"/>
         </BoxContainer>
 
         <!-- Footer -->

Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs

@@ -20,21 +20,23 @@ public sealed partial class BountyContractUiFragmentCreate : Control
     public BountyContractUiFragmentCreate()
     {
         RobustXamlLoader.Load(this);
-        NameSelector.OnItemSelected += (opt) => OnNameSelected(opt.Id);
-        VeselSelector.OnItemSelected += (opt) => OnVesselSelected(opt.Id);
+        CategorySelector.OnItemSelected += opt => OnCategorySelected(opt.Id);
+        NameSelector.OnItemSelected += opt => OnNameSelected(opt.Id);
+        VeselSelector.OnItemSelected += opt => OnVesselSelected(opt.Id);
 
-        CustomNameButton.OnToggled += OnCustomNameToggle;
-        CustomVeselButton.OnToggled += OnCustomVeselToggle;
+        CustomNameButton.OnToggled += args => OnCustomNameToggle(args.Pressed);
+        CustomVeselButton.OnToggled += args =>  OnCustomVeselToggle(args.Pressed);
         NameEdit.OnTextChanged += NameEditOnTextChanged;
         RewardEdit.OnTextChanged += OnPriceChanged;
 
         var descPlaceholder = Loc.GetString("bounty-contracts-ui-create-description-placeholder");
         DescriptionEdit.Placeholder = new Rope.Leaf(descPlaceholder);
-        RewardEdit.Text = SharedBountyContractSystem.MinimalReward.ToString();
+        RewardEdit.Text = SharedBountyContractSystem.DefaultReward.ToString();
 
         CreateButton.OnPressed += _ => OnCreatePressed?.Invoke(GetBountyContract());
         CancelButton.OnPressed += _ => OnCancelPressed?.Invoke();
 
+        FillCategories();
         UpdateDisclaimer();
     }
 
@@ -84,9 +86,25 @@ public void SetVessels(List<string> vessels)
         OnVesselSelected(0);
     }
 
+    private void FillCategories()
+    {
+        foreach (var (id, meta) in SharedBountyContractSystem.CategoriesMeta)
+        {
+            var name = Loc.GetString(meta.Name);
+            CategorySelector.AddItem(name, (byte) id);
+        }
+    }
+
     private void UpdateDna(string? dnaStr)
     {
-        DnaLabel.Text = dnaStr ?? Loc.GetString("bounty-contracts-ui-create-dna-unknown");
+        if (string.IsNullOrEmpty(dnaStr))
+        {
+            DnaBox.Visible = false;
+            return;
+        }
+
+        DnaBox.Visible = true;
+        DnaLabel.Text = dnaStr;
     }
 
     private void OnNameSelected(int itemIndex)
@@ -112,19 +130,28 @@ private void OnVesselSelected(int itemIndex)
         VeselSelector.SelectId(itemIndex);
     }
 
-    private void OnCustomNameToggle(BaseButton.ButtonToggledEventArgs customToggle)
+    private void OnCategorySelected(int objId)
+    {
+        var cat = (BountyContractCategory) objId;
+        CustomNameButton.Pressed = cat != BountyContractCategory.Criminal;
+        OnCustomNameToggle(CustomNameButton.Pressed);
+
+        CategorySelector.SelectId(objId);
+    }
+
+    private void OnCustomNameToggle(bool isPressed)
     {
-        NameSelector.Visible = !customToggle.Pressed;
-        NameEdit.Visible = customToggle.Pressed;
+        NameSelector.Visible = !isPressed;
+        NameEdit.Visible = isPressed;
 
         UpdateDna(GetTargetDna());
         UpdateDisclaimer();
     }
 
-    private void OnCustomVeselToggle(BaseButton.ButtonToggledEventArgs customToggle)
+    private void OnCustomVeselToggle(bool isPressed)
     {
-        VeselSelector.Visible = !customToggle.Pressed;
-        VeselEdit.Visible = customToggle.Pressed;
+        VeselSelector.Visible = !isPressed;
+        VeselEdit.Visible = isPressed;
 
         OnVesselSelected(0);
     }
@@ -133,10 +160,9 @@ private void UpdateDisclaimer()
     {
         // check if reward is valid
         var reward = GetReward();
-        if (reward < SharedBountyContractSystem.MinimalReward)
+        if (reward == null || reward < 0)
         {
-            var err = Loc.GetString("bounty-contracts-ui-create-error-too-cheap",
-                ("reward", SharedBountyContractSystem.MinimalReward));
+            var err = Loc.GetString("bounty-contracts-ui-create-error-invalid-price");
             DisclaimerLabel.SetMessage(err);
             CreateButton.Disabled = true;
             return;
@@ -157,10 +183,10 @@ private void UpdateDisclaimer()
         CreateButton.Disabled = false;
     }
 
-    public int GetReward()
+    public int? GetReward()
     {
         var priceStr = RewardEdit.Text;
-        return int.TryParse(priceStr, out var price) ? price : 0;
+        return int.TryParse(priceStr, out var price) ? price : null;
     }
 
     public BountyContractTargetInfo? GetTargetInfo()
@@ -214,15 +240,21 @@ public string GetVessel()
         return vessel;
     }
 
+    public BountyContractCategory GetCategory()
+    {
+        return (BountyContractCategory) CategorySelector.SelectedId;
+    }
+
     public BountyContractRequest GetBountyContract()
     {
         var info = new BountyContractRequest
         {
+            Category = GetCategory(),
             Name = GetTargetName(),
             DNA = GetTargetDna(),
             Vessel = GetVessel(),
             Description = Rope.Collapse(DescriptionEdit.TextRope),
-            Reward = GetReward()
+            Reward = GetReward() ?? 0
         };
         return info;
     }

Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml

@@ -1,12 +1,13 @@
 <Control xmlns="https://spacestation14.io">
-    <PanelContainer Margin="8,8,8,8" StyleClasses="AngleRect" >
-        <BoxContainer Orientation="Vertical">
+    <PanelContainer Name="BountyPanel" Margin="8" StyleClasses="AngleRect" >
+        <BoxContainer Orientation="Vertical" Margin="4" >
             <BoxContainer Orientation="Horizontal">
                 <Label Name="BountyName" HorizontalExpand="True" />
                 <Label Name="BountyReward" HorizontalExpand="True"
                        HorizontalAlignment="Right"/>
             </BoxContainer>
             <PanelContainer StyleClasses="HighDivider" />
+            <Label Name="BountyCategory" StyleClasses="WindowFooterText"/>
             <BoxContainer HorizontalExpand="True">
                 <RichTextLabel Name="BountyDescription" StyleClasses="LabelSubText"/>
             </BoxContainer>

Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs

@@ -39,5 +39,14 @@ public BountyContractUiFragmentListEntry(BountyContract contract, bool canRemove
         // remove button
         RemoveButton.OnPressed += _ => OnRemoveButtonPressed?.Invoke(contract);
         RemoveButton.Disabled = !canRemoveContracts;
+
+        // color
+        var meta = SharedBountyContractSystem.CategoriesMeta[contract.Category];
+        BountyPanel.ModulateSelfOverride = meta.UiColor;
+
+        // category
+        var category = Loc.GetString(meta.Name);
+        BountyCategory.Text = Loc.GetString("bounty-contracts-ui-list-category",
+            ("category", category));
     }
 }

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

@@ -172,7 +172,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
                 $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bankAccount.Balance}");
             if (TryComp<StationBankAccountComponent>(_station.GetOwningStation(uid), out var stationBank))
             {
-                DeductFunds(stationBank, -(cost / 2));
+                DeductFunds(stationBank, (int) -(Math.Floor(cost * 0.65f)));
             }
             _bankSystem.TryBankWithdraw(player, cost);
 

Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

@@ -287,9 +287,16 @@ private bool CanSell(EntityUid uid, TransformComponent xform)
     {
         if (_mobQuery.HasComponent(uid))
         {
-            return false;
+            if (_mobQuery.GetComponent(uid).CurrentState == MobState.Alive)
+            {
+                return false;
+            }
+
+            return true;
         }
 
+
+
         // Recursively check for mobs at any point.
         var children = xform.ChildEnumerator;
         while (children.MoveNext(out var child))

Content.Server/VendingMachines/VendingMachineSystem.cs

@@ -360,7 +360,7 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type,
                     {
                         if (TryComp<StationBankAccountComponent>(_station.GetOwningStation(uid), out var stationBank))
                         {
-                            _cargo.DeductFunds(stationBank, -(totalPrice / 2));
+                            _cargo.DeductFunds(stationBank, (int) -(Math.Floor(totalPrice * 0.65f)));
                         }
                         UpdateVendingMachineInterfaceState(uid, component, bank.Balance);
                     }

Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs

@@ -131,11 +131,8 @@ private void OnTryCreateContract(EntityUid uid, CartridgeLoaderComponent compone
             return;
 
         var c = args.Contract;
-        if (c.Reward < MinimalReward)
-            return;
-
         var author = GetContractAuthor(args.Entity);
-        CreateBountyContract(c.Name, c.Reward, c.Description, c.Vessel, c.DNA, author);
+        CreateBountyContract(c.Category, c.Name, c.Reward, c.Description, c.Vessel, c.DNA, author);
 
         CartridgeOpenListUi(args.Entity);
     }

Content.Server/_NF/BountyContracts/BountyContractSystem.cs

@@ -59,6 +59,7 @@ private void OnRoundStarting(RoundStartingEvent ev)
     /// <summary>
     ///     Try to create a new bounty contract and put it in bounties list.
     /// </summary>
+    /// <param name="category">Bounty contract category (bounty head, construction, etc.)</param>
     /// <param name="name">IC name for the contract bounty head. Can be players IC name or custom string.</param>
     /// <param name="reward">Cash reward for completing bounty. Can be zero.</param>
     /// <param name="description">IC description of players crimes, details, etc.</param>
@@ -67,7 +68,8 @@ private void OnRoundStarting(RoundStartingEvent ev)
     /// <param name="author">Optional bounty poster IC name.</param>
     /// <param name="postToRadio">Should radio message about contract be posted in general radio channel?</param>
     /// <returns>New bounty contract. Null if contract creation failed.</returns>
-    public BountyContract? CreateBountyContract(string name, int reward,
+    public BountyContract? CreateBountyContract(BountyContractCategory category,
+        string name, int reward,
         string? description = null, string? vessel = null,
         string? dna = null, string? author = null,
         bool postToRadio = true)
@@ -78,7 +80,7 @@ private void OnRoundStarting(RoundStartingEvent ev)
 
         // create a new contract
         var contractId = data.LastId++;
-        var contract = new BountyContract(contractId, name, reward,
+        var contract = new BountyContract(contractId, category, name, reward,
             dna, vessel, description, author);
 
         // try to save it

Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs

@@ -2,6 +2,23 @@
 
 namespace Content.Shared._NF.BountyContracts;
 
+[Serializable, NetSerializable]
+public enum BountyContractCategory : byte
+{
+    Criminal,
+    Vacancy,
+    Construction,
+    Service,
+    Other
+}
+
+[Serializable, NetSerializable]
+public struct BountyContractCategoryMeta
+{
+    public string Name;
+    public Color UiColor;
+}
+
 [NetSerializable, Serializable]
 public struct BountyContractTargetInfo
 {
@@ -27,6 +44,7 @@ public override int GetHashCode()
 [NetSerializable, Serializable]
 public struct BountyContractRequest
 {
+    public BountyContractCategory Category;
     public string Name;
     public string? DNA;
     public string Vessel;
@@ -38,17 +56,19 @@ public struct BountyContractRequest
 public sealed class BountyContract
 {
     public readonly uint ContractId;
+    public readonly BountyContractCategory Category;
     public readonly string Name;
     public readonly int Reward;
     public readonly string? DNA;
     public readonly string? Vessel;
     public readonly string? Description;
     public readonly string? Author;
 
-    public BountyContract(uint contractId, string name, int reward,
-        string? dna, string? vessel, string? description, string? author)
+    public BountyContract(uint contractId, BountyContractCategory category, string name,
+        int reward, string? dna, string? vessel, string? description, string? author)
     {
         ContractId = contractId;
+        Category = category;
         Name = name;
         Reward = reward;
         DNA = dna;
@@ -129,6 +149,35 @@ public BountyContractTryCreateMsg(BountyContractRequest contract)
 
 public abstract class SharedBountyContractSystem : EntitySystem
 {
-    // TODO: Cvar?
-    public const int MinimalReward = 10000;
+    public const int DefaultReward = 5000;
+
+    // TODO: move this to prototypes?
+    public static readonly Dictionary<BountyContractCategory, BountyContractCategoryMeta> CategoriesMeta = new()
+    {
+        [BountyContractCategory.Criminal] = new BountyContractCategoryMeta
+        {
+            Name = "bounty-contracts-category-criminal",
+            UiColor = Color.FromHex("#520c0c")
+        },
+        [BountyContractCategory.Vacancy] = new BountyContractCategoryMeta
+        {
+            Name = "bounty-contracts-category-vacancy",
+            UiColor = Color.FromHex("#003866")
+        },
+        [BountyContractCategory.Construction] = new BountyContractCategoryMeta
+        {
+            Name = "bounty-contracts-category-construction",
+            UiColor = Color.FromHex("#664a06")
+        },
+        [BountyContractCategory.Service] = new BountyContractCategoryMeta
+        {
+            Name = "bounty-contracts-category-service",
+            UiColor = Color.FromHex("#01551e")
+        },
+        [BountyContractCategory.Other] = new BountyContractCategoryMeta
+        {
+            Name = "bounty-contracts-category-other",
+            UiColor = Color.FromHex("#474747")
+        },
+    };
 }