World icons for KH2 and KH3 as well as some more info on KH3 enemies and ingredients

input/kh3/enemies/gambler.toml

@@ -6,6 +6,7 @@ name = "Arendelle"
 
 [[world]]
 name = "The Caribbean"
+rooms = [""]
 
 [[drops]]
 name = "Twilight Stone"

input/kh3/enemies/gold-beat.toml

@@ -3,6 +3,10 @@ name = "Gold Beat"
 [[world]]
 name = "Toy Box"
 
+[[world]]
+name = "The Caribbean"
+rooms = ["Exile Island"]
+
 [[drops]]
 name = "Lightning Stone"
 kind = "material"

input/kh3/enemies/high-soldier.toml

@@ -2,6 +2,7 @@ name = "High Soldier"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 12", "North District (Night)"]
 
 [[drops]]
 name = "Wellspring Gem"

input/kh3/enemies/mechanitaur.toml

@@ -2,6 +2,7 @@ name = "Mechanitaur"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 12"]
 
 [[drops]]
 name = "Wellspring Gem"

input/kh3/enemies/metal-troll.toml

@@ -2,6 +2,7 @@ name = "Metal Troll"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 11", "North District (Night)"]
 
 [[drops]]
 name = "Wellspring Stone"

input/kh3/enemies/spear-lizard.toml

@@ -2,6 +2,7 @@ name = "Spear Lizard"
 
 [[world]]
 name = "The Caribbean"
+rooms = ["Battlegate 10", "Isla de los Mastiles"]
 
 [[drops]]
 name = "Soothing Stone"

input/kh3/ingredients/basil.toml

@@ -10,3 +10,8 @@ note = "Spawn in Thoroughfare and go back to The Forest around the trees"
 world = "Toy Box"
 room = "Andy's House"
 note = "Outside the house in the garden"
+
+[[locations]]
+world = "The Carribean"
+room = "Isla de los Mastiles"
+note = "On a rock to the right of the spawn point"

input/kh3/ingredients/dill.toml

@@ -5,3 +5,12 @@ group = "herb"
 world = "Monstropolis"
 room = "Lobby & Offices"
 note = "Vending Machine at the Laugh Floor's entrance"
+
+[[locations]]
+world = "The Carribean"
+room = "Isla de los Mastiles"
+note = "Climb the walls and traverse the platforms"
+
+[[locations]]
+world = "The Carribean"
+room = "Forsaken Isle"

input/kh3/ingredients/filet_mignon.toml

@@ -9,4 +9,4 @@ note = "Laugh Floor on the desk in the very back"
 [[locations]]
 world = "The Carribean"
 room = "Fort"
-note = "In a box on the front terrace from the spawn"
+note = "In an yellow box on the front terrace from the spawn"

input/kh3/ingredients/portobello.toml

@@ -1,2 +1,10 @@
 name = "Portobello"
 group = "mushroom"
+
+[[locations]]
+world = "The Carribean"
+room = "Horseshoe Island"
+
+[[locations]]
+world = "The Carribean"
+room = "Ship's End"

input/kh3/ingredients/quail.toml

@@ -1,2 +1,7 @@
 name = "Quail"
 group = "meat"
+
+[[locations]]
+world = "The Carribean"
+room = "Docks"
+note = "Inside the building on the right side in a yellow box"

src/common.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use serde::Deserialize;
 
 pub mod direction;
@@ -14,3 +16,17 @@ pub enum Game {
 	Bbs,
 	Ddd,
 }
+
+impl Display for Game {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		let str = match self {
+			Game::Kh1 => "kh1",
+			Game::Kh2 => "kh2",
+			Game::Kh3 => "kh3",
+			Game::Bbs => "bbs",
+			Game::Ddd => "ddd",
+		};
+
+		f.write_str(str)
+	}
+}

src/common/enemy.rs

@@ -2,7 +2,7 @@ use std::{fmt::Display, path::PathBuf};
 
 use serde::Deserialize;
 
-use super::materials::MaterialDetails;
+use super::{Game, materials::MaterialDetails};
 
 #[derive(Default, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub struct Enemy {
@@ -94,7 +94,11 @@ pub struct SpawnLocation {
 }
 
 impl SpawnLocation {
-	pub fn texture(&self) -> String {
-		self.name.replace(" ", "-").to_lowercase()
+	pub fn texture(&self, game: &Game) -> String {
+		format!(
+			"{}/{}",
+			game,
+			self.name.replace(" ", "-").replace("'", "").to_lowercase()
+		)
 	}
 }

templates/macros/common/drops.html

@@ -30,7 +30,7 @@
 								<div>
 									<div
 										class="icon"
-										style="background-image: url('../public/assets/worlds/{{ spawn.texture() }}.webp');"
+										style="background-image: url('../public/assets/worlds/{{ spawn.texture(data.game) }}.webp');"
 									></div>
 									<div class="info">
 										<p>{{ spawn.name }}</p>