diff --git a/input/kh2/drops/blazing.toml b/input/kh2/drops/blazing.toml
deleted file mode 100644
index 18e8547..0000000
--- a/input/kh2/drops/blazing.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-kind = "blazing"
-
-[[shard]]
-from = "Hammer Frame"
-chance = 10
-
-[[shard]]
-from = "Minute Bomb"
-chance = 6
-
-[[stone]]
-from = "Cannon Gun"
-chance = 6
-
-[[stone]]
-from = "Tornado Step"
-chance = 8
-
-[[gem]]
-from = "Fat Bandit"
-chance = 12
-
-[[gem]]
-from = "Fiery Globe"
-chance = 4
-
-[[crystal]]
-from = "Crescendo"
-chance = 6
-
-[[crystal]]
-from = "Crimson Jazz"
-chance = 12
diff --git a/input/kh2/drops/bright.toml b/input/kh2/drops/bright.toml
deleted file mode 100644
index 3ef32db..0000000
--- a/input/kh2/drops/bright.toml
+++ /dev/null
@@ -1,77 +0,0 @@
-kind = "bright"
-
-[[shard]]
-from = "Creeper Plant"
-chance = 4
-
-[[shard]]
-from = "Hook Bat"
-chance = 3
-
-[[shard]]
-from = "Minute Bomb"
-chance = 3
-
-[[shard]]
-from = "Rabid Dog"
-chance = 3
-
-[[shard]]
-from = "Soldier"
-chance = 4
-
-[[stone]]
-from = "Aeroplane"
-chance = 4
-
-[[stone]]
-from = "Cannon Gun"
-chance = 3
-
-[[stone]]
-from = "Driller Mole"
-chance = 4
-
-[[stone]]
-from = "Luna Bandit"
-chance = 4
-
-[[stone]]
-from = "Silver Rock"
-chance = 3
-
-[[stone]]
-from = "Tornado Step"
-chance = 4
-
-[[stone]]
-from = "Wight Knight"
-chance = 4
-
-[[gem]]
-from = "Aerial Knocker"
-chance = 4
-
-[[gem]]
-from = "Magnum Loader"
-chance = 4
-
-[[gem]]
-from = "Surveillance Robot"
-chance = 3
-
-[[crystal]]
-from = "Air Pirate"
-chance = 4
-
-[[crystal]]
-from = "Crescendo"
-chance = 3
-
-[[crystal]]
-from = "Neoshadow"
-chance = 4
-
-[[crystal]]
-from = "Strafer"
-chance = 4
diff --git a/input/kh2/drops/dark.toml b/input/kh2/drops/dark.toml
deleted file mode 100644
index af0edfe..0000000
--- a/input/kh2/drops/dark.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-kind = "dark"
-
-[[shard]]
-from = "Shadow"
-chance = 4
-
-[[shard]]
-from = "Soldier"
-chance = 8
-
-[[stone]]
-from = "Assault Rider"
-chance = 12
-
-[[stone]]
-from = "Nightwalker"
-chance = 10
-
-[[gem]]
-from = "Gargoyle Knight"
-chance = 10
-
-[[gem]]
-from = "Gargoyle Warrior"
-chance = 8
-
-[[crystal]]
-from = "Air Pirate"
-chance = 8
diff --git a/input/kh2/drops/dense.toml b/input/kh2/drops/dense.toml
deleted file mode 100644
index 086b83c..0000000
--- a/input/kh2/drops/dense.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-kind = "dense"
-
-[[shard]]
-from = "Creeper"
-chance = 8
-
-[[shard]]
-from = "Dragoon"
-chance = 12
-
-[[stone]]
-from = "Sniper"
-chance = 12
-
-[[gem]]
-from = "Samurai"
-chance = 12
-
-[[crystal]]
-from = "Berserker"
-chance = 12
diff --git a/input/kh2/drops/energy.toml b/input/kh2/drops/energy.toml
deleted file mode 100644
index 7413b6b..0000000
--- a/input/kh2/drops/energy.toml
+++ /dev/null
@@ -1,45 +0,0 @@
-kind = "energy"
-
-[[shard]]
-from = "Bolt Tower"
-chance = 4
-
-[[shard]]
-from = "Gargoyle Knight"
-chance = 4
-
-[[shard]]
-from = "Gargoyle Warrior"
-chance = 4
-
-[[shard]]
-from = "Nightwalker"
-chance = 4
-
-[[stone]]
-from = "Hammer Frame"
-chance = 4
-
-[[stone]]
-from = "Lance Soldier"
-chance = 4
-
-[[stone]]
-from = "Trick Ghost"
-chance = 4
-
-[[gem]]
-from = "Emerald Blues"
-chance = 4
-
-[[gem]]
-from = "Fortuneteller"
-chance = 4
-
-[[crystal]]
-from = "Bookmaster"
-chance = 4
-
-[[crystal]]
-from = "Shaman"
-chance = 4
diff --git a/input/kh2/drops/frost.toml b/input/kh2/drops/frost.toml
deleted file mode 100644
index 3dac640..0000000
--- a/input/kh2/drops/frost.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-kind = "frost"
-
-[[shard]]
-from = "Hook Bat"
-chance = 6
-
-[[shard]]
-from = "Lance Soldier"
-chance = 10
-
-[[stone]]
-from = "Aeroplane"
-chance = 8
-
-[[stone]]
-from = "Hot Rod"
-chance = 12
-
-[[gem]]
-from = "Fortuneteller"
-chance = 8
-
-[[gem]]
-from = "Icy Cube"
-chance = 4
-
-[[crystal]]
-from = "Living Bone"
-chance = 12
diff --git a/input/kh2/drops/lightning.toml b/input/kh2/drops/lightning.toml
deleted file mode 100644
index d9c6803..0000000
--- a/input/kh2/drops/lightning.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-kind = "lightning"
-
-[[shard]]
-from = "Bolt Tower"
-chance = 10
-
-[[shard]]
-from = "Rapid Thruster"
-chance = 4
-
-[[stone]]
-from = "Driller Mole"
-chance = 6
-
-[[stone]]
-from = "Emerald Blues"
-chance = 10
-
-[[gem]]
-from = "Armored Knight"
-chance = 12
-
-[[gem]]
-from = "Surveillance Robot"
-chance = 8
-
-[[crystal]]
-from = "Devastator"
-chance = 4
-
-[[crystal]]
-from = "Strafer"
-chance = 6
diff --git a/input/kh2/drops/lucid.toml b/input/kh2/drops/lucid.toml
deleted file mode 100644
index 2f96f91..0000000
--- a/input/kh2/drops/lucid.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-kind = "lucid"
-
-[[shard]]
-from = "Rabid Dog"
-chance = 6
-
-[[shard]]
-from = "Trick Ghost"
-chance = 10
-
-[[stone]]
-from = "Graveyard"
-chance = 12
-
-[[stone]]
-from = "Toy Soldier"
-chance = 12
-
-[[stone]]
-from = "Wight Knight"
-chance = 8
-
-[[gem]]
-from = "Bookmaster"
-chance = 10
-
-[[gem]]
-from = "Magnum Loader"
-chance = 8
-
-[[crystal]]
-from = "Neoshadow"
-chance = 8
diff --git a/input/kh2/drops/power.toml b/input/kh2/drops/power.toml
deleted file mode 100644
index 675f7f2..0000000
--- a/input/kh2/drops/power.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-kind = "power"
-
-[[shard]]
-from = "Creeper Plant"
-chance = 8
-
-[[shard]]
-from = "Large Body"
-chance = 12
-
-[[stone]]
-from = "Luna Bandit"
-chance = 8
-
-[[stone]]
-from = "Silver Rock"
-chance = 8
-
-[[gem]]
-from = "Aerial Knocker"
-chance = 8
-
-[[gem]]
-from = "Shaman"
-chance = 10
-
-[[crystal]]
-from = "Morning Star"
-chance = 12
diff --git a/input/kh2/drops/remembrance.toml b/input/kh2/drops/remembrance.toml
deleted file mode 100644
index 2c6c1ed..0000000
--- a/input/kh2/drops/remembrance.toml
+++ /dev/null
@@ -1,45 +0,0 @@
-kind = "remembrance"
-
-[[shard]]
-from = "Beffudler"
-chance = 6
-
-[[shard]]
-from = "Iron Hammer"
-chance = 10
-
-[[shard]]
-from = "Camo Cannon"
-chance = 6
-
-[[stone]]
-from = "Aerial Viking"
-chance = 6
-
-[[stone]]
-from = "Magic Phantom"
-chance = 10
-
-[[stone]]
-from = "Lance Warrior"
-chance = 10
-
-[[stone]]
-from = "Necromancer"
-chance = 10
-
-[[gem]]
-from = "Spring Metal"
-chance = 10
-
-[[gem]]
-from = "Runemaster"
-chance = 10
-
-[[gem]]
-from = "Mad Ride"
-chance = 12
-
-[[crystal]]
-from = "Reckless"
-chance = 12
diff --git a/input/kh2/drops/serenity.toml b/input/kh2/drops/serenity.toml
deleted file mode 100644
index 72c8797..0000000
--- a/input/kh2/drops/serenity.toml
+++ /dev/null
@@ -1,117 +0,0 @@
-kind = "serenity"
-
-[[shard]]
-from = "Assault Rider"
-chance = 4
-
-[[shard]]
-from = "Creeper"
-chance = 2
-
-[[shard]]
-from = "Fat Bandit"
-chance = 4
-
-[[shard]]
-from = "Graveyard"
-chance = 4
-
-[[shard]]
-from = "Hot Rod"
-chance = 4
-
-[[shard]]
-from = "Large Body"
-chance = 4
-
-[[shard]]
-from = "Toy Soldier"
-chance = 4
-
-[[shard]]
-from = "Beffudler"
-chance = 3
-
-[[shard]]
-from = "Camo Cannon"
-chance = 3
-
-[[shard]]
-from = "Iron Hammer"
-chance = 4
-
-[[shard]]
-from = "Bulky Vendor"
-chance = 100
-note = "Using Capsule Prize reaction"
-
-[[stone]]
-from = "Crimson Jazz"
-chance = 4
-
-[[stone]]
-from = "Devastator"
-chance = 4
-
-[[stone]]
-from = "Dusk"
-chance = 2
-
-[[stone]]
-from = "Living Bone"
-chance = 4
-
-[[stone]]
-from = "Morning Star"
-chance = 4
-
-[[stone]]
-from = "Aerial Champ"
-chance = 4
-
-[[stone]]
-from = "Aerial Viking"
-chance = 4
-
-[[stone]]
-from = "Lance Warrior"
-chance = 4
-
-[[stone]]
-from = "Magic Phantom"
-chance = 4
-
-[[stone]]
-from = "Necromancer"
-chance = 4
-
-[[stone]]
-from = "Bulky Vendor"
-chance = 100
-note = "Using Rare Capsule reaction"
-
-[[gem]]
-from = "Mad Ride"
-chance = 4
-
-[[gem]]
-from = "Reckless"
-chance = 4
-
-[[gem]]
-from = "Runemaster"
-chance = 4
-
-[[gem]]
-from = "Spring Metal"
-chance = 4
-
-[[gem]]
-from = "Bulky Vendor"
-chance = 100
-note = "Using Limited Capsule reaction"
-
-[[crystal]]
-from = "Bulky Vendor"
-chance = 100
-note = "Using Prime Capsule reaction"
diff --git a/input/kh2/drops/twilight.toml b/input/kh2/drops/twilight.toml
deleted file mode 100644
index 33a8d7d..0000000
--- a/input/kh2/drops/twilight.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-kind = "twilight"
-
-[[shard]]
-from = "Dusk"
-chance = 10
-
-[[shard]]
-from = "Gambler"
-chance = 12
-
-[[stone]]
-from = "Dancer"
-chance = 12
-
-[[gem]]
-from = "Assassin"
-chance = 12
-
-[[crystal]]
-from = "Sorcerer"
-chance = 12
diff --git a/input/kh2/enemies/aerial-champ.toml b/input/kh2/enemies/aerial-champ.toml
new file mode 100644
index 0000000..f08a231
--- /dev/null
+++ b/input/kh2/enemies/aerial-champ.toml
@@ -0,0 +1,22 @@
+name = "Aerial Champ"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Stone"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "remembrance"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
diff --git a/input/kh2/enemies/aerial-knocker.toml b/input/kh2/enemies/aerial-knocker.toml
new file mode 100644
index 0000000..c4cf7e7
--- /dev/null
+++ b/input/kh2/enemies/aerial-knocker.toml
@@ -0,0 +1,22 @@
+name = "Aerial Knocker"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Power Gem"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "power"
+	kind = "gem"
+
+[[drops]]
+name = "Bright Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "gem"
diff --git a/input/kh2/enemies/aerial-viking.toml b/input/kh2/enemies/aerial-viking.toml
new file mode 100644
index 0000000..4680365
--- /dev/null
+++ b/input/kh2/enemies/aerial-viking.toml
@@ -0,0 +1,22 @@
+name = "Aerial Viking"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Stone"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "remembrance"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
diff --git a/input/kh2/enemies/aeroplane.toml b/input/kh2/enemies/aeroplane.toml
new file mode 100644
index 0000000..649e099
--- /dev/null
+++ b/input/kh2/enemies/aeroplane.toml
@@ -0,0 +1,22 @@
+name = "Aeroplane"
+
+[[world]]
+name = "Timeless River"
+
+[[drops]]
+name = "Frost Stone"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "frost"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/air-pirate.toml b/input/kh2/enemies/air-pirate.toml
new file mode 100644
index 0000000..d5517e0
--- /dev/null
+++ b/input/kh2/enemies/air-pirate.toml
@@ -0,0 +1,25 @@
+name = "Air Pirate"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[drops]]
+name = "Dark Crystal"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "dark"
+	kind = "crystal"
+
+[[drops]]
+name = "Bright Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "crystal"
diff --git a/input/kh2/enemies/armored-knight.toml b/input/kh2/enemies/armored-knight.toml
new file mode 100644
index 0000000..f2e5401
--- /dev/null
+++ b/input/kh2/enemies/armored-knight.toml
@@ -0,0 +1,25 @@
+name = "Armored Knight"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Halloween Town"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Lightning Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "lightning"
+	kind = "gem"
diff --git a/input/kh2/enemies/assassin.toml b/input/kh2/enemies/assassin.toml
new file mode 100644
index 0000000..566c184
--- /dev/null
+++ b/input/kh2/enemies/assassin.toml
@@ -0,0 +1,14 @@
+name = "Assassin"
+kind = "nobody"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Twilight Gem"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "twilight"
+	kind = "gem"
diff --git a/input/kh2/enemies/assault-rider.toml b/input/kh2/enemies/assault-rider.toml
new file mode 100644
index 0000000..aa8f508
--- /dev/null
+++ b/input/kh2/enemies/assault-rider.toml
@@ -0,0 +1,27 @@
+name = "Assault Rider"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[drops]]
+name = "Dark Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "dark"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Hi-Potion"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/beffudler.toml b/input/kh2/enemies/beffudler.toml
new file mode 100644
index 0000000..975cbe9
--- /dev/null
+++ b/input/kh2/enemies/beffudler.toml
@@ -0,0 +1,22 @@
+name = "Beffudler"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Shard"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "remembrance"
+	kind = "shard"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
diff --git a/input/kh2/enemies/berserker.toml b/input/kh2/enemies/berserker.toml
new file mode 100644
index 0000000..22aafb6
--- /dev/null
+++ b/input/kh2/enemies/berserker.toml
@@ -0,0 +1,20 @@
+name = "Berserker"
+kind = "nobody"
+
+[[world]]
+name = "Twilight Town"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Dense Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "dense"
+	kind = "crystal"
diff --git a/input/kh2/enemies/bolt-tower.toml b/input/kh2/enemies/bolt-tower.toml
new file mode 100644
index 0000000..7902089
--- /dev/null
+++ b/input/kh2/enemies/bolt-tower.toml
@@ -0,0 +1,25 @@
+name = "Bolt Tower"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Lightning Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "lightning"
+	kind = "shard"
+
+[[drops]]
+name = "Energy Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "shard"
diff --git a/input/kh2/enemies/bookmaster.toml b/input/kh2/enemies/bookmaster.toml
new file mode 100644
index 0000000..47610db
--- /dev/null
+++ b/input/kh2/enemies/bookmaster.toml
@@ -0,0 +1,30 @@
+name = "Bookmaster"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "Space Paranoids"
+
+[[drops]]
+name = "Lucid Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "lucid"
+	kind = "gem"
+
+[[drops]]
+name = "Energy Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "crystal"
+
+[[drops]]
+name = "Akashic Record"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/bulky-vendor.toml b/input/kh2/enemies/bulky-vendor.toml
new file mode 100644
index 0000000..9ad8b25
--- /dev/null
+++ b/input/kh2/enemies/bulky-vendor.toml
@@ -0,0 +1,96 @@
+name = "Bulky Vendor"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Halloween Town"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Agrabah"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 100
+info = "Using Capsule Prize reaction command"
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Orichalcum"
+kind = "material"
+chance = 8
+info = "Using Capsule Prize reaction command"
+
+	[drops.material]
+	category = "orichalcum"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 100
+info = "Using Rare Capsule reaction command"
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Orichalcum"
+kind = "material"
+chance = 10
+info = "Using Rare Capsule reaction command"
+
+	[drops.material]
+	category = "orichalcum"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 100
+info = "Using Limited Capsule reaction command"
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
+
+[[drops]]
+name = "Orichalcum"
+kind = "material"
+chance = 16
+info = "Using Limited Capsule reaction command"
+
+	[drops.material]
+	category = "orichalcum"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Crystal"
+kind = "material"
+chance = 100
+info = "Using Prime Capsule reaction command"
+
+	[drops.material]
+	category = "serenity"
+	kind = "crystal"
+
+[[drops]]
+name = "Orichalcum"
+kind = "material"
+chance = 16
+info = "Using Prime Capsule reaction command"
+
+	[drops.material]
+	category = "orichalcum"
+	kind = "gem"
diff --git a/input/kh2/enemies/camo-cannon.toml b/input/kh2/enemies/camo-cannon.toml
new file mode 100644
index 0000000..bb3fb41
--- /dev/null
+++ b/input/kh2/enemies/camo-cannon.toml
@@ -0,0 +1,22 @@
+name = "Camo Cannon"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Shard"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "remembrance"
+	kind = "shard"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
diff --git a/input/kh2/enemies/cannon-gun.toml b/input/kh2/enemies/cannon-gun.toml
new file mode 100644
index 0000000..cb5e25b
--- /dev/null
+++ b/input/kh2/enemies/cannon-gun.toml
@@ -0,0 +1,25 @@
+name = "Cannon Gun"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Space Paranoids"
+
+[[drops]]
+name = "Blazing Stone"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "blazing"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/creeper-plant.toml b/input/kh2/enemies/creeper-plant.toml
new file mode 100644
index 0000000..c3382ee
--- /dev/null
+++ b/input/kh2/enemies/creeper-plant.toml
@@ -0,0 +1,25 @@
+name = "Creeper Plant"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Halloween Town"
+
+[[drops]]
+name = "Power Shard"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "power"
+	kind = "shard"
+
+[[drops]]
+name = "Bright Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "shard"
diff --git a/input/kh2/enemies/creeper.toml b/input/kh2/enemies/creeper.toml
new file mode 100644
index 0000000..23bd4eb
--- /dev/null
+++ b/input/kh2/enemies/creeper.toml
@@ -0,0 +1,20 @@
+name = "Creeper"
+kind = "nobody"
+
+[[world]]
+name = "Twilight Town"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Dense Shard"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "dense"
+	kind = "shard"
diff --git a/input/kh2/enemies/crescendo.toml b/input/kh2/enemies/crescendo.toml
new file mode 100644
index 0000000..e578929
--- /dev/null
+++ b/input/kh2/enemies/crescendo.toml
@@ -0,0 +1,22 @@
+name = "Crescendo"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[drops]]
+name = "Blazing Crystal"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "blazing"
+	kind = "crystal"
+
+[[drops]]
+name = "Bright Crystal"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "crystal"
diff --git a/input/kh2/enemies/crimson-jazz.toml b/input/kh2/enemies/crimson-jazz.toml
new file mode 100644
index 0000000..6b27b63
--- /dev/null
+++ b/input/kh2/enemies/crimson-jazz.toml
@@ -0,0 +1,36 @@
+name = "Crimson Jazz"
+
+[[world]]
+name = "Agrabah"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Blazing Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "blazing"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Mega-Ether"
+kind = "item"
+chance = 5
diff --git a/input/kh2/enemies/dancer.toml b/input/kh2/enemies/dancer.toml
new file mode 100644
index 0000000..e4f7829
--- /dev/null
+++ b/input/kh2/enemies/dancer.toml
@@ -0,0 +1,23 @@
+name = "Dancer"
+kind = "nobody"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Twilight Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "twilight"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
diff --git a/input/kh2/enemies/dargoon.toml b/input/kh2/enemies/dargoon.toml
new file mode 100644
index 0000000..9541116
--- /dev/null
+++ b/input/kh2/enemies/dargoon.toml
@@ -0,0 +1,25 @@
+name = "Dragoon"
+kind = "nobody"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Twilight Town"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Dense Shard"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "dense"
+	kind = "shard"
+
+[[drops]]
+name = "Nobody Lance"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/devastator.toml b/input/kh2/enemies/devastator.toml
new file mode 100644
index 0000000..63d9a45
--- /dev/null
+++ b/input/kh2/enemies/devastator.toml
@@ -0,0 +1,31 @@
+name = "Devastator"
+
+[[world]]
+name = "Space Paranoids"
+best = true
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Lightning Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "lightning"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Elixir"
+kind = "item"
+chance = 5
diff --git a/input/kh2/enemies/driller-mole.toml b/input/kh2/enemies/driller-mole.toml
new file mode 100644
index 0000000..1ceb57b
--- /dev/null
+++ b/input/kh2/enemies/driller-mole.toml
@@ -0,0 +1,25 @@
+name = "Driller Mole"
+
+[[world]]
+name = "Halloween Town"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[drops]]
+name = "Lightning Stone"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "lightning"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/dusk.toml b/input/kh2/enemies/dusk.toml
new file mode 100644
index 0000000..7bf440e
--- /dev/null
+++ b/input/kh2/enemies/dusk.toml
@@ -0,0 +1,14 @@
+name = "Dusk"
+kind = "nobody"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Twilight Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "twilight"
+	kind = "shard"
diff --git a/input/kh2/enemies/emerald-blues.toml b/input/kh2/enemies/emerald-blues.toml
new file mode 100644
index 0000000..9d9c78a
--- /dev/null
+++ b/input/kh2/enemies/emerald-blues.toml
@@ -0,0 +1,31 @@
+name = "Emerald Blues"
+
+[[world]]
+name = "Halloween Town"
+
+[[world]]
+name = "Space Paranoids"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Lightning Stone"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "lightning"
+	kind = "stone"
+
+[[drops]]
+name = "Energy Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "gem"
diff --git a/input/kh2/enemies/fat-bandit.toml b/input/kh2/enemies/fat-bandit.toml
new file mode 100644
index 0000000..09b9590
--- /dev/null
+++ b/input/kh2/enemies/fat-bandit.toml
@@ -0,0 +1,27 @@
+name = "Fat Bandit"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Blazing Gem"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "blazing"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Ether"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/fiery-globe.toml b/input/kh2/enemies/fiery-globe.toml
new file mode 100644
index 0000000..ca6f3fd
--- /dev/null
+++ b/input/kh2/enemies/fiery-globe.toml
@@ -0,0 +1,13 @@
+name = "Fiery Globe"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Blazing Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "blazing"
+	kind = "gem"
diff --git a/input/kh2/enemies/fortuneteller.toml b/input/kh2/enemies/fortuneteller.toml
new file mode 100644
index 0000000..e05d7d1
--- /dev/null
+++ b/input/kh2/enemies/fortuneteller.toml
@@ -0,0 +1,22 @@
+name = "Fortuneteller"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Frost Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "frost"
+	kind = "gem"
+
+[[drops]]
+name = "Energy Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "gem"
diff --git a/input/kh2/enemies/gambler.toml b/input/kh2/enemies/gambler.toml
new file mode 100644
index 0000000..3afd0f3
--- /dev/null
+++ b/input/kh2/enemies/gambler.toml
@@ -0,0 +1,22 @@
+name = "Gambler"
+kind = "nobody"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Twilight Shard"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "twilight"
+	kind = "shard"
+
+[[drops]]
+name = "Nobody Guard"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/gargoyle-knight.toml b/input/kh2/enemies/gargoyle-knight.toml
new file mode 100644
index 0000000..0f96fdd
--- /dev/null
+++ b/input/kh2/enemies/gargoyle-knight.toml
@@ -0,0 +1,22 @@
+name = "Gargoyle Knight"
+
+[[world]]
+name = "Beast's Castle"
+
+[[drops]]
+name = "Dark Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "dark"
+	kind = "gem"
+
+[[drops]]
+name = "Energy Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "shard"
diff --git a/input/kh2/enemies/gargoyle-warrior.toml b/input/kh2/enemies/gargoyle-warrior.toml
new file mode 100644
index 0000000..dee6b4f
--- /dev/null
+++ b/input/kh2/enemies/gargoyle-warrior.toml
@@ -0,0 +1,22 @@
+name = "Gargoyle Warrior"
+
+[[world]]
+name = "Beast's Castle"
+
+[[drops]]
+name = "Dark Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "dark"
+	kind = "gem"
+
+[[drops]]
+name = "Energy Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "shard"
diff --git a/input/kh2/enemies/graveyard.toml b/input/kh2/enemies/graveyard.toml
new file mode 100644
index 0000000..73eeadd
--- /dev/null
+++ b/input/kh2/enemies/graveyard.toml
@@ -0,0 +1,27 @@
+name = "Graveyard"
+
+[[world]]
+name = "Halloween Town"
+
+[[drops]]
+name = "Lucid Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "lucid"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Ether"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/hammer-frame.toml b/input/kh2/enemies/hammer-frame.toml
new file mode 100644
index 0000000..00952fd
--- /dev/null
+++ b/input/kh2/enemies/hammer-frame.toml
@@ -0,0 +1,28 @@
+name = "Hammer Frame"
+
+[[world]]
+name = "Timeless River"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Beast's Castle"
+
+[[drops]]
+name = "Blazing Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "blazing"
+	kind = "shard"
+
+[[drops]]
+name = "Energy Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "stone"
diff --git a/input/kh2/enemies/hook-bat.toml b/input/kh2/enemies/hook-bat.toml
new file mode 100644
index 0000000..b7d62e7
--- /dev/null
+++ b/input/kh2/enemies/hook-bat.toml
@@ -0,0 +1,31 @@
+name = "Hook Bat"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Frost Shard"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "frost"
+	kind = "shard"
+
+[[drops]]
+name = "Bright Shard"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "shard"
diff --git a/input/kh2/enemies/hot-rod.toml b/input/kh2/enemies/hot-rod.toml
new file mode 100644
index 0000000..c2efcb4
--- /dev/null
+++ b/input/kh2/enemies/hot-rod.toml
@@ -0,0 +1,27 @@
+name = "Hot Rod"
+
+[[world]]
+name = "Timeless River"
+
+[[drops]]
+name = "Frost Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "frost"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Hi-Potion"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/icy-cube.toml b/input/kh2/enemies/icy-cube.toml
new file mode 100644
index 0000000..d9c50fe
--- /dev/null
+++ b/input/kh2/enemies/icy-cube.toml
@@ -0,0 +1,13 @@
+name = "Icy Cube"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Frost Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "frost"
+	kind = "gem"
diff --git a/input/kh2/enemies/iron-hammer.toml b/input/kh2/enemies/iron-hammer.toml
new file mode 100644
index 0000000..a6c3686
--- /dev/null
+++ b/input/kh2/enemies/iron-hammer.toml
@@ -0,0 +1,22 @@
+name = "Iron Hammer"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "shard"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
diff --git a/input/kh2/enemies/lance-soldier.toml b/input/kh2/enemies/lance-soldier.toml
new file mode 100644
index 0000000..2d90192
--- /dev/null
+++ b/input/kh2/enemies/lance-soldier.toml
@@ -0,0 +1,28 @@
+name = "Lance Soldier"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Port Royal"
+
+[[drops]]
+name = "Frost Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "frost"
+	kind = "shard"
+
+[[drops]]
+name = "Energy Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "stone"
diff --git a/input/kh2/enemies/lance-warrior.toml b/input/kh2/enemies/lance-warrior.toml
new file mode 100644
index 0000000..bf23965
--- /dev/null
+++ b/input/kh2/enemies/lance-warrior.toml
@@ -0,0 +1,22 @@
+name = "Lance Warrior"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Stone"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
diff --git a/input/kh2/enemies/large-body.toml b/input/kh2/enemies/large-body.toml
new file mode 100644
index 0000000..d9b21a6
--- /dev/null
+++ b/input/kh2/enemies/large-body.toml
@@ -0,0 +1,33 @@
+name = "Large Body"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Timeless River"
+
+[[drops]]
+name = "Power Shard"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "power"
+	kind = "shard"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Hi-Potion"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/living-bone.toml b/input/kh2/enemies/living-bone.toml
new file mode 100644
index 0000000..d71d827
--- /dev/null
+++ b/input/kh2/enemies/living-bone.toml
@@ -0,0 +1,27 @@
+name = "Living Bone"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Frost Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "frost"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Elixir"
+kind = "item"
+chance = 5
diff --git a/input/kh2/enemies/luna-bandit.toml b/input/kh2/enemies/luna-bandit.toml
new file mode 100644
index 0000000..de959bf
--- /dev/null
+++ b/input/kh2/enemies/luna-bandit.toml
@@ -0,0 +1,22 @@
+name = "Luna Bandit"
+
+[[world]]
+name = "Agrabah"
+
+[[drops]]
+name = "Power Stone"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "power"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/mad-ride.toml b/input/kh2/enemies/mad-ride.toml
new file mode 100644
index 0000000..d4373d6
--- /dev/null
+++ b/input/kh2/enemies/mad-ride.toml
@@ -0,0 +1,22 @@
+name = "Mad Ride"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Gem"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "remembrance"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
diff --git a/input/kh2/enemies/magic-phantom.toml b/input/kh2/enemies/magic-phantom.toml
new file mode 100644
index 0000000..f7f0334
--- /dev/null
+++ b/input/kh2/enemies/magic-phantom.toml
@@ -0,0 +1,22 @@
+name = "Magic Phantom"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Stone"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
diff --git a/input/kh2/enemies/magnum-loader.toml b/input/kh2/enemies/magnum-loader.toml
new file mode 100644
index 0000000..e169124
--- /dev/null
+++ b/input/kh2/enemies/magnum-loader.toml
@@ -0,0 +1,25 @@
+name = "Magnum Loader"
+
+[[world]]
+name = "Space Paranoids"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Lucid Gem"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "lucid"
+	kind = "gem"
+
+[[drops]]
+name = "Bright Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "gem"
diff --git a/input/kh2/enemies/minute-bomb.toml b/input/kh2/enemies/minute-bomb.toml
new file mode 100644
index 0000000..6f28bff
--- /dev/null
+++ b/input/kh2/enemies/minute-bomb.toml
@@ -0,0 +1,25 @@
+name = "Minute Bomb"
+
+[[world]]
+name = "Timeless River"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[drops]]
+name = "Blazing Shard"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "blazing"
+	kind = "shard"
+
+[[drops]]
+name = "Bright Shard"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "shard"
diff --git a/input/kh2/enemies/morning-star.toml b/input/kh2/enemies/morning-star.toml
new file mode 100644
index 0000000..f461417
--- /dev/null
+++ b/input/kh2/enemies/morning-star.toml
@@ -0,0 +1,36 @@
+name = "Morning Star"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "Beast's Castle"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Port Royal"
+
+[[drops]]
+name = "Power Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "power"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Mega-Potion"
+kind = "item"
+chance = 5
diff --git a/input/kh2/enemies/necromancer.toml b/input/kh2/enemies/necromancer.toml
new file mode 100644
index 0000000..5dcd489
--- /dev/null
+++ b/input/kh2/enemies/necromancer.toml
@@ -0,0 +1,27 @@
+name = "Necromancer"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Stone"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "stone"
+
+[[drops]]
+name = "Shaman Relic+"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/neoshadow.toml b/input/kh2/enemies/neoshadow.toml
new file mode 100644
index 0000000..83d3535
--- /dev/null
+++ b/input/kh2/enemies/neoshadow.toml
@@ -0,0 +1,19 @@
+name = "Neoshadow"
+
+[[drops]]
+name = "Lucid Crystal"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "lucid"
+	kind = "crystal"
+
+[[drops]]
+name = "Bright Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "crystal"
diff --git a/input/kh2/enemies/nightwalker.toml b/input/kh2/enemies/nightwalker.toml
new file mode 100644
index 0000000..c6a32fb
--- /dev/null
+++ b/input/kh2/enemies/nightwalker.toml
@@ -0,0 +1,22 @@
+name = "Nightwalker"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[drops]]
+name = "Dark Stone"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "dark"
+	kind = "stone"
+
+[[drops]]
+name = "Energy Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "shard"
diff --git a/input/kh2/enemies/rabid-dog.toml b/input/kh2/enemies/rabid-dog.toml
new file mode 100644
index 0000000..cabe169
--- /dev/null
+++ b/input/kh2/enemies/rabid-dog.toml
@@ -0,0 +1,25 @@
+name = "Rabid Dog"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Port Royal"
+
+[[drops]]
+name = "Lucid Shard"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "lucid"
+	kind = "shard"
+
+[[drops]]
+name = "Bright Shard"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "shard"
diff --git a/input/kh2/enemies/rapid-thruster.toml b/input/kh2/enemies/rapid-thruster.toml
new file mode 100644
index 0000000..924fd23
--- /dev/null
+++ b/input/kh2/enemies/rapid-thruster.toml
@@ -0,0 +1,26 @@
+name = "Rapid Thruster"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Timeless River"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Agrabah"
+
+[[world]]
+name = "Pride Lands"
+best = true
+
+[[drops]]
+name = "Lightning Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "lightning"
+	kind = "shard"
diff --git a/input/kh2/enemies/reckless.toml b/input/kh2/enemies/reckless.toml
new file mode 100644
index 0000000..3dea0a4
--- /dev/null
+++ b/input/kh2/enemies/reckless.toml
@@ -0,0 +1,22 @@
+name = "Reckless"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "remembrance"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
diff --git a/input/kh2/enemies/runemaster.toml b/input/kh2/enemies/runemaster.toml
new file mode 100644
index 0000000..b0f0954
--- /dev/null
+++ b/input/kh2/enemies/runemaster.toml
@@ -0,0 +1,27 @@
+name = "Runemaster"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
+
+[[drops]]
+name = "Akashic Record+"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/samurai.toml b/input/kh2/enemies/samurai.toml
new file mode 100644
index 0000000..9237785
--- /dev/null
+++ b/input/kh2/enemies/samurai.toml
@@ -0,0 +1,23 @@
+name = "Samurai"
+kind = "nobody"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Twilight Town"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Dense Gem"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "dense"
+	kind = "gem"
diff --git a/input/kh2/enemies/shadow.toml b/input/kh2/enemies/shadow.toml
new file mode 100644
index 0000000..e6976fa
--- /dev/null
+++ b/input/kh2/enemies/shadow.toml
@@ -0,0 +1,10 @@
+name = "Shadow"
+
+[[drops]]
+name = "Dark Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "dark"
+	kind = "shard"
diff --git a/input/kh2/enemies/shaman.toml b/input/kh2/enemies/shaman.toml
new file mode 100644
index 0000000..fbd5568
--- /dev/null
+++ b/input/kh2/enemies/shaman.toml
@@ -0,0 +1,27 @@
+name = "Shaman"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Power Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "power"
+	kind = "gem"
+
+[[drops]]
+name = "Energy Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "crystal"
+
+[[drops]]
+name = "Shaman Relic"
+kind = "equipment"
+chance = 1
diff --git a/input/kh2/enemies/silver-rock.toml b/input/kh2/enemies/silver-rock.toml
new file mode 100644
index 0000000..6856b40
--- /dev/null
+++ b/input/kh2/enemies/silver-rock.toml
@@ -0,0 +1,25 @@
+name = "Silver Rock"
+
+[[world]]
+name = "Agrabah"
+
+[[world]]
+name = "Pride Lands"
+
+[[drops]]
+name = "Power Stone"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "power"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/sniper.toml b/input/kh2/enemies/sniper.toml
new file mode 100644
index 0000000..f572dea
--- /dev/null
+++ b/input/kh2/enemies/sniper.toml
@@ -0,0 +1,20 @@
+name = "Sniper"
+kind = "nobody"
+
+[[world]]
+name = "The Land of Dragons"
+
+[[world]]
+name = "Twilight Town"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Dense Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "dense"
+	kind = "stone"
diff --git a/input/kh2/enemies/soldier.toml b/input/kh2/enemies/soldier.toml
new file mode 100644
index 0000000..f69ff7b
--- /dev/null
+++ b/input/kh2/enemies/soldier.toml
@@ -0,0 +1,19 @@
+name = "Soldier"
+
+[[drops]]
+name = "Dark Shard"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "dark"
+	kind = "shard"
+
+[[drops]]
+name = "Bright Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "shard"
diff --git a/input/kh2/enemies/sorcerer.toml b/input/kh2/enemies/sorcerer.toml
new file mode 100644
index 0000000..1f5d1c0
--- /dev/null
+++ b/input/kh2/enemies/sorcerer.toml
@@ -0,0 +1,23 @@
+name = "Sorcerer"
+kind = "nobody"
+
+[[world]]
+name = "The World That Never Was"
+
+[[drops]]
+name = "Twilight Crystal"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "twilight"
+	kind = "crystal"
+
+[[drops]]
+name = "Serenity Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "crystal"
diff --git a/input/kh2/enemies/spring-metal.toml b/input/kh2/enemies/spring-metal.toml
new file mode 100644
index 0000000..5134b8b
--- /dev/null
+++ b/input/kh2/enemies/spring-metal.toml
@@ -0,0 +1,22 @@
+name = "Spring Metal"
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Remembrance Gem"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "remembrance"
+	kind = "gem"
+
+[[drops]]
+name = "Serenity Gem"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "gem"
diff --git a/input/kh2/enemies/strafer.toml b/input/kh2/enemies/strafer.toml
new file mode 100644
index 0000000..bf1eb6f
--- /dev/null
+++ b/input/kh2/enemies/strafer.toml
@@ -0,0 +1,26 @@
+name = "Strafer"
+
+[[world]]
+name = "Space Paranoids"
+best = true
+
+[[world]]
+name = "Radiant Garden"
+
+[[drops]]
+name = "Lightning Crystal"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "lightning"
+	kind = "crystal"
+
+[[drops]]
+name = "Bright Crystal"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "crystal"
diff --git a/input/kh2/enemies/surveillance-robot.toml b/input/kh2/enemies/surveillance-robot.toml
new file mode 100644
index 0000000..fecdedb
--- /dev/null
+++ b/input/kh2/enemies/surveillance-robot.toml
@@ -0,0 +1,28 @@
+name = "Surveillance Robot"
+
+[[world]]
+name = "Radiant Garden"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Space Paranoids"
+
+[[drops]]
+name = "Lightning Gem"
+kind = "material"
+chance = 6
+
+	[drops.material]
+	category = "lightning"
+	kind = "gem"
+
+[[drops]]
+name = "Bright Gem"
+kind = "material"
+chance = 3
+
+	[drops.material]
+	category = "bright"
+	kind = "gem"
diff --git a/input/kh2/enemies/tornado-step.toml b/input/kh2/enemies/tornado-step.toml
new file mode 100644
index 0000000..8ed4b0d
--- /dev/null
+++ b/input/kh2/enemies/tornado-step.toml
@@ -0,0 +1,25 @@
+name = "Tornado Step"
+
+[[world]]
+name = "Port Royal"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[drops]]
+name = "Blazing Stone"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "blazing"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/input/kh2/enemies/toy-soldier.toml b/input/kh2/enemies/toy-soldier.toml
new file mode 100644
index 0000000..b67af87
--- /dev/null
+++ b/input/kh2/enemies/toy-soldier.toml
@@ -0,0 +1,27 @@
+name = "Toy Soldier"
+
+[[world]]
+name = "Halloween Town"
+
+[[drops]]
+name = "Lucid Stone"
+kind = "material"
+chance = 12
+
+	[drops.material]
+	category = "lucid"
+	kind = "stone"
+
+[[drops]]
+name = "Serenity Shard"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "serenity"
+	kind = "shard"
+
+[[drops]]
+name = "Ether"
+kind = "item"
+chance = 10
diff --git a/input/kh2/enemies/trick-ghost.toml b/input/kh2/enemies/trick-ghost.toml
new file mode 100644
index 0000000..39abf49
--- /dev/null
+++ b/input/kh2/enemies/trick-ghost.toml
@@ -0,0 +1,25 @@
+name = "Trick Ghost"
+
+[[world]]
+name = "Olympus Coliseum"
+
+[[world]]
+name = "Halloween Town"
+
+[[drops]]
+name = "Lucid Shard"
+kind = "material"
+chance = 10
+
+	[drops.material]
+	category = "lucid"
+	kind = "shard"
+
+[[drops]]
+name = "Energy Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "energy"
+	kind = "stone"
diff --git a/input/kh2/enemies/wight-knight.toml b/input/kh2/enemies/wight-knight.toml
new file mode 100644
index 0000000..5283262
--- /dev/null
+++ b/input/kh2/enemies/wight-knight.toml
@@ -0,0 +1,22 @@
+name = "Wight Knight"
+
+[[world]]
+name = "Halloween Town"
+
+[[drops]]
+name = "Lucid Stone"
+kind = "material"
+chance = 8
+
+	[drops.material]
+	category = "lucid"
+	kind = "stone"
+
+[[drops]]
+name = "Bright Stone"
+kind = "material"
+chance = 4
+
+	[drops.material]
+	category = "bright"
+	kind = "stone"
diff --git a/public/assets/materials/orichalcum/crystal.webp b/public/assets/materials/orichalcum/crystal.webp
new file mode 100644
index 0000000..10e360c
Binary files /dev/null and b/public/assets/materials/orichalcum/crystal.webp differ
diff --git a/public/assets/materials/orichalcum/gem.webp b/public/assets/materials/orichalcum/gem.webp
new file mode 100644
index 0000000..710dfec
Binary files /dev/null and b/public/assets/materials/orichalcum/gem.webp differ
diff --git a/src/common/enemy.rs b/src/common/enemy.rs
index 1277103..8b2a80b 100644
--- a/src/common/enemy.rs
+++ b/src/common/enemy.rs
@@ -8,7 +8,9 @@ use super::materials::MaterialDetails;
 pub struct Enemy {
 	pub name: String,
 	pub icon: Option<String>,
+	#[serde(default)]
 	pub world: Vec<SpawnLocation>,
+	#[serde(default)]
 	pub drops: Vec<EnemyDrop>,
 }
 
