Some room spawns setups for KH1 enemies

input/kh1/enemies/air-pirate.toml

@@ -2,7 +2,6 @@ name = "Air Pirate"
 
 [[world]]
 name = "Neverland"
-room = ""
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/air-soldier.toml

@@ -1,8 +1,7 @@
 name = "Air Soldier"
 
 [[world]]
-name = ""
+name = "Wonderland"
-room = ""
 
 [[drops]]
 name = "Potion"

input/kh1/enemies/bandit.toml

@@ -2,6 +2,7 @@ name = "Bandit"
 
 [[world]]
 name = "Agrabah"
+room = ["Desert: Cave", "Treasure Room", "Lamp Chamber"]
 
 [[world]]
 name = "Monstro"

input/kh1/enemies/bouncywild.toml

@@ -3,6 +3,10 @@ name = "Bouncywild"
 [[world]]
 name = "Deep Jungle"
 
+[[world]]
+name = "Monstro"
+room = ["Bowels", "Stomach"]
+
 [[world]]
 name = "End of the World"
 

input/kh1/enemies/darkball.toml

@@ -2,6 +2,11 @@ name = "Darkball"
 
 [[world]]
 name = "Traverse Town"
+room = ["3rd District", "Gizmo Shop"]
+
+[[world]]
+name = "Agrabah"
+room = ["Bazaar", "Palace Gates"]
 
 [[world]]
 name = "Hollow Bastion"
@@ -9,6 +14,10 @@ name = "Hollow Bastion"
 [[world]]
 name = "End of the World"
 
+[[world]]
+name = "Neverland"
+room = ["Ship: Freezer", "Captain's Cabin"]
+
 [[drops]]
 name = "Hi-Potion"
 kind = "item"

input/kh1/enemies/defender.toml

@@ -2,6 +2,7 @@ name = "Defender"
 
 [[world]]
 name = "Traverse Town"
+room = ["3rd District", "Hotel Hallway", "Gizmo Shop"]
 
 [[world]]
 name = "Hollow Bastion"

input/kh1/enemies/green-requiem.toml

@@ -11,6 +11,7 @@ name = "Monstro"
 
 [[world]]
 name = "Deep Jungle"
+room = ["Jungle: Cliff"]
 
 [[world]]
 name = "Hollow Bastion"

input/kh1/enemies/pirate.toml

@@ -2,6 +2,7 @@ name = "Pirate"
 
 [[world]]
 name = "Neverland"
+room = ["Captain's Cabin"]
 
 [[world]]
 name = "Monstro"

input/kh1/enemies/powerwild.toml

@@ -5,6 +5,7 @@ name = "Deep Jungle"
 
 [[world]]
 name = "Monstro"
+room = ["Chamber 5", "Chamber 6"]
 
 [[world]]
 name = "End of the World"

input/kh1/enemies/red-nocturne.toml

@@ -1,19 +1,8 @@
 name = "Red Nocturne"
 
-[[world]]
-name = "Traverse Town"
-
-[[world]]
-name = "Wonderland"
-
-[[world]]
-name = "Agrabah"
-
-[[world]]
-name = "Hollow Bastion"
-
 [[world]]
 name = "Monstro"
+room = ["Chamber 6"]
 
 [[world]]
 name = "End of the World"

input/kh1/enemies/shadow.toml

@@ -1,8 +1,11 @@
 name = "Shadow"
 
 [[world]]
-name = "Traverse Town"
+name = "Wonderland"
-room = ""
+
+[[world]]
+name = "Neverland"
+room = ["Ship: Freezer"]
 
 [[drops]]
 name = "Potion"

input/kh1/enemies/soldier.toml

@@ -1,8 +1,8 @@
 name = "Soldier"
 
 [[world]]
-name = "Traverse Town"
+name = "Agrabah"
-room = ""
+room = ["Main Street"]
 
 [[drops]]
 name = "Spirit Shard"

src/common/enemy.rs

@@ -87,5 +87,6 @@ impl Display for EnemyDropChance {
 #[derive(Debug, Deserialize, PartialEq, Eq)]
 pub struct SpawnLocation {
 	pub name: String,
-	pub room: Option<String>,
+	#[serde(default)]
+	pub rooms: Vec<String>,
 }