unrandomize prices (#885)

2025-02-11 23:46:46 +03:00
parent ef3629d85d
commit aa069d1fa7
7 changed files with 39 additions and 105 deletions
--- a/Content.Server/_CP14/Cargo/CP14CargoSystem.cs
+++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.cs
@@ -147,14 +147,14 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
            if (buyPos.Special)
                availableSpecialBuyPositions.Add(buyPos);
            else
-                station.Comp.CurrentBuyPositions.Add(buyPos, buyPos.Price.Next(_random)/10*10);
+                station.Comp.CurrentBuyPositions.Add(buyPos, buyPos.Price);
        }
        foreach (var sellPos in station.Comp.AvailableSellPosition)
        {
            if (sellPos.Special)
                availableSpecialSellPositions.Add(sellPos);
            else
-                station.Comp.CurrentSellPositions.Add(sellPos, sellPos.Price.Next(_random)/10*10);
+                station.Comp.CurrentSellPositions.Add(sellPos, sellPos.Price);
        }

        //Random and select special positions
@@ -168,14 +168,14 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
        {
            if (station.Comp.CurrentSpecialBuyPositions.Count >= currentSpecialBuyPositions)
                break;
-            station.Comp.CurrentSpecialBuyPositions.Add(buyPos, buyPos.Price.Next(_random)/10*10);
+            station.Comp.CurrentSpecialBuyPositions.Add(buyPos, buyPos.Price);
        }

        foreach (var sellPos in availableSpecialSellPositions)
        {
            if (station.Comp.CurrentSpecialSellPositions.Count >= currentSpecialSellPositions)
                break;
-            station.Comp.CurrentSpecialSellPositions.Add(sellPos, sellPos.Price.Next(_random)/10*10);
+            station.Comp.CurrentSpecialSellPositions.Add(sellPos, sellPos.Price);
        }
    }

--- a/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs
+++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs
@@ -15,7 +15,7 @@ public sealed partial class CP14StoreBuyPositionPrototype : IPrototype
    public string ID { get; private set; } = default!;

    [DataField(required: true)]
-    public MinMax Price = new();
+    public int Price = 100;

    [DataField(required: true)]
    public LocId Name = string.Empty;
--- a/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs
+++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs
@@ -15,7 +15,7 @@ public sealed partial class CP14StoreSellPositionPrototype : IPrototype
    public string ID { get; private set; } = default!;

    [DataField(required: true)]
-    public MinMax Price = new();
+    public int Price = 100;

    [DataField(required: true)]
    public LocId Name = string.Empty;
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml
@@ -5,9 +5,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/copper_bar.rsi
    state: bar_3
-  price: 
-    min: 100
-    max: 150
+  price: 150
  service: !type:CP14SellStackService
    stackId: CP14CopperBar
    count: 10
@@ -19,9 +17,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/copper_ore.rsi
    state: ore3
-  price: 
-    min: 10
-    max: 20
+  price: 20
  service: !type:CP14SellStackService
    stackId: CP14OreCopper
    count: 10
@@ -33,9 +29,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/iron_bar.rsi
    state: bar_3
-  price: 
-    min: 200
-    max: 300
+  price: 300
  service: !type:CP14SellStackService
    stackId: CP14IronBar
    count: 10
@@ -47,9 +41,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/iron_ore.rsi
    state: ore3
-  price: 
-    min: 20
-    max: 30
+  price: 30
  service: !type:CP14SellStackService
    stackId: CP14OreIron
    count: 10
@@ -61,9 +53,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/gold_bar.rsi
    state: bar_3
-  price: 
-    min: 1000
-    max: 1500
+  price: 1200
  service: !type:CP14SellStackService
    stackId: CP14GoldBar
    count: 10
@@ -75,9 +65,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/gold_ore.rsi
    state: ore3
-  price: 
-    min: 100
-    max: 150
+  price: 120
  service: !type:CP14SellStackService
    stackId: CP14OreGold
    count: 10
@@ -89,9 +77,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/mithril_bar.rsi
    state: bar_3
-  price: 
-    min: 2000
-    max: 3000
+  price: 2500
  service: !type:CP14SellStackService
    stackId: CP14MithrilBar
    count: 10
@@ -103,9 +89,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/mithril_ore.rsi
    state: ore3
-  price: 
-    min: 200
-    max: 300
+  price: 250
  service: !type:CP14SellStackService
    stackId: CP14OreMithril
    count: 10
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml
@@ -5,9 +5,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/wood.rsi
    state: planks_3
-  price: 
-    min: 10
-    max: 30
+  price: 20
  service: !type:CP14SellStackService
    stackId: CP14WoodenPlanks
    count: 30
@@ -19,9 +17,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/glass.rsi
    state: glass_3
-  price: 
-    min: 50
-    max: 250
+  price: 100
  service: !type:CP14SellStackService
    stackId: CP14GlassSheet
    count: 10
@@ -33,9 +29,7 @@
  icon: 
    sprite: _CP14/Objects/Flora/Wild/store_position.rsi
    state: sell
