More info on specific locations for KH1 heartless, world icons added and better display info for drops

input/kh1/enemies/air-pirate.toml

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

input/kh1/enemies/air-soldier.toml

@@ -2,6 +2,11 @@ name = "Air Soldier"
 
 [[world]]
 name = "Wonderland"
+rooms = ["Lotus Forest"]
+
+[[world]]
+name = "End of the World"
+rooms = ["World Terminus | Olympus Coliseum"]
 
 [[drops]]
 name = "Potion"

input/kh1/enemies/angel-star.toml

@@ -2,6 +2,7 @@ name = "Angel Star"
 
 [[world]]
 name = "End of the World"
+rooms = ["Linked Worlds"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/aquatank.toml

@@ -3,6 +3,10 @@ name = "Aquatank"
 [[world]]
 name = "Atlantica"
 
+[[world]]
+name = "End of the World"
+rooms = ["World Terminus | Atlantica"]
+
 [[drops]]
 name = "Mega-Potion"
 kind = "item"

input/kh1/enemies/bandit.toml

@@ -9,6 +9,7 @@ name = "Monstro"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Agrabah"]
 
 [[drops]]
 name = "Potion"

input/kh1/enemies/barrel-spider.toml

@@ -8,6 +8,7 @@ name = "Neverland"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Neverland"]
 
 [[drops]]
 name = "Camping Set"

input/kh1/enemies/battleship.toml

@@ -2,6 +2,7 @@ name = "Battleship"
 
 [[world]]
 name = "Neverland"
+rooms = ["Pirate Ship"]
 
 [[drops]]
 name = "Elixir"

input/kh1/enemies/black-ballade.toml

@@ -2,6 +2,7 @@ name = "Black Ballade"
 
 [[world]]
 name = "Deep Jungle"
+rooms = ["Bamboo Thicket"]
 
 [[drops]]
 name = "Lightning Stone"

input/kh1/enemies/blue-rhapsody.toml

@@ -5,15 +5,18 @@ name = "Traverse Town"
 
 [[world]]
 name = "Wonderland"
+rooms = ["Lotus Forest"]
 
 [[world]]
 name = "Monstro"
 
 [[world]]
 name = "Hollow Bastion"
+rooms = ["Entrance Hall"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Wonderland"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/bouncywild.toml

@@ -9,6 +9,7 @@ rooms = ["Bowels", "Stomach"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Deep Jungle"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/chimera.toml

@@ -2,6 +2,7 @@ name = "Chimera"
 
 [[world]]
 name = "Halloween Town"
+rooms = ["Manor Ruins"]
 
 [[drops]]
 name = "Blazing Stone"

input/kh1/enemies/darkball.toml

@@ -2,12 +2,24 @@ name = "Darkball"
 
 [[world]]
 name = "Traverse Town"
-rooms = ["3rd District", "Gizmo Shop"]
+rooms = ["3rd District", "Gizmo Shop", "Alleyway"]
 
 [[world]]
 name = "Agrabah"
 rooms = ["Bazaar", "Palace Gates"]
 
+[[world]]
+name = "Deep Jungle"
+rooms = ["Bamboo Thicket"]
+
+[[world]]
+name = "Wonderland"
+rooms = ["Lotus Forest"]
+
+[[world]]
+name = "Halloween Town"
+rooms = ["Moonlight Hill"]
+
 [[world]]
 name = "Hollow Bastion"
 

input/kh1/enemies/defender.toml

@@ -6,9 +6,11 @@ rooms = ["3rd District", "Hotel Hallway", "Gizmo Shop"]
 
 [[world]]
 name = "Hollow Bastion"
+rooms = ["Entrance Hall"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Olympus Coliseum"]
 
 [[drops]]
 name = "Elixir"

input/kh1/enemies/fat-bandit.toml

@@ -8,6 +8,7 @@ name = "Monstro"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Agrabah"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/gargoyle.toml

@@ -1,10 +1,12 @@
 name = "Gargoyle"
 
 [[world]]
-name = "Holloween Town"
+name = "Halloween Town"
+rooms = ["Graveyard"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Halloween Town"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/gigas-shadow.toml

@@ -2,6 +2,7 @@ name = "Gigas Shadow"
 
 [[world]]
 name = "Wonderland"
+rooms = ["Bizzare Room"]
 
 [[drops]]
 name = "Lucid Shard"

input/kh1/enemies/green-requiem.toml

@@ -11,13 +11,14 @@ name = "Monstro"
 
 [[world]]
 name = "Deep Jungle"
-rooms = ["Jungle: Cliff"]
+rooms = ["Cliff"]
 
 [[world]]
 name = "Hollow Bastion"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Wonderland"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/invisible.toml

@@ -2,6 +2,7 @@ name = "Invisible"
 
 [[world]]
 name = "End of the World"
+rooms = ["Linked Worlds"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/jet-balloon.toml

@@ -2,6 +2,7 @@ name = "Jet Balloon"
 
 [[world]]
 name = "Neverland"
+rooms = ["Pirate Ship"]
 
 [[drops]]
 name = "Dazzling Stone"

input/kh1/enemies/large-body.toml

@@ -15,9 +15,11 @@ name = "Monstro"
 
 [[world]]
 name = "Hollow Bastion"
+rooms = ["Entrance Hall", "Grand Hall"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Traverse Town"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/neoshadow.toml

@@ -2,6 +2,7 @@ name = "Neoshadow"
 
 [[world]]
 name = "End of the World"
+rooms = ["Linked Worlds"]
 
 [[drops]]
 name = "Stormy Stone"

input/kh1/enemies/pirate.toml

@@ -9,6 +9,7 @@ name = "Monstro"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Neverland"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/powerwild.toml

@@ -2,6 +2,7 @@ name = "Powerwild"
 
 [[world]]
 name = "Deep Jungle"
+rooms = ["Camp", "Cliff"]
 
 [[world]]
 name = "Monstro"
@@ -9,6 +10,7 @@ rooms = ["Chamber 5", "Chamber 6"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Deep Jungle"]
 
 [[drops]]
 name = "Potion"

input/kh1/enemies/red-nocturne.toml

@@ -4,8 +4,13 @@ name = "Red Nocturne"
 name = "Monstro"
 rooms = ["Chamber 6"]
 
+[[world]]
+name = "Hollow Bastion"
+rooms = ["Castle Gates"]
+
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Wonderland"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/screwdiver.toml

@@ -5,6 +5,7 @@ name = "Atlantica"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Atlantica"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/sea-neon.toml

@@ -5,6 +5,7 @@ name = "Atlantica"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Atlantica"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/search-ghost.toml

@@ -8,12 +8,14 @@ name = "Monstro"
 
 [[world]]
 name = "Traverse Town"
+rooms = ["2nd District"]
 
 [[world]]
 name = "Atlantica"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Halloween Town"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/sheltering-zone.toml

@@ -5,6 +5,7 @@ name = "Atlantica"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Atlantica"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/sniperwild.toml

@@ -2,6 +2,7 @@ name = "Sniperwild"
 
 [[world]]
 name = "Traverse Town"
+rooms = ["2nd District"]
 
 [[drops]]
 name = "Power Stone"

input/kh1/enemies/soldier.toml

@@ -4,6 +4,10 @@ name = "Soldier"
 name = "Agrabah"
 rooms = ["Main Street"]
 
+[[world]]
+name = "End of the World"
+rooms = ["World Terminus | Traverse Town"]
+
 [[drops]]
 name = "Spirit Shard"
 kind = "material"

input/kh1/enemies/stealth-soldier.toml

@@ -2,6 +2,7 @@ name = "Stealth Soldier"
 
 [[world]]
 name = "Hollow Bastion"
+rooms = ["Entrance Hall", "Grand Hall"]
 
 [[drops]]
 name = "Energy Stone"

input/kh1/enemies/wight-knight.toml

@@ -1,10 +1,12 @@
 name = "Wight Knight"
 
 [[world]]
-name = "Holloween Town"
+name = "Halloween Town"
+rooms = ["Graveyard", "Manor Ruins"]
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Halloween Town"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/wizard.toml

@@ -5,18 +5,25 @@ name = "Holloween Town"
 
 [[world]]
 name = "Traverse Town"
+rooms = ["Alleyway", "Hotel Hallway"]
 
 [[world]]
 name = "Wonderland"
 
 [[world]]
 name = "Deep Jungle"
+rooms = ["Camp", "Bamboo Thicket"]
 
 [[world]]
 name = "Agrabah"
 
+[[world]]
+name = "Hollow Bastion"
+rooms = ["Castle Gates", "Entrance Hall", "Grand Hall"]
+
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Wonderland"]
 
 [[drops]]
 name = "Ether"

input/kh1/enemies/wyvern.toml

@@ -5,15 +5,18 @@ name = "Hollow Bastion"
 
 [[world]]
 name = "Traverse Town"
+rooms = ["2nd District"]
 
 [[world]]
 name = "Deep Jungle"
+rooms = ["Camp", "Cliff"]
 
 [[world]]
 name = "Agrabah"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Olympus Coliseum"]
 
 [[drops]]
 name = "Hi-Potion"

input/kh1/enemies/yellow-opera.toml

@@ -4,7 +4,8 @@ name = "Yellow Opera"
 name = "Traverse Town"
 
 [[world]]
-name = "Neverland"
+name = "Wonderland"
+rooms = ["Lotus Forest"]
 
 [[world]]
 name = "Agrabah"
@@ -17,6 +18,7 @@ name = "Monstro"
 
 [[world]]
 name = "End of the World"
+rooms = ["World Terminus | Wonderland"]
 
 [[drops]]
 name = "Ether"

public/scripts/common/enemy-worlds.js

@@ -14,26 +14,35 @@ function toggleWorldDisplay(display) {
 
 	const enemyWorlds = display.querySelector(".worlds");
 	const worldsWrapper = display.querySelectorAll(".worlds > div");
-	const worldsIcons = display.querySelectorAll(".worlds > div > img");
+	const worldsIcons = display.querySelectorAll(".worlds > div > .icon");
+	const worldsNames = display.querySelectorAll(".worlds > div > .info");
 
 	if (!showWorlds) {
 		enemyWorlds.style.width = "32px";
 		for (const wrapper of worldsWrapper) {
 			wrapper.style.height = "32px";
+			wrapper.style["margin-bottom"] = "16px";
 		}
 		for (const icon of worldsIcons) {
 			icon.width = "32";
 			icon.height = "32";
 		}
+		for (const name of worldsNames) {
+			name.style.display = "none";
+		}
 	} else {
 		enemyWorlds.style.width = "256px";
 		for (const wrapper of worldsWrapper) {
 			wrapper.style.height = "auto";
+			wrapper.style["margin-bottom"] = "0px";
 		}
 		for (const icon of worldsIcons) {
 			icon.width = "64";
 			icon.height = "64";
 		}
+		for (const name of worldsNames) {
+			name.style.display = "block";
+		}
 	}
 
 	display.dataset["showWorlds"] = !showWorlds;

public/styles/common/drops.css

@@ -55,14 +55,32 @@
 		overflow-x: hidden;
 		overflow-y: auto;
 
+		:first-child {
+			margin-top: 16px;
+		}
+
 		div {
 			display: inline-flex;
 			margin-bottom: 16px;
 			font-size: 14px;
 			align-items: center;
 
-			p {
+			.icon {
+				background-repeat: no-repeat;
+				background-position: center;
+				background-size: contain;
+				width: 64px;
+				height: 64px;
+			}
+
+			.info {
 				margin-left: 8px;
+				margin-bottom: 0px;
+
+				ul {
+					padding-left: 24px;
+					margin-bottom: 0;
+				}
 			}
 		}
 	}

templates/macros/common/macros.html

@@ -27,29 +27,20 @@
 						</div>
 						<div class="worlds">
 							{% for spawn in drop.spawns %}
-								{% if spawn.rooms.len() > 0 %}
+								<div>
-									{% for room in spawn.rooms %}
+									<div
-										<div>
+										class="icon"
-											<img
+										style="background-image: url('../public/assets/worlds/{{ spawn.texture() }}.webp');"
-												src="../public/assets/worlds/{{ spawn.texture() }}.webp"
+									></div>
-												width="64"
+									<div class="info">
-												height="64"
-											/>
-											<p>
-												{{ spawn.name +}} - {{+ room }}
-											</p>
-										</div>
-									{% endfor %}
-								{% else %}
-									<div>
-										<img
-											src="../public/assets/worlds/{{ spawn.texture() }}.webp"
-											width="64"
-											height="64"
-										/>
 										<p>{{ spawn.name }}</p>
+										<ul>
+											{% for room in spawn.rooms %}
+												<li>{{+ room }}</li>
+											{% endfor %}
+										</ul>
 									</div>
-								{% endif %}
+								</div>
 							{% endfor %}
 						</div>
 					</div>