Capfruit contraband (new-frontiers-14#2073)

Corvax-Frontier · Sep 25, 2024 · 944291e · 944291e
1 parent c8f9631
commit 944291e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2010,7 +2010,7 @@
     seedId: fakeCapfruit
   - type: Food
     trash:
-    - RevolverCapGunFake
+    - RevolverCapGunFakeGrown # Frontier: add Grown
 
 - type: entity
   name: rice bushel

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1006,7 +1006,7 @@
       revolver-ammo: !type:Container
 
 - type: entity
-  parent: RevolverCapGun
+  parent: [RevolverCapGun, BaseC3SyndicateContraband] # Frontier: added BaseC3SyndicateContraband
   id: RevolverCapGunFake
   name: cap gun
   suffix: Fake
@@ -1020,6 +1020,8 @@
         - CartridgeMagnum
         - SpeedLoaderMagnum
     proto: CartridgeMagnumAP
+  - type: Contraband # Frontier
+    hideValues: true # Frontier
 
 - type: entity
   parent: BaseItem

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
@@ -509,3 +509,13 @@
     steps: 2
     zeroVisible: false
   - type: Appearance
+
+# Grown cap gun, in toys.yml for consistency with fake parent
+- type: entity
+  parent: [BaseC3SyndicateContrabandNoValue, RevolverCapGunFake] # Frontier: added BaseC3SyndicateContraband
+  id: RevolverCapGunFakeGrown
+  suffix: Fake, Grown
+  noSpawn: true
+  components:
+  - type: RevolverAmmoProvider
+    proto: CartridgeMagnum # Base has AP rounds