-  price: 
-    min: 30
-    max: 60
+  price: 50
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml
@@ -6,9 +6,7 @@
  icon: 
    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
    state: full
-  price: 
-    min: 100
-    max: 200
+  price: 150
  services:
  - !type:CP14UnlockPositionsService
    addBuyPositions:
@@ -26,9 +24,7 @@
  icon: 
    sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi
    state: base
-  price: 
-    min: 150
-    max: 300
+  price: 200
  services:
  - !type:CP14BuyItemsService
    product:
@@ -43,9 +39,7 @@
  icon: 
    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
    state: vial
-  price: 
-    min: 60
-    max: 140
+  price: 100
  services:
  - !type:CP14BuyItemsService
    product:
@@ -59,9 +53,7 @@
  icon: 
    sprite: _CP14/Objects/Bureaucracy/paper.rsi
    state: folder_red
-  price: 
-    min: 50
-    max: 150
+  price: 100
  services:
  - !type:CP14BuyItemsService
    product:
@@ -75,9 +67,7 @@
  icon: 
    sprite: _CP14/Objects/Specific/Farming/seeds.rsi
    state: seeds
-  price: 
-    min: 30
-    max: 100
+  price: 70
  services:
  - !type:CP14BuyItemsService
    product:
@@ -91,9 +81,7 @@
  icon: 
    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
    state: pulse
-  price: 
-    min: 100
-    max: 200
+  price: 150
  services:
  - !type:CP14BuyItemsService
    product:
@@ -107,9 +95,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/wood.rsi
    state: planks_3
-  price: 
-    min: 25
-    max: 50
+  price: 50
  services:
  - !type:CP14BuyItemsService
    product:
@@ -123,9 +109,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/cloth.rsi
    state: cloth_3
-  price: 
-    min: 30
-    max: 80
+  price: 50
  services:
  - !type:CP14BuyItemsService
    product:
@@ -139,9 +123,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/copper_bar.rsi
    state: bar_3
-  price: 
-    min: 200
-    max: 300
+  price: 250
  services:
  - !type:CP14BuyItemsService
    product:
@@ -155,9 +137,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/iron_bar.rsi
    state: bar_3
-  price: 
-    min: 400
-    max: 600
+  price: 500
  services:
  - !type:CP14BuyItemsService
    product:
@@ -171,9 +151,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/gold_bar.rsi
    state: bar_3
-  price: 
-    min: 2000
-    max: 2500
+  price: 2000
  services:
  - !type:CP14BuyItemsService
    product:
@@ -187,9 +165,7 @@
  icon: 
    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi 
    state: icon
-  price: 
-    min: 30
-    max: 80
+  price: 50
  services:
  - !type:CP14BuyItemsService
    product:
@@ -203,9 +179,7 @@
  icon: 
    sprite: _CP14/Objects/Consumable/Food/cheese.rsi
    state: cheese_wheel
-  price: 
-    min: 100
-    max: 250
+  price: 100
  services:
  - !type:CP14BuyItemsService
    product:
@@ -219,9 +193,7 @@
  icon: 
    sprite: Objects/Misc/books.rsi
    state: book_icon
-  price: 
-    min: 100
-    max: 250
+  price: 300
  services:
  - !type:CP14BuyItemsService
    product:
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml
@@ -6,9 +6,7 @@
  icon: 
    sprite: _CP14/Objects/Flora/Farm/wheat.rsi
    state: base1
-  price: 
-    min: 100
-    max: 200
+  price: 150
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
@@ -23,9 +21,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/dye.rsi
    state: preview
-  price: 
-    min: 100
-    max: 300
+  price: 200
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
@@ -40,9 +36,7 @@
  icon: 
    sprite: _CP14/Objects/Consumable/Food/meat.rsi
    state: sheepmeat
-  price: 
-    min: 100
-    max: 300
+  price: 200
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
@@ -57,9 +51,7 @@
  icon: 
    sprite: _CP14/Objects/Tools/torch.rsi
    state: torch-unlit
-  price: 
-    min: 100
-    max: 300
+  price: 200
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
@@ -74,9 +66,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/flora.rsi
    state: grass_material1
-  price: 
-    min: 100
-    max: 300
+  price: 200
  service: !type:CP14SellStackService
    stackId: CP14FloraMaterial
    count: 15
@@ -89,9 +79,7 @@
  icon: 
    sprite: _CP14/Objects/Bureaucracy/paper.rsi
    state: magic
-  price: 
-    min: 100
-    max: 300
+  price: 200
  service: !type:CP14SellWhitelistService
    whitelist:
      tags: 
@@ -106,9 +94,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/ash.rsi
    state: ash_1
-  price: 
-    min: 50
-    max: 150
+  price: 100
  service: !type:CP14SellStackService
    stackId: CP14Ash
    count: 10
@@ -121,9 +107,7 @@
  icon: 
    sprite: _CP14/Objects/Materials/lucens_wood.rsi
    state: planks_2
-  price: 
-    min: 300
-    max: 650
+  price: 300
  service: !type:CP14SellStackService
    stackId: CP14LucensWoodenPlanks
    count: 10