cleanup instruments yml

Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml

@@ -5,6 +5,7 @@
   description: That's an instrument.
   components:
   - type: Sprite
+    state: icon
   - type: Instrument
   - type: ActivatableUI
     inHandsOnly: true

Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml

@@ -0,0 +1,55 @@
+- type: entity
+  parent: BaseHandheldInstrument
+  id: BaseKeyedInstrument
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - KeyedInstrument
+
+- type: entity
+  parent: BaseKeyedInstrument
+  id: SynthesizerInstrument
+  name: synthesizer
+  components:
+  - type: Instrument
+    program: 62
+  - type: SwappableInstrument
+    instrumentList:
+      "Electro": {62: 0} #i needed generic sounding synth presets, sue me
+      "Bubbles": {63: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+  - type: StaticPrice
+    price: 90
+
+- type: entity
+  parent: BaseKeyedInstrument
+  id: SuperSynthesizerInstrument
+  name: super synthesizer
+  description: Blasting the ghetto with Touhou MIDIs since 2020.
+  components:
+  - type: Instrument
+    allowPercussion: true
+    allowProgramChange: true
+    respectMidiLimits: false
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: supersynth
+  - type: Item
+    heldPrefix: super
+
+- type: entity
+  parent: BaseKeyedInstrument
+  id: AccordionInstrument
+  name: accordion
+  components:
+  - type: Instrument
+    program: 21
+  - type: SwappableInstrument
+    instrumentList:
+      "Standard": {21: 0}
+      "Tango": {23: 0}
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/accordion.rsi
+

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml

@@ -1,5 +1,14 @@
 - type: entity
   parent: BaseHandheldInstrument
+  id: BaseBrassInstrument
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - BrassInstrument
+
+- type: entity
+  parent: BaseBrassInstrument
   id: TrumpetInstrument
   name: trumpet
   description: The favorite instrument of jazz musicians and egotistical middle schoolers.
@@ -12,16 +21,9 @@
       "Muted": {59: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/trumpet.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/trumpet.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BaseBrassInstrument
   id: TromboneInstrument
   name: trombone
   description: Everyone's favorite sliding brass instrument.
@@ -30,16 +32,9 @@
     program: 57
   - type: Sprite
     sprite: Objects/Fun/Instruments/trombone.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/trombone.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BaseBrassInstrument
   id: FrenchHornInstrument
   name: french horn
   description: The fact that holding it involves using your hand to muffle it may suggest something about its sound.
@@ -48,16 +43,9 @@
     program: 60
   - type: Sprite
     sprite: Objects/Fun/Instruments/frenchhorn.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/frenchhorn.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BaseBrassInstrument
   id: EuphoniumInstrument
   name: euphonium
   description: A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes.
@@ -67,10 +55,3 @@
     bank: 1
   - type: Sprite
     sprite: Objects/Fun/Instruments/euphonium.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/euphonium.rsi
-  - type: Tag
-    tags:
-    - BrassInstrument

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml

@@ -24,7 +24,7 @@
   - type: Instrument
     program: 122
   - type: Item
-    size: Normal
+    size: Small
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -115,10 +115,8 @@
     program: 127
   - type: Sprite
     sprite: Objects/Fun/Instruments/gunpet.rsi
-    state: icon
   - type: Item
     size: Small
-    sprite: Objects/Fun/Instruments/gunpet.rsi
     storedRotation: -90
   - type: Tag
     tags:
@@ -136,16 +134,13 @@
     bank: 1
   - type: Sprite
     sprite: Objects/Fun/Instruments/bike_horn.rsi
-    state: icon
   - type: Tag
     tags:
     - BrassInstrument #Go figure.
   - type: Item
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
     size: Small
     storedRotation: -90
   - type: Clothing
-    sprite: Objects/Fun/Instruments/bike_horn.rsi
     slots: [Belt]
     quickEquip: false
 
@@ -156,7 +151,6 @@
   description: A direct line to the Honkmother. Seems to always go to voicemail.
   components:
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
     state: banana_phone
   - type: EmitSoundOnLand
     sound:

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml

@@ -1,22 +1,24 @@
 - type: entity
   parent: BaseHandheldInstrument
+  id: BasePercussionInstrument
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - PercussionInstrument
+
+- type: entity
+  parent: BasePercussionInstrument
   id: GlockenspielInstrument
   name: glockenspiel
   components:
   - type: Instrument
     program: 9
   - type: Sprite
     sprite: Objects/Fun/Instruments/glockenspiel.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/glockenspiel.rsi
-  - type: Tag
-    tags:
-    - PercussionInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BasePercussionInstrument
   id: MusicBoxInstrument
   name: music box
   description: Playing this makes you feel safe from scary animatronics.
@@ -25,10 +27,11 @@
     program: 10
   - type: Sprite
     sprite: Objects/Fun/Instruments/musicbox.rsi
-    state: icon
+  - type: Item
+    size: Small
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BasePercussionInstrument
   id: XylophoneInstrument
   name: xylophone
   description: Rainbow colored glockenspiel.
@@ -38,9 +41,6 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/structureinstruments.rsi
     state: xylophone
-  - type: Tag
-    tags:
-    - PercussionInstrument
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -57,36 +57,11 @@
       "Kweh": {4: 1}
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
-    state: icon
   - type: Item
     size: Small
-    sprite: Objects/Fun/Instruments/microphone.rsi
 
 - type: entity
-  parent: BaseHandheldInstrument
-  id: SynthesizerInstrument
-  name: synthesizer
-  components:
-  - type: Instrument
-    program: 62
-  - type: SwappableInstrument
-    instrumentList:
-      "Electro": {62: 0} #i needed generic sounding synth presets, sue me
-      "Bubbles": {63: 0}
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-  - type: Tag
-    tags:
-    - KeyedInstrument
-  - type: StaticPrice
-    price: 90
-
-- type: entity
-  parent: BaseHandheldInstrument
+  parent: BasePercussionInstrument
   id: KalimbaInstrument
   name: kalimba
   description: The power of a piano right at your thumbs.
@@ -95,15 +70,11 @@
     program: 108
   - type: Sprite
     sprite: Objects/Fun/Instruments/kalimba.rsi
-    state: icon
-  - type: Tag
-    tags:
-    - KeyedInstrument
   - type: Item
     size: Small
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BasePercussionInstrument
   id: WoodblockInstrument
   name: woodblock
   description: If you listen to this enough it'll start driving itself into your mind.
@@ -112,13 +83,9 @@
     program: 115
   - type: Sprite
     sprite: Objects/Fun/Instruments/woodblock.rsi
-    state: icon
-  - type: Tag
-    tags:
-    - PercussionInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: BasePercussionInstrument
   id: ReverseCymbalsInstrument
   name: reverse cymbals
   description: I think you have it the wrong way around?
@@ -127,22 +94,3 @@
     program: 119
   - type: Sprite
     sprite: Objects/Fun/Instruments/reversecymbal.rsi
-    state: icon
-
-- type: entity
-  parent: BaseHandheldInstrument
-  id: SuperSynthesizerInstrument
-  name: super synthesizer
-  description: Blasting the ghetto with Touhou MIDIs since 2020.
-  components:
-  - type: Instrument
-    allowPercussion: true
-    allowProgramChange: true
-    respectMidiLimits: false
-  - type: Sprite
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: supersynth
-  - type: Item
-    heldPrefix: super
-    size: Normal
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi