From: EnDecc <33369477+Endecc@users.noreply.github.com>
Date: Wed, 5 Apr 2023 05:05:24 +0000 (-0400)
Subject: More Musical Cargo (#15107)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a22a1f5cc43ea2c8eee3967a462c13852e8e437d;p=space-station-14.git

More Musical Cargo (#15107)

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

im sure i'll get used to this
---

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl
index 6c55b86353..1428bf04ac 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl
@@ -1,12 +1,24 @@
 ent-CrateFunPlushie = Plushie crate
     .desc = A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
 
-ent-CrateFunInstruments = Big band instrument collection
-    .desc = Get your sad station movin' and groovin' with this fine collection! Contains thirteen different instruments.
+ent-CrateFunInstrumentsVariety = Variety instrument collection
+    .desc = Get your sad station movin' and groovin' with this catch-all variety pack! Contains seven different instruments.
 
-ent-CrateFunBrass = Brass instrument ensemble crate
+ent-CrateFunInstrumentsBrass = Brass instrument ensemble crate
     .desc = Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play.
 
+ent-CrateFunInstrumentsString = String instrument ensemble crate
+    .desc = Pluck or pick, slap or shred! Play a smooth melody or melt peoples' faces with this package of stringed instruments.
+
+ent-CrateFunInstrumentsWoodwind = Woodwind instrument ensemble crate
+    .desc = If atmos is good at their job, use air to play music with these woodwind instruments! Real wood not guaranteed with every item.
+
+ent-CrateFunInstrumentsKeyedPercussion = Keyed/Percussion instrument ensemble crate
+    .desc = Hit some keys with some sticks or your hands, with this Keyed and Percussion instrument ensemble crate.
+
+ent-CrateFunInstrumentsSpecial = Special instrument collector's crate
+    .desc = Create some noise with this special collection of arguably-instruments! Centcomm is not responsible for any trauma caused by the contents.
+
 ent-CrateFunArtSupplies = Art supplies
     .desc = Make some happy little accidents with lots of crayons!
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 041065a3bb..c4d6dad84a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -1,23 +1,63 @@
 - type: cargoProduct
-  id: FunInstruments
+  id: FunInstrumentsVariety
   icon:
     sprite: Objects/Fun/Instruments/accordion.rsi
     state: icon
-  product: CrateFunInstruments
-  cost: 3000
+  product: CrateFunInstrumentsVariety
+  cost: 2000
   category: Fun
   group: market
 
 - type: cargoProduct
-  id: FunBrass
+  id: FunInstrumentsBrass
   icon:
     sprite: Objects/Fun/Instruments/structureinstruments.rsi
     state: tuba
-  product: CrateFunBrass
+  product: CrateFunInstrumentsBrass
   cost: 2500
   category: Fun
   group: market
 
+- type: cargoProduct
+  id: FunInstrumentsString
+  icon:
+    sprite: Objects/Fun/Instruments/bassguitar.rsi
+    state: icon
+  product: CrateFunInstrumentsString
+  cost: 2500
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  id: FunInstrumentsWoodwind
+  icon:
+    sprite: Objects/Fun/Instruments/harmonica.rsi
+    state: icon
+  product: CrateFunInstrumentsWoodwind
+  cost: 2500
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  id: FunInstrumentsKeyedPercussion
+  icon:
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: icon
+  product: CrateFunInstrumentsKeyedPercussion
+  cost: 2500
+  category: Fun
+  group: market
+
+- type: cargoProduct
+  id: FunInstrumentsSpecial
+  icon:
+    sprite: Objects/Fun/Instruments/gunpet.rsi
+    state: icon
+  product: CrateFunInstrumentsSpecial
+  cost: 10000
+  category: Fun
+  group: market
+
 - type: cargoProduct
   id: FunArtSupplies
   icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 5b34762ec2..87a4ac8c85 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -20,40 +20,102 @@
       - id: PlushieDiona
 
 - type: entity
-  id: CrateFunInstruments
+  id: CrateFunInstrumentsVariety
   parent: CrateGenericSteel
   components:
   - type: StorageFill
     contents:
       - id: SynthesizerInstrument
       - id: AcousticGuitarInstrument
-      - id: ViolinInstrument
       - id: TrumpetInstrument
-      - id: ElectricGuitarInstrument
       - id: AccordionInstrument
       - id: HarmonicaInstrument
       - id: RecorderInstrument
-      - id: TromboneInstrument
-      - id: SaxophoneInstrument
       - id: GlockenspielInstrument
-      - id: BanjoInstrument
-      - id: BikeHornInstrument
 
 - type: entity
-  id: CrateFunBrass
+  id: CrateFunInstrumentsBrass
   parent: CrateGenericSteel
   components:
   - type: StorageFill
     contents:
       - id: TrumpetInstrument
-        amount: 3
+        amount: 2
       - id: TromboneInstrument
-        amount: 3
+        amount: 2
       - id: FrenchHornInstrument
         amount: 2
+      - id: SaxophoneInstrument
+        amount: 2
       - id: EuphoniumInstrument
       - id: TubaInstrument
 
+- type: entity
+  id: CrateFunInstrumentsString
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: AcousticGuitarInstrument
+      - id: ElectricGuitarInstrument
+      - id: BassGuitarInstrument
+      - id: RockGuitarInstrument
+      - id: BanjoInstrument
+      - id: ViolinInstrument
+      - id: CelloInstrument
+      - id: ViolaInstrument
+      - id: HarpInstrument
+
+- type: entity
+  id: CrateFunInstrumentsWoodwind
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: RecorderInstrument
+        amount: 2
+      - id: BagpipeInstrument
+      - id: ClarinetInstrument
+      - id: FluteInstrument
+      - id: HarmonicaInstrument
+        amount: 2
+      - id: OcarinaInstrument
+      - id: PanFluteInstrument
+
+- type: entity
+  id: CrateFunInstrumentsKeyedPercussion
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: SynthesizerInstrument
+        amount: 2
+      - id: AccordionInstrument
+        amount: 2
+      - id: KalimbaInstrument
+        amount: 2
+      - id: WoodblockInstrument
+      - id: GlockenspielInstrument
+        amount: 2
+      - id: VibraphoneInstrument
+
+- type: entity
+  id: CrateFunInstrumentsSpecial
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: BikeHornInstrument
+      - id: MusicBoxInstrument
+      - id: SeashellInstrument
+      - id: XylophoneInstrument
+      - id: GunpetInstrument
+      - id: MicrophoneInstrument
+      - id: HelicopterInstrument
+      - id: BirdToyInstrument
+      - id: MusicalLungInstrument
+      - id: ReverseCymbalsInstrument
+
 - type: entity
   id: CrateFunArtSupplies
   parent: CrateGenericSteel