9 files changed, 80 insertions, 71 deletions

diff --git a/data/items/decks/advanced_bio_deck.yaml b/data/items/decks/advanced_bio_deck.yaml
index 6eb1559..dffbbe0 100644
--- a/data/items/decks/advanced_bio_deck.yaml
+++ b/data/items/decks/advanced_bio_deck.yaml
@@ -1,10 +1,11 @@
+color: C4 bold
+description: A high-powered bio deck with enhanced circuitry. Provides unlimited biojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 20
+  junk: biojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: advanced bio deck
-color: "C4 bold"
-description: "A high-powered bio deck with enhanced circuitry. Provides unlimited biojunk and removes the scrap requirement."
 value: 15000
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 20
-provides_junk: biojunk
diff --git a/data/items/decks/advanced_eco_deck.yaml b/data/items/decks/advanced_eco_deck.yaml
index 9c4d58a..419e157 100644
--- a/data/items/decks/advanced_eco_deck.yaml
+++ b/data/items/decks/advanced_eco_deck.yaml
@@ -1,10 +1,11 @@
+color: 22 bold
+description: A high-powered eco deck with enhanced circuitry. Provides unlimited ecojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 20
+  junk: ecojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: advanced eco deck
-color: "22 bold"
-description: "A high-powered eco deck with enhanced circuitry. Provides unlimited ecojunk and removes the scrap requirement."
 value: 15000
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 20
-provides_junk: ecojunk
diff --git a/data/items/decks/advanced_hydro_deck.yaml b/data/items/decks/advanced_hydro_deck.yaml
index bf165b8..e1c7181 100644
--- a/data/items/decks/advanced_hydro_deck.yaml
+++ b/data/items/decks/advanced_hydro_deck.yaml
@@ -1,10 +1,11 @@
+color: 27 bold
+description: A high-powered hydro deck with enhanced circuitry. Provides unlimited hydrojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 20
+  junk: hydrojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: advanced hydro deck
-color: "27 bold"
-description: "A high-powered hydro deck with enhanced circuitry. Provides unlimited hydrojunk and removes the scrap requirement."
 value: 15000
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 20
-provides_junk: hydrojunk
diff --git a/data/items/decks/advanced_solar_deck.yaml b/data/items/decks/advanced_solar_deck.yaml
index 98d4e76..25ce3d5 100644
--- a/data/items/decks/advanced_solar_deck.yaml
+++ b/data/items/decks/advanced_solar_deck.yaml
@@ -1,10 +1,11 @@
+color: DC bold
+description: A high-powered solar deck with enhanced circuitry. Provides unlimited solarjunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 20
+  junk: solarjunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: advanced solar deck
-color: "DC bold"
-description: "A high-powered solar deck with enhanced circuitry. Provides unlimited solarjunk and removes the scrap requirement."
 value: 15000
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 20
-provides_junk: solarjunk
diff --git a/data/items/decks/basic_deck.yaml b/data/items/decks/basic_deck.yaml
index da478b0..52bcea7 100644
--- a/data/items/decks/basic_deck.yaml
+++ b/data/items/decks/basic_deck.yaml
@@ -1,9 +1,10 @@
+color: F5
+description: A simple programmable deck. Removes the scrap requirement for triggering mods, but provides no elemental junk.
+equipment:
+  attack:
+    science: 5
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: basic deck
-color: "F5"
-description: "A simple programmable deck. Removes the scrap requirement for triggering mods, but provides no elemental junk."
 value: 500
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 5
diff --git a/data/items/decks/bio_deck.yaml b/data/items/decks/bio_deck.yaml
index 7211ddc..373202c 100644
--- a/data/items/decks/bio_deck.yaml
+++ b/data/items/decks/bio_deck.yaml
@@ -1,10 +1,11 @@
+color: C4
+description: A programmable deck infused with bio-synthetic membranes. Provides unlimited biojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 10
+  junk: biojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: bio deck
-color: "C4"
-description: "A programmable deck infused with bio-synthetic membranes. Provides unlimited biojunk and removes the scrap requirement."
 value: 1500
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 10
-provides_junk: biojunk
diff --git a/data/items/decks/eco_deck.yaml b/data/items/decks/eco_deck.yaml
index b922eea..9d679de 100644
--- a/data/items/decks/eco_deck.yaml
+++ b/data/items/decks/eco_deck.yaml
@@ -1,10 +1,11 @@
-name: eco deck
 color: "22"
-description: "A programmable deck threaded with eco-organic circuits. Provides unlimited ecojunk and removes the scrap requirement."
+description: A programmable deck threaded with eco-organic circuits. Provides unlimited ecojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 10
+  junk: ecojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
+name: eco deck
 value: 1500
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 10
-provides_junk: ecojunk
diff --git a/data/items/decks/hydro_deck.yaml b/data/items/decks/hydro_deck.yaml
index 51e23e3..e49cedd 100644
--- a/data/items/decks/hydro_deck.yaml
+++ b/data/items/decks/hydro_deck.yaml
@@ -1,10 +1,11 @@
-name: hydro deck
 color: "27"
-description: "A programmable deck infused with hydro circuitry. Provides unlimited hydrojunk and removes the scrap requirement."
+description: A programmable deck infused with hydro circuitry. Provides unlimited hydrojunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 10
+  junk: hydrojunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
+name: hydro deck
 value: 1500
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 10
-provides_junk: hydrojunk
diff --git a/data/items/decks/solar_deck.yaml b/data/items/decks/solar_deck.yaml
index c597ac6..e7816a1 100644
--- a/data/items/decks/solar_deck.yaml
+++ b/data/items/decks/solar_deck.yaml
@@ -1,10 +1,11 @@
+color: DC
+description: A programmable deck pulsing with solar energy. Provides unlimited solarjunk and removes the scrap requirement.
+equipment:
+  attack:
+    science: 10
+  junk: solarjunk
+  slot: main_hand
+  speed: 5
+  type: tech_weapon
 name: solar deck
-color: "DC"
-description: "A programmable deck pulsing with solar energy. Provides unlimited solarjunk and removes the scrap requirement."
 value: 1500
-equip_slot: main_hand
-weapon_type: science
-speed: 5
-stats:
-  science_attack: 10
-provides_junk: solarjunk