From 204240361f7874dae6b03e770f9895fef589db1e Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 01:35:15 +0200 Subject: [PATCH 1/7] Starting to fix VendPrice to replace it --- .../VendingMachines/UI/VendingMachineMenu.xaml.cs | 10 ++++++++-- .../Cargo/Components/StaticPriceComponent.cs | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index f0555750676..0ac44c67706 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -111,8 +111,14 @@ public void Populate(List inventory, float priceMo { if (priceComponent.Price != 0) { - var price = (float)priceComponent.Price; - cost = (int) (price * priceModifier); + var price = (float) priceComponent.Price; + + // Frontier - This block exists to allow the vending price to up itself without a change to static. + if (priceComponent.VendingMod == null) + price = price * priceComponent.VendingMod; + // Frontier - This block exists to allow the vending price to up itself without a change to static. + + cost = (int) (price * priceModifier); } else { diff --git a/Content.Shared/Cargo/Components/StaticPriceComponent.cs b/Content.Shared/Cargo/Components/StaticPriceComponent.cs index 320cd0a6135..3a6f9e055b2 100644 --- a/Content.Shared/Cargo/Components/StaticPriceComponent.cs +++ b/Content.Shared/Cargo/Components/StaticPriceComponent.cs @@ -11,4 +11,10 @@ public sealed partial class StaticPriceComponent : Component /// [DataField("price", required: true)] public double Price; + + /// + /// Frontier - An extra mod price for the object, added before the vending mod to allow a lower selling price compared to the vending machine price. + /// + [DataField("vendingMod", required: false)] + public float VendingMod; } From e7680d03999d59356f19f74a211424e7ccdb30e5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 02:41:46 +0200 Subject: [PATCH 2/7] Cleanup --- .../UI/VendingMachineMenu.xaml.cs | 15 +------- Content.Server/Cargo/Systems/PricingSystem.cs | 37 ------------------- .../VendingMachines/VendingMachineSystem.cs | 12 +++--- .../Cargo/Components/StaticPriceComponent.cs | 6 +-- .../Cargo/Components/VendPriceComponent.cs | 14 ------- .../Entities/Clothing/OuterClothing/bio.yml | 4 +- .../Clothing/OuterClothing/softsuits.yml | 3 +- .../Entities/Objects/Misc/monkeycube.yml | 3 +- .../Entities/Objects/Tools/fulton.yml | 2 - .../_NF/Catalog/Fills/Boxes/general.yml | 10 +++-- .../Objects/Tools/handheld_mass_scanner.yml | 3 +- 11 files changed, 22 insertions(+), 87 deletions(-) delete mode 100644 Content.Shared/_NF/Cargo/Components/VendPriceComponent.cs diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 0ac44c67706..07804058b41 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/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; @@ -113,10 +112,8 @@ public void Populate(List inventory, float priceMo { var price = (float) priceComponent.Price; - // Frontier - This block exists to allow the vending price to up itself without a change to static. - if (priceComponent.VendingMod == null) - price = price * priceComponent.VendingMod; - // Frontier - This block exists to allow the vending price to up itself without a change to static. + if (priceComponent.VendingPriceMod != 0) + price = (float) priceComponent.Price * priceComponent.VendingPriceMod; cost = (int) (price * priceModifier); } @@ -150,14 +147,6 @@ public void Populate(List inventory, float priceMo } } - // This block exists to allow the VendPrice flag to set a vending machine item price. - if (prototype != null && prototype.TryGetComponent(out var vendPriceComponent) && vendPriceComponent.Price != 0 && cost <= (float) vendPriceComponent.Price) - { - var price = (float) vendPriceComponent.Price; - cost = (int) price; - } - // This block exists to allow the VendPrice flag to set a vending machine item price. - vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]"; vendingItem.Icon = icon; filteredInventory.Add(i); diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index bf6bba6e773..3b5de6f22de 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -5,7 +5,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; @@ -172,29 +171,6 @@ public double GetEstimatedPrice(EntityPrototype prototype) return price; } - /// - /// Add a hardcoded price for an item to set how much it will cost to buy it from a vending machine, while allowing staticPrice to set its sell price. - /// - public double GetEstimatedVendPrice(EntityPrototype prototype) - { - var ev = new EstimatedPriceCalculationEvent() - { - Prototype = prototype, - }; - - RaiseLocalEvent(ref ev); - - if (ev.Handled) - return ev.Price; - - var price = ev.Price; - price += GetVendPrice(prototype); - - // TODO: Proper container support. - - return price; - } - /// /// Appraises an entity, returning it's price. /// @@ -359,19 +335,6 @@ private double GetStaticPrice(EntityPrototype prototype) return price; } - private double GetVendPrice(EntityPrototype prototype) - { - var price = 0.0; - - if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(VendPriceComponent)), out var vendProto)) - { - var vendPrice = (VendPriceComponent) vendProto.Component; - price += vendPrice.Price; - } - - return price; - } - /// /// Appraises a grid, this is mainly meant to be used by yarrs. /// diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 3a9cb0e3550..836812ee28d 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -355,17 +355,17 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, if (price == 0) price = 20; + //var price = _pricing.GetVendingMod(proto); + // This block exists to allow the VendPrice flag to set a vending machine item price. + //if (priceVend != null && totalPrice <= (int) priceVend) + // totalPrice = (int) priceVend; + // This block exists to allow the VendPrice flag to set a vending machine item price. + if (TryComp(component.Owner, out var modifier)) price *= modifier.Mod; var totalPrice = (int) price; - // This block exists to allow the VendPrice flag to set a vending machine item price. - var priceVend = _pricing.GetEstimatedVendPrice(proto); - if (priceVend != null && totalPrice <= (int) priceVend) - totalPrice = (int) priceVend; - // This block exists to allow the VendPrice flag to set a vending machine item price. - if (totalPrice > bank.Balance) { _popupSystem.PopupEntity(Loc.GetString("bank-insufficient-funds"), uid); diff --git a/Content.Shared/Cargo/Components/StaticPriceComponent.cs b/Content.Shared/Cargo/Components/StaticPriceComponent.cs index 3a6f9e055b2..e29e4f640eb 100644 --- a/Content.Shared/Cargo/Components/StaticPriceComponent.cs +++ b/Content.Shared/Cargo/Components/StaticPriceComponent.cs @@ -13,8 +13,8 @@ public sealed partial class StaticPriceComponent : Component public double Price; /// - /// Frontier - An extra mod price for the object, added before the vending mod to allow a lower selling price compared to the vending machine price. + /// Frontier - An extra mod price for the object, added before the vending machine mod to allow a lower selling price compared to the vending machine price. /// - [DataField("vendingMod", required: false)] - public float VendingMod; + [DataField("vendingPriceMod", required: false)] + public float VendingPriceMod; } diff --git a/Content.Shared/_NF/Cargo/Components/VendPriceComponent.cs b/Content.Shared/_NF/Cargo/Components/VendPriceComponent.cs deleted file mode 100644 index 84c16db2f64..00000000000 --- a/Content.Shared/_NF/Cargo/Components/VendPriceComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Content.Shared._NF.Cargo.Components; - -/// -/// This is used for setting a static, unchanging price for buying an object from a vending machine. -/// -[RegisterComponent] -public sealed partial class VendPriceComponent : Component -{ - /// - /// The price of the object this component is on. - /// - [DataField("price", required: true)] - public double Price; -} diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index 7391ea9901f..b6c7215d5f7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -13,8 +13,8 @@ modifiers: coefficients: Caustic: 0.5 - - type: VendPrice - price: 400 + - type: StaticPrice + price: 40 - type: entity parent: ClothingOuterBioGeneral diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index ab2b8b90f0a..b552090fdc7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -114,7 +114,6 @@ Radiation: 0.75 Caustic: 0.5 - type: GroupExamine - - type: VendPrice # Frontier - price: 750 - type: StaticPrice # Frontier price: 50 + vendingPriceMod: 1.5 # Frontier - 50x1.5x10=750 diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml index ff093700449..dabf67611cd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -18,8 +18,7 @@ state: box - type: StaticPrice price: 20 - - type: VendPrice - price: 900 # 150 per monkey (Meat worth 200) + vendingPriceMod: 9 # Frontier - 20x9x5=900, 150 per monkey (Meat worth 200) - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml index 57a3bab5129..ec0f5fa1547 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml @@ -80,8 +80,6 @@ acts: [ "Destruction" ] - type: StaticPrice price: 20 - - type: VendPrice - price: 12000 - type: entity id: Fulton1 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 25284bdc0ec..029e5eb42f2 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -20,8 +20,9 @@ layers: - state: box - state: syringe - - type: VendPrice - price: 200 # Single Implant Box (5 are 1000) + - type: StaticPrice + price: 20 # Single Implant Box (5 are 1000) + vendingPriceMod: 1 # Frontier - 20x1x10=200 - This is here for testing. - type: entity name: Wet floor sign box @@ -105,5 +106,6 @@ - type: Sprite layers: - state: box - - type: VendPrice - price: 1200 + - type: StaticPrice + price: 20 + vendingPriceMod: 12 # Frontier - 20x12x5=1200 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml index d132701d415..9ba5bb25d59 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml @@ -38,5 +38,4 @@ type: RadarConsoleBoundUserInterface - type: StaticPrice price: 20 - - type: VendPrice - price: 5000 + vendingPriceMod: 25 # Frontier - 20x25x10=5000 From 8ee4d2bde2b3a58d3dfded508e0f29570ab54db8 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 03:13:02 +0200 Subject: [PATCH 3/7] Update PricingSystem.cs --- Content.Server/Cargo/Systems/PricingSystem.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 3b5de6f22de..1221ab6c21e 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -335,6 +335,19 @@ private double GetStaticPrice(EntityPrototype prototype) return price; } + private double GetStaticVendingPriceMod(EntityPrototype prototype) + { + var vendingPriceMod = 0.0; + + if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StaticPriceComponent)), out var staticProto)) + { + var staticPrice = (StaticPriceComponent) staticProto.Component; + vendingPriceMod += staticPrice.VendingPriceMod; + } + + return vendingPriceMod; + } + /// /// Appraises a grid, this is mainly meant to be used by yarrs. /// From 7c2b09d3ebf939b3b539c9bd1e0780c14b1f53f9 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 03:40:00 +0200 Subject: [PATCH 4/7] Fixing Vending Calc --- Content.Server/Cargo/Systems/PricingSystem.cs | 2 +- Content.Server/VendingMachines/VendingMachineSystem.cs | 6 +++--- Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 1221ab6c21e..eb4ae049e09 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -335,7 +335,7 @@ private double GetStaticPrice(EntityPrototype prototype) return price; } - private double GetStaticVendingPriceMod(EntityPrototype prototype) + public double GetStaticVendingPriceMod(EntityPrototype prototype) { var vendingPriceMod = 0.0; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 836812ee28d..25fb3c53405 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -355,10 +355,10 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, if (price == 0) price = 20; - //var price = _pricing.GetVendingMod(proto); // This block exists to allow the VendPrice flag to set a vending machine item price. - //if (priceVend != null && totalPrice <= (int) priceVend) - // totalPrice = (int) priceVend; + var priceVend = _pricing.GetStaticVendingPriceMod(proto); + if (priceVend != 0) + price *= priceVend; // This block exists to allow the VendPrice flag to set a vending machine item price. if (TryComp(component.Owner, out var modifier)) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 029e5eb42f2..b9230b4d43c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -22,7 +22,7 @@ - state: syringe - type: StaticPrice price: 20 # Single Implant Box (5 are 1000) - vendingPriceMod: 1 # Frontier - 20x1x10=200 - This is here for testing. + vendingPriceMod: 2 # Frontier - 20x2x5=200 - This is here for testing. - type: entity name: Wet floor sign box From 7cdb205690829c7b07407e932eb25570079788c1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 03:43:37 +0200 Subject: [PATCH 5/7] Notes --- Content.Server/VendingMachines/VendingMachineSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 25fb3c53405..1e93214fc4e 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -355,11 +355,11 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, if (price == 0) price = 20; - // This block exists to allow the VendPrice flag to set a vending machine item price. + // Frontier - This block exists to allow the StaticVendingPriceMod to set a vending machine item price mod. var priceVend = _pricing.GetStaticVendingPriceMod(proto); if (priceVend != 0) price *= priceVend; - // This block exists to allow the VendPrice flag to set a vending machine item price. + // Frontier - This block exists to allow the StaticVendingPriceMod to set a vending machine item price mod. if (TryComp(component.Owner, out var modifier)) price *= modifier.Mod; From 86c48502f6a93020dfc62f009c736d09d9e2a4c9 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jan 2024 17:33:11 +0200 Subject: [PATCH 6/7] Fixing calcs --- .../VendingMachines/UI/VendingMachineMenu.xaml.cs | 4 ++-- Content.Server/Cargo/Systems/PricingSystem.cs | 6 +++--- .../VendingMachines/VendingMachineSystem.cs | 14 +++++++------- .../Cargo/Components/StaticPriceComponent.cs | 6 +++--- .../Entities/Clothing/OuterClothing/softsuits.yml | 2 +- .../Entities/Objects/Misc/monkeycube.yml | 2 +- .../Prototypes/_NF/Catalog/Fills/Boxes/general.yml | 3 +-- .../Objects/Tools/handheld_mass_scanner.yml | 3 +-- 8 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 07804058b41..956badab60a 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -112,8 +112,8 @@ public void Populate(List inventory, float priceMo { var price = (float) priceComponent.Price; - if (priceComponent.VendingPriceMod != 0) - price = (float) priceComponent.Price * priceComponent.VendingPriceMod; + if (priceComponent.VendingPriceModReplacer != 0 && priceModifier < priceComponent.VendingPriceModReplacer) + priceModifier = priceComponent.VendingPriceModReplacer; cost = (int) (price * priceModifier); } diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index eb4ae049e09..42c7906042e 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -337,15 +337,15 @@ private double GetStaticPrice(EntityPrototype prototype) public double GetStaticVendingPriceMod(EntityPrototype prototype) { - var vendingPriceMod = 0.0; + var vendingPriceModReplacer = 0.0; if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StaticPriceComponent)), out var staticProto)) { var staticPrice = (StaticPriceComponent) staticProto.Component; - vendingPriceMod += staticPrice.VendingPriceMod; + vendingPriceModReplacer += staticPrice.VendingPriceModReplacer; } - return vendingPriceMod; + return vendingPriceModReplacer; } /// diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 1e93214fc4e..d45056ad3ae 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -355,14 +355,14 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, if (price == 0) price = 20; - // Frontier - This block exists to allow the StaticVendingPriceMod to set a vending machine item price mod. - var priceVend = _pricing.GetStaticVendingPriceMod(proto); - if (priceVend != 0) - price *= priceVend; - // Frontier - This block exists to allow the StaticVendingPriceMod to set a vending machine item price mod. - if (TryComp(component.Owner, out var modifier)) - price *= modifier.Mod; + { + var vendingPriceModReplacer = _pricing.GetStaticVendingPriceMod(proto); + if (vendingPriceModReplacer != 0 && modifier.Mod < vendingPriceModReplacer) + price *= vendingPriceModReplacer; + else + price *= modifier.Mod; + } var totalPrice = (int) price; diff --git a/Content.Shared/Cargo/Components/StaticPriceComponent.cs b/Content.Shared/Cargo/Components/StaticPriceComponent.cs index e29e4f640eb..44d2079dfc4 100644 --- a/Content.Shared/Cargo/Components/StaticPriceComponent.cs +++ b/Content.Shared/Cargo/Components/StaticPriceComponent.cs @@ -13,8 +13,8 @@ public sealed partial class StaticPriceComponent : Component public double Price; /// - /// Frontier - An extra mod price for the object, added before the vending machine mod to allow a lower selling price compared to the vending machine price. + /// Frontier - Edit the vending machine mod to use a diffrent mod, can only be used to add a higher mod then the existing one of the vending machine. /// - [DataField("vendingPriceMod", required: false)] - public float VendingPriceMod; + [DataField("vendingPriceModReplacer", required: false)] + public float VendingPriceModReplacer; } diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index b552090fdc7..5e6a00ed3af 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -116,4 +116,4 @@ - type: GroupExamine - type: StaticPrice # Frontier price: 50 - vendingPriceMod: 1.5 # Frontier - 50x1.5x10=750 + vendingPriceModReplacer: 15 # Frontier - 50x15=750 diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml index dabf67611cd..d97f560f8ec 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -18,7 +18,7 @@ state: box - type: StaticPrice price: 20 - vendingPriceMod: 9 # Frontier - 20x9x5=900, 150 per monkey (Meat worth 200) + vendingPriceModReplacer: 45 # Frontier - 20x45=900, 150 per monkey (Meat worth 200) - type: entity parent: BaseItem diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index b9230b4d43c..eb03f75f5ad 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -22,7 +22,6 @@ - state: syringe - type: StaticPrice price: 20 # Single Implant Box (5 are 1000) - vendingPriceMod: 2 # Frontier - 20x2x5=200 - This is here for testing. - type: entity name: Wet floor sign box @@ -108,4 +107,4 @@ - state: box - type: StaticPrice price: 20 - vendingPriceMod: 12 # Frontier - 20x12x5=1200 + vendingPriceModReplacer: 60 # Frontier - 20x60=1200 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml index 9ba5bb25d59..36467eca4d6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml @@ -37,5 +37,4 @@ - key: enum.RadarConsoleUiKey.Key type: RadarConsoleBoundUserInterface - type: StaticPrice - price: 20 - vendingPriceMod: 25 # Frontier - 20x25x10=5000 + price: 200 From 63d17b3810c1a71aad41c6f81e0150eeb115dc0c Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 26 Jan 2024 11:50:32 +0200 Subject: [PATCH 7/7] YML Fix --- .../Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml index 9fec3f0a661..dc9be9e4bff 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml @@ -98,8 +98,6 @@ name: prize ball description: I wounder whats inside! components: - - type: VendPrice - price: 500 - type: Sprite sprite: _NF/Objects/Fun/prizeticket.rsi layers: @@ -286,3 +284,6 @@ - id: PlushieAbductorAgent prob: 0.20 orGroup: Prize + - type: StaticPrice + price: 20 + vendingPriceModReplacer: 50 # Frontier - 20x50=1000