new-frontiers-14 · dvir001 · Jul 28, 2023 · Jul 29, 2023 · Jul 29, 2023 · Jul 29, 2023
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -112,6 +112,17 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                     cost = (int) (cost * priceModifier);
                 }
 
+                // This block exists to allow the MarketPrice flag to set a price
+                if (prototype != null && prototype.TryGetComponent<MarketPriceComponent>(out var marketPriceComponent))
+                {
+                    if (marketPriceComponent.Price != 0)
+                    {
+                        var price = (float) marketPriceComponent.Price;
+                        cost = (int) (price);
+                    }
+                }
+                // This block exists to allow the MarketPrice flag to set a price
+
                 vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]";
                 vendingItem.Icon = icon;
             }

diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -164,6 +164,26 @@ public double GetEstimatedPrice(EntityPrototype prototype)
         return price;
     }
 
+    public double GetEstimatedMarketPrice(EntityPrototype prototype)
+    {
+        var ev = new EstimatedPriceCalculationEvent()
+        {
+            Prototype = prototype,
+        };
+
+        RaiseLocalEvent(ref ev);
+
+        if (ev.Handled)
+            return ev.Price;
+
+        var price = ev.Price;
+        price += GetMarketPrice(prototype);
+
+        // TODO: Proper container support.
+
+        return price;
+    }
+
     /// <summary>
     /// Appraises an entity, returning it's price.
     /// </summary>
@@ -328,6 +348,31 @@ private double GetStaticPrice(EntityPrototype prototype)
         return price;
     }
 
+    private double GetMarketPrice(EntityUid uid)
+    {
+        var price = 0.0;
+
+        if (TryComp<MarketPriceComponent>(uid, out var marketPrice))
+        {
+            price += marketPrice.Price;
+        }
+
+        return price;
+    }
+
+    private double GetMarketPrice(EntityPrototype prototype)
+    {
+        var price = 0.0;
+
+        if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(MarketPriceComponent)), out var marketProto))
+        {
+            var marketPrice = (MarketPriceComponent) marketProto.Component;
+            price += marketPrice.Price;
+        }
+
+        return price;
+    }
+
     /// <summary>
     /// Appraises a grid, this is mainly meant to be used by yarrs.
     /// </summary>

diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -345,6 +345,12 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type,
 
             var totalPrice = ((int) price);
 
+            // This block exists to allow the MarketPrice flag to set a price
+            var priceMarket = _pricing.GetEstimatedMarketPrice(proto);
+            if (priceMarket == null || priceMarket == 0) { }
+            else { totalPrice = ((int) priceMarket); }
+            // This block exists to allow the MarketPrice flag to set a price
+
             if (totalPrice > bank.Balance)
             {
                 _popupSystem.PopupEntity(Loc.GetString("bank-insufficient-funds"), uid);

diff --git a/Content.Shared/Cargo/Components/MarketPriceComponent.cs b/Content.Shared/Cargo/Components/MarketPriceComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// This is used for setting a static, unchanging price for buying an object.
+/// </summary>
+[RegisterComponent]
+public sealed class MarketPriceComponent : Component
+{
+    /// <summary>
+    /// The price of the object this component is on.
+    /// </summary>
+    [DataField("price", required: true)]
+    public double Price;
+}
diff --git a/Resources/Audio/_NF/Items/Toys/wehhelp.ogg b/Resources/Audio/_NF/Items/Toys/wehhelp.ogg
diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -9,9 +9,6 @@ adventure-title = New Frontier Adventure Mode
 adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches!
 currency = Spesos
 
-advertisement-astrovend-1 = Spessman's Choice!
-advertisement-astrovend-2 = Don't leave home without a suit!
-
 guide-entry-adventure = New Frontiers Program
 guide-entry-bank = NT Galactic Bank
 guide-entry-shipyard = Frontier Shipyards

diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl
@@ -0,0 +1,2 @@
+advertisement-astrovend-1 = Spessman's Choice!
+advertisement-astrovend-2 = Don't leave home without a suit!
diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl
@@ -0,0 +1,8 @@
+advertisement-cuddlycritter-1 = Brighten your day with a fluffy friend!
+advertisement-cuddlycritter-2 = Hug therapy starts here!
+advertisement-cuddlycritter-3 = Give in to the plushie temptation!
+advertisement-cuddlycritter-4 = You won't resist their charm!
+advertisement-cuddlycritter-5 = Warning: Extreme cuteness ahead!
+advertisement-cuddlycritter-6 = Help me I'm trapped in a NanoTrasen factory forced to make Plushies!
+advertisement-cuddlycritter-7 = Softer then asbestos!
+advertisement-cuddlycritter-8 = The best crayon colors in space, proposition 65
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl
@@ -5,4 +5,7 @@ ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled
     .desc = { ent-CrateVendingMachineRestockAmmoFilled.desc }
 
 ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled }
