Merge pull request #1 from whatston3/BirthdayCake-Partycrate-Update-s…

…uggestions Birthday cake partycrate update suggestions
whatston3 · Aug 12, 2024 · d9bc7ca · d9bc7ca
2 parents ff3e6e8 + cf7eb48
commit d9bc7ca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -77,12 +77,11 @@
 
 - type: cargoProduct
   id: FunParty
-  abstract: true # Frontier - No cake from cargo
   icon:
     sprite: Objects/Consumable/Food/Baked/cake.rsi
     state: birthday
   product: CrateFunParty
-  cost: 1000
+  cost: 7500 # Frontier:1000<7500
   category: cargoproduct-category-name-fun
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -225,27 +225,27 @@
   - type: StorageFill
     contents:
       - id: GlowstickBase
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickBlue
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickPurple
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickRed
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickYellow
-        amount: 2
-      - id: FoodCakeBirthdayFake #Frontier: Replaced the regular birthday cake with a fake, low food value variant.
+        amount: 1 # Frontier: 2<1
+      - id: FoodCakeBirthdayFake #Frontier: FoodCakeBirthday<FoodCakeBirthdayFake (less food)
       - id: DrinkLean
         amount: 4
       - id: KnifePlastic
       - id: ClothingHeadHatPartyRed
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyYellow
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyGreen
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyBlue
-        amount: 2
+        amount: 1 # Frontier: 2<1
 
 - type: entity
   id: CrateFunWaterGuns

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -316,14 +316,14 @@
 - type: entity
   parent: DrinkBaseCup
   id: DrinkLean
-  name: grape Juice
+  name: grape juice # Frontier: grape Juice<grape juice
   description: Damn, no fun allowed.
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         reagents:
-        - ReagentId: Water
+        - ReagentId: JuiceGrape # Frontier: Water<JuiceGrape
           Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lean.rsi