Revert "Crimson Caravan Cargo System" (#630)

Revert "Crimson Caravan Cargo System (#628)" This reverts commit 59b793e.
Vault-Overseers · Oct 26, 2024 · 22aa738 · 22aa738
1 parent 59b793e
commit 22aa738
Show file tree

Hide file tree

Showing 46 changed files with 389 additions and 442 deletions.
diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
@@ -8,6 +8,6 @@ namespace Content.Server.Cargo.Components;
 [Access(typeof(CargoSystem))]
 public sealed partial class CargoPalletConsoleComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer: typeof(PrototypeIdSerializer<StackPrototype>))]
-    public string CashType = "Caps";
+    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
+    public string CashType = "Credit";
 }
diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs
@@ -15,5 +15,5 @@ public sealed partial class StationBankAccountComponent : Component
     /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")]
-    public float IncreasePerSecond = 0.05f;
+    public int IncreasePerSecond = 1;
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -23,7 +23,7 @@ public sealed partial class CargoSystem
         /// <summary>
         /// How much time to wait (in seconds) before increasing bank accounts balance.
         /// </summary>
-        private const int Delay = 200;
+        private const int Delay = 10;
 
         /// <summary>
         /// Keeps track of how much time has elapsed since last balance increase.
@@ -84,7 +84,7 @@ private void UpdateConsole(float frameTime)
 
                 foreach (var account in EntityQuery<StationBankAccountComponent>())
                 {
-                    account.Balance += (int) (account.IncreasePerSecond * Delay);
+                    account.Balance += account.IncreasePerSecond * Delay;
                 }
 
                 var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();

diff --git a/Resources/Locale/en-US/cargo/price-gun-component.ftl b/Resources/Locale/en-US/cargo/price-gun-component.ftl
@@ -1,4 +1,4 @@
-price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} caps.
+price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
 price-gun-verb-text = Appraisal
 price-gun-verb-message = Appraise {THE($object)}.
 price-gun-bounty-complete = The device confirms that the bounty contained within is completed.
diff --git a/Resources/Maps/N14/MercerIslandSewers.yml b/Resources/Maps/N14/MercerIslandSewers.yml
@@ -112,7 +112,6 @@ entities:
         - 0
   - uid: 2
     components:
-    - type: TradeStation
     - type: MetaData
       name: grid
     - type: Transform

diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml
@@ -159,7 +159,6 @@ entities:
     - type: RadiationGridResistance
   - uid: 2
     components:
-    - type: TradeStation
     - type: MetaData
       name: grid
     - type: Transform

diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml
@@ -172,7 +172,6 @@ entities:
   entities:
   - uid: 1
     components:
-    - type: TradeStation
     - type: MetaData
       name: Sunnyvale
     - type: Transform

diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml
@@ -106,7 +106,6 @@ entities:
         - 0
   - uid: 2
     components:
-    - type: TradeStation
     - type: MetaData
       name: SunnyvaleUnderground
     - type: Transform

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml
@@ -0,0 +1,49 @@
+- type: cargoProduct
+  id: ArmoryGrand
+  icon:
+    sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
+    state: base
+  product: CrateArmoryGrand
+  cost: 5500
+  category: Armory
+  group: market
+
+- type: cargoProduct
+  id: ArmoryUniversal
+  icon:
+    sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
+    state: icon
+  product: CrateArmoryUniversal
+  cost: 6500
+  category: Armory
+  group: market
+
+- type: cargoProduct
+  id: ArmoryShotgunAdjutant
+  icon:
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi
+    state: icon
+  product: CrateArmoryAdjutant
+  cost: 10000
+  category: Armory
+  group: market
+
+- type: cargoProduct
+  id: ArmoryEnergyGun
+  icon: 
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi
+    state: icon
+  product: CrateArmoryEnergyGun
+  cost: 5500
+  category: Armory
+  group: market
+
+- type: cargoProduct
+  id: ArmoryEnergyGunMini
+  icon:
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi
+    state: icon
+  product: CrateArmoryEnergyGunMini
+  cost: 3500
+  category: Armory
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
@@ -0,0 +1,29 @@
+- type: cargoProduct
+  id: FoodCrateKvassTank
+  icon:
+    sprite: DeltaV/Structures/Storage/kvass.rsi
+    state: kvass
+  product: KvassTankFull
+  cost: 2000
+  category: Food
+  group: market
+
+- type: cargoProduct
+  id: FoodDonkpocketSavory
+  icon:
+    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+    state: pizza-box
+  product: CrateFoodDonkpocketSavory
+  cost: 6000 # Thanks bounties
+  category: Food
+  group: market
+
+- type: cargoProduct
+  id: FoodDonkpocketSweet
+  icon:
+    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+    state: berry-box
+  product: CrateFoodDonkpocketSweet
+  cost: 6000 # Thanks bounties
+  category: Food
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -0,0 +1,19 @@
+- type: cargoProduct
+  id: CrateFunBBGun
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi
+    state: display
+  product: CrateFunBBGun
+  cost: 1000
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: LivestockSecDog
+  icon:
+    sprite: DeltaV/Mobs/Pets/secdog.rsi
+    state: secdog
+  product: CrateNPCSecDog
+  cost: 3500
+  category: Livestock
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: MedicalScrubsCrate
+  icon:
+    sprite: Clothing/Uniforms/Scrubs/blue.rsi
+    state: icon
+  product: CrateMedicalScrubs
+  cost: 500
+  category: Medical
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: CrateVendingMachineRestockPride
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockPrideFilled
+  cost: 1100
+  category: Service
+  group: market
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -6,7 +6,7 @@
   - type: Item
     storedRotation: -90
   - type: Battery