-    .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc }
+    .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc }
+
+ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled }
+    .desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc }
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -1,8 +1,11 @@
 ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
-    .desc = Contains two restock boxes for the AstroVend vendor.
+    .desc = Contains two restock boxes for the AstroVend vending machine.
 
 ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
     .desc = Contains two restock boxes for the Liberation vending machine.
 
 ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate
-    .desc = Contains two restock boxes for a CircuitVend vending machine.
+    .desc = Contains two restock boxes for a CircuitVend vending machine.
+
+ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate
+    .desc = Contains two restock boxes for a CuddlyCritterVend vending machine.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -245,6 +245,8 @@
       - id: ClothingHeadBandRed
       - id: FoamCutlass
         amount: 2
+      - id: ClothingEyesEyepatch
+        amount: 2
 
 - type: entity
   id: CrateFunToyBox

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
@@ -7,4 +7,3 @@
     FoodSnackSyndi: 3
     DrinkRamen: 3
     DrinkHellRamen: 2
-
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -9,5 +9,5 @@
     DrinkDrGibbCan: 3
     DrinkFourteenLokoCan: 3
   emaggedInventory:
-    DrinkNukieCan: 3
-    DrinkChangelingStingCan: 3
+    DrinkNukieCan: 2
+    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1322,6 +1322,8 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/nothing.rsi
+  - type: MarketPrice
+    price: 1
 
 - type: entity
   parent: DrinkGlassBase
@@ -2155,7 +2157,7 @@
     - Trash
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 7.5
+    price: 5.5
 
 - type: entity
   parent: DrinkRamen

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -59,6 +59,7 @@
   - type: StaticPrice
     price: 5.5
 
+
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkColaCan
@@ -321,6 +322,8 @@
     sprite: Objects/Consumable/Drinks/robustnukie.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/robustnukie.rsi
+  - type: StaticPrice
+    price: 20
 
 - type: entity
   parent: DrinkCanBaseFull

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -39,7 +39,7 @@
         Blunt: 0
   - type: ItemCooldown
   - type: StaticPrice
-    price: 4.5
+    price: 4
 
 - type: entity
   parent: DrinkBaseCup

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -10,6 +10,8 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
+  - type: StaticPrice
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -29,7 +31,7 @@
   - type: TrashOnEmpty
     solution: drink
   - type: StaticPrice
-    price: 12.5
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -40,6 +42,8 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/detflask.rsi
+  - type: StaticPrice
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -50,6 +54,8 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
+  - type: StaticPrice
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -60,6 +66,8 @@
     - type: Drink
     - type: Sprite
       sprite: Objects/Consumable/Drinks/barflask.rsi
+    - type: StaticPrice
+      price: 7
 
 - type: entity
   parent: DrinkBase
@@ -70,6 +78,8 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
+  - type: StaticPrice
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -80,6 +90,8 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
+  - type: StaticPrice
+    price: 7
 
 - type: entity
   parent: DrinkBase
@@ -90,3 +102,5 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vacuumflask.rsi
+  - type: StaticPrice
+    price: 7
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -23,7 +23,8 @@
     sprite: Objects/Consumable/Food/Baked/donut.rsi
     size: 1
   - type: StaticPrice
-    price: 12
+    price: 5
+
 # Tastes like donut.
 
 # The sprinkles are now an overlay, so you can put them on any donut! If we really

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -64,6 +64,8 @@
     - box5
     - pink-box6
   - type: Appearance
+  - type: StaticPrice
+    price: 12
 
 # Egg
 

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -53,7 +53,9 @@
     materialComposition:
       Plastic: 50
   - type: StaticPrice
-    price: 4.5
+    price: 1
+  - type: MarketPrice
+    price: 5
 
 - type: entity
   parent: BaseFoodCondimentPacket

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -49,7 +49,9 @@
       Glass: 100
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 3
+    price: 2
+  - type: MarketPrice
+    price: 10
 
 - type: entity
   name: broken plate
@@ -66,6 +68,8 @@
   - type: SpaceGarbage
   - type: StaticPrice
     price: 1
+  - type: MarketPrice
+    price: 5
 
 # Small Plate
 
@@ -97,6 +101,8 @@
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 2
+  - type: MarketPrice
+    price: 10
 
 - type: entity
   parent: FoodPlateTrash
@@ -105,6 +111,8 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/plates.rsi
     state: plate-small-trash
+  - type: StaticPrice
+    price: 1
 
 # Plastic Plate
 
@@ -122,6 +130,8 @@
     - Trash
   - type: StaticPrice
     price: 1
+  - type: MarketPrice
+    price: 5
 
 - type: entity
   name: plastic plate
@@ -137,6 +147,8 @@
     - Trash
   - type: StaticPrice
     price: 1
+  - type: MarketPrice
+    price: 5
 
 # Pie Tin