diff --git a/src/common/materials.rs b/src/common/materials.rs
index d94a1a6..97cc30c 100644
--- a/src/common/materials.rs
+++ b/src/common/materials.rs
@@ -36,6 +36,7 @@ pub enum MaterialCategory {
 	Lightning,
 	Lucid,
 	Mythril,
+	Orichalcum,
 	Power,
 	#[serde(alias = "shiny")]
 	Shimmering,
@@ -63,6 +64,7 @@ impl MaterialCategory {
 			MaterialCategory::Lightning => "lightning".to_string(),
 			MaterialCategory::Lucid => "lucid".to_string(),
 			MaterialCategory::Mythril => "mythril".to_string(),
+			MaterialCategory::Orichalcum => "orichalcum".to_string(),
 			MaterialCategory::Power => "power".to_string(),
 			MaterialCategory::Shimmering => "shimmering".to_string(),
 			MaterialCategory::Serenity => "serenity".to_string(),
@@ -104,6 +106,7 @@ impl MaterialCategory {
 			},
 			MaterialCategory::Lucid => "lucid".to_string(),
 			MaterialCategory::Mythril => "mythril".to_string(),
+			MaterialCategory::Orichalcum => "orichalcum".to_string(),
 			MaterialCategory::Power => "power".to_string(),
 			MaterialCategory::Shimmering => match game {
 				Game::Kh1 => "shiny".to_string(),
diff --git a/src/kh2.rs b/src/kh2.rs
index 23daac2..723e3c3 100644
--- a/src/kh2.rs
+++ b/src/kh2.rs
@@ -2,28 +2,15 @@ use std::sync::OnceLock;
 
 use askama::Template;
 use blake3::Hash;
+use itertools::Itertools;
 
 use crate::{
 	RuntimeModule,
-	common::{Game, materials::MaterialDrops},
+	common::{Game, enemy::Enemy, materials::MaterialDrops},
 	create_file, create_hashes,
 };
 
-const MATERIAL_KINDS: &[&str] = &[
-	"blazing",
-	"bright",
-	"dark",
-	"dense",
-	"energy",
-	"frost",
-	"lightning",
-	"lucid",
-	"power",
-	"remembrance",
-	"serenity",
-	"twilight",
-];
-const DROPS_PATH: &str = "./input/kh2/drops";
+const ENEMIES_PATH: &str = "./input/kh2/enemies";
 static JS_HASH: OnceLock<Hash> = OnceLock::new();
 
 #[derive(Template)]
@@ -38,13 +25,24 @@ pub struct Module;
 
 impl RuntimeModule for Module {
 	fn start_module() {
-		tracing::info!("Loading enemy drops data from {}", DROPS_PATH);
-		// let drops = MaterialDrops::import(DROPS_PATH);
+		tracing::info!("Loading enemy data from {}", ENEMIES_PATH);
+		let enemies = Enemy::import(ENEMIES_PATH);
+
+		let drops = MaterialDrops::new(enemies);
+		let material_kinds = drops
+			.iter()
+			.map(|d| d.category.get_category(&Game::Kh2))
+			.dedup()
+			.collect();
 
 		tracing::info!("Generating the KH2 drops template");
-		// let drops_template = DropsTemplate { drops };
+		let drops_template = DropsTemplate {
+			game: Game::Kh2,
+			drops,
+			material_kinds,
+		};
 
-		// create_file("./out/kh2", "drops", drops_template.render().unwrap()).unwrap();
+		create_file("./out/kh2", "drops", drops_template.render().unwrap()).unwrap();
 	}
 
 	fn get_js_hash() -> String {