-    pricePerJoule: 0.009
+    pricePerJoule: 0.15
   - type: PowerCell
   - type: Explosive
     explosionType: Default

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -132,7 +132,7 @@
     stackType: Brutepack
     count: 10
   - type: StackPrice
-    price: 1
+    price: 5
 
 - type: entity
   id: Brutepack1
@@ -287,7 +287,7 @@
     stackType: Gauze
     count: 10
   - type: StackPrice
-    price: 1
+    price: 10
 
 - type: entity
   id: Gauze1

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -60,7 +60,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 1
+    price: 30
 
 - type: entity
   name: screwdriver
@@ -121,7 +121,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 1
+    price: 30
 
 - type: entity
   name: wrench
@@ -177,7 +177,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 1
+    price: 22
 
 - type: entity
   name: crowbar
@@ -232,7 +232,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 1
+    price: 22
   - type: Prying
 
 - type: entity
@@ -312,7 +312,7 @@
       Steel: 100
       Plastic: 100
   - type: StaticPrice
-    price: 2
+    price: 56
 
 - type: entity
   name: network configurator
@@ -360,7 +360,7 @@
         - key: enum.NetworkConfiguratorUiKey.Link
           type: NetworkConfiguratorBoundUserInterface
     - type: StaticPrice
-      price: 2
+      price: 56
     # - type: GuideHelp
       # guides:
         # - NetworkConfigurator
@@ -413,7 +413,7 @@
 #  - type: DynamicPrice
 #    price: 100
   - type: StaticPrice
-    price: 10
+    price: 100
   - type: MeleeWeapon
     wideAnimationRotation: -90
     attackRate: 0.9
@@ -659,7 +659,7 @@
       Steel: 100
       Wood: 50
   - type: StaticPrice
-    price: 1
+    price: 25
   # Delta V: Adds tool quality for digging
   - type: Tool
     qualities:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -33,4 +33,4 @@
       params:
         volume: -1
   - type: StaticPrice
-    price: 0.2
+    price: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -48,7 +48,7 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
-    price: 30
+    price: 500
 
 - type: entity
   name: AKMS

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -53,7 +53,7 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
-    price: 10
+    price: 500
 
 - type: entity
   name: Atreides

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -42,7 +42,7 @@
       ballistic-ammo: !type:Container
         ents: []
   - type: StaticPrice
-    price: 10
+    price: 500
 
 - type: entity
   name: Bulldog

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -36,7 +36,7 @@
       ballistic-ammo: !type:Container
         ents: []
   - type: StaticPrice
-    price: 10
+    price: 500
 
 - type: entity
   name: Kardashev-Mosin

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: EpistemicsHolyWaterKit
+  icon:
+    sprite: Nyanotrasen/Objects/Consumable/Drinks/flaskholywater.rsi
+    state: icon
+  product: CrateHolyWaterKit
+  cost: 3000
+  category: Epistemics
+  group: market
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml
@@ -0,0 +1,19 @@
+- type: cargoProduct
+  id: ServiceColoredLightsReplacement
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceReplacementColoredLights
+  cost: 600
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: ServiceMaintenanceLightsReplacement
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceReplacementMaintenanceLights
+  cost: 600
+  category: Service
+  group: market
diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml
@@ -4,15 +4,15 @@
   name: materials-glass
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: glass }
   color: "#a8ccd7"
-  price: 0.01
+  price: 0.075
 
 - type: material
   id: ReinforcedGlass
   stackEntity: SheetRGlass1
   name: materials-reinforced-glass
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass }
   color: "#549bb0"
-  price: 0.015 # 1-0.5 mix of glass and metal.
+  price: 0.16 # 1-0.5 mix of glass and metal.
 
 - type: material
   id: PlasmaGlass