From e8caadc272008b2eb3682056e17b968cbf9826da Mon Sep 17 00:00:00 2001
From: Alex <129697969+Lomcastar@users.noreply.github.com>
Date: Fri, 12 May 2023 23:11:46 +0300
Subject: [PATCH] [tweak] split out snack restock boxes (#16309)

* Transferring a chocolate box

* Might as well split all of them

* Delete Snack
---
 .../catalog/cargo/cargo-vending.ftl           | 15 ++++--
 .../catalog/fills/crates/vending-crates.ftl   | 14 ++++--
 .../Catalog/Cargo/cargo_vending.yml           | 50 +++++++++++++++----
 .../Catalog/Fills/Crates/vending.yml          | 47 +++++++++++++----
 4 files changed, 99 insertions(+), 27 deletions(-)

diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl
index 8d32404332..3c0a153b29 100644
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl
@@ -40,9 +40,6 @@ ent-CrateVendingMachineRestockSeeds = { ent-CrateVendingMachineRestockSeedsFille
 ent-CrateVendingMachineRestockSmokes = { ent-CrateVendingMachineRestockSmokesFilled }
     .desc = { ent-CrateVendingMachineRestockSmokesFilled.desc }
 
-ent-CrateVendingMachineRestockSnacks = { ent-CrateVendingMachineRestockSnacksFilled }
-    .desc = { ent-CrateVendingMachineRestockSnacksFilled.desc }
-
 ent-CrateVendingMachineRestockVendomat = { ent-CrateVendingMachineRestockVendomatFilled }
     .desc = { ent-CrateVendingMachineRestockVendomatFilled.desc }
 
@@ -54,3 +51,15 @@ ent-CrateVendingMachineRestockTankDispenser = { ent-CrateVendingMachineRestockTa
 
 ent-CrateVendingMachineRestockHappyHonk = { ent-CrateVendingMachineRestockHappyHonkFilled }
     .desc = { ent-CrateVendingMachineRestockHappyHonkFilled.desc }
+
+ent-CrateVendingMachineRestockGetmoreChocolateCorp = { ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled }
+    .desc = { ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled.desc }
+
+ent-CrateVendingMachineRestockChang = { ent-CrateVendingMachineRestockChangFilled }
+    .desc = { ent-CrateVendingMachineRestockChangFilled.desc }
+
+ent-CrateVendingMachineRestockDiscountDans = { ent-CrateVendingMachineRestockDiscountDansFilled }
+    .desc = { ent-CrateVendingMachineRestockDiscountDansFilled.desc }
+
+ent-CrateVendingMachineRestockDonut = { ent-CrateVendingMachineRestockDonutFilled }
+    .desc = { ent-CrateVendingMachineRestockDonutFilled.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl
index 0f34c41fe4..060ef08b91 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -40,9 +40,6 @@ ent-CrateVendingMachineRestockSeedsFilled = MegaSeed restock crate
 ent-CrateVendingMachineRestockSmokesFilled = ShadyCigs restock crate
     .desc = Contains two restock boxes for the ShadyCigs vending machine.
 
-ent-CrateVendingMachineRestockSnacksFilled = Snack restock crate
-    .desc = Contains four restock boxes, each covering a different snack vendor. Mr. Chang's, Discount Dans, Robust Donuts, and Getmore Chocolate are featured on the advertisement.
-
 ent-CrateVendingMachineRestockVendomatFilled = Vendomat restock crate
     .desc = Contains a restock box for a Vendomat vending machine.
 
@@ -55,3 +52,14 @@ ent-CrateVendingMachineRestockTankDispenserFilled = Tank dispenser restock crate
 ent-CrateVendingMachineRestockHappyHonkFilled = Happy honk restock crate
     .desc = Contains a restock box for a happy honk dispenser.
 
+ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled = Getmore Chocolate Corp restock crate
+    .desc = Contains a restock box for a Getmore Chocolate Corp dispenser.
+
+ent-CrateVendingMachineRestockChangFilled = Chang restock crate
+    .desc = Contains a restock box for a Mr. Chang dispenser.
+
+ent-CrateVendingMachineRestockDiscountDansFilled = Discount Dans restock crate
+    .desc = Contains a restock box for a Discount Dan's dispenser.
+
+ent-CrateVendingMachineRestockDonutFilled = Donut restock crate
+    .desc = Contains a restock box for a Monkin' Donuts dispenser.
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index ce567e941b..82536a44bb 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -156,16 +156,6 @@
   category: Service
   group: market
 
-- type: cargoProduct
-  id: CrateVendingMachineRestockSnacks
-  icon:
-    sprite: Objects/Specific/Service/vending_machine_restock.rsi
-    state: base
-  product: CrateVendingMachineRestockSnacksFilled
-  cost: 3000
-  category: Service
-  group: market
-
 - type: cargoProduct
   id: CrateVendingMachineRestockVendomat
   icon:
@@ -205,3 +195,43 @@
   cost: 2100
   category: Service
   group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockGetmoreChocolateCorp
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
+  cost: 1200
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockChang
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockChangFilled
+  cost: 1200
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockDiscountDans
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockDiscountDansFilled
+  cost: 1200
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockDonut
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockDonutFilled
+  cost: 1200
+  category: Service
+  group: market
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index f909dfcd42..7cbec7bad7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -122,17 +122,6 @@
       - id: VendingMachineRestockSmokes
         amount: 2
 
-- type: entity
-  id: CrateVendingMachineRestockSnacksFilled
-  parent: CratePlastic
-  components:
-  - type: StorageFill
-    contents:
-      - id: VendingMachineRestockChang
-      - id: VendingMachineRestockDiscountDans
-      - id: VendingMachineRestockDonut
-      - id: VendingMachineRestockGetmoreChocolateCorp
-
 - type: entity
   id: CrateVendingMachineRestockVendomatFilled
   parent: CratePlastic
@@ -165,3 +154,39 @@
     contents:
       - id: VendingMachineRestockHappyHonk
         amount: 2
+
+- type: entity
+  id: CrateVendingMachineRestockGetmoreChocolateCorpFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockGetmoreChocolateCorp
+        amount: 2
+
+- type: entity
+  id: CrateVendingMachineRestockChangFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockChang
+        amount: 2
+
+- type: entity
+  id: CrateVendingMachineRestockDiscountDansFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockDiscountDans
+        amount: 2
+
+- type: entity
+  id: CrateVendingMachineRestockDonutFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockDonut
+        amount: 2
\ No newline at end of file
-- 
2.51.2