Added ingredients page for KH3 still WIP and needs more data

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "khguide"
-version = "1.3.2"
+version = "1.4.0"
 edition = "2024"
 
 [dependencies]

input/kh3/ingredients/apple.toml

@@ -0,0 +1,6 @@
+name = "Apple"
+group = "fruit"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/apricot.toml

@@ -0,0 +1,6 @@
+name = "Apricot"
+group = "fruit"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/banana.toml

@@ -0,0 +1,7 @@
+name = "Banana"
+group = "special"
+
+[[locations]]
+world = "Monstropolis"
+room = "Upper Level"
+note = "Banana Flan"

input/kh3/ingredients/basil.toml

@@ -0,0 +1,2 @@
+name = "Basil"
+group = "herb"

input/kh3/ingredients/bay_leaf.toml

@@ -0,0 +1,2 @@
+name = "Bay Leaf"
+group = "herb"

input/kh3/ingredients/beef.toml

@@ -0,0 +1,2 @@
+name = "Beef"
+group = "meat"

input/kh3/ingredients/black_truffle.toml

@@ -0,0 +1,2 @@
+name = "Black Truffle"
+group = "mushroom"

input/kh3/ingredients/black_trumpet.toml

@@ -0,0 +1,2 @@
+name = "Black Trumpet"
+group = "mushroom"

input/kh3/ingredients/blackberry.toml

@@ -0,0 +1,2 @@
+name = "Blackberry"
+group = "fruit"

input/kh3/ingredients/blood_orange.toml

@@ -0,0 +1,7 @@
+name = "Blood Orange"
+group = "special"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Hills"
+note = "Orange Flan"

input/kh3/ingredients/butter.toml

@@ -0,0 +1,2 @@
+name = "Butter"
+group = "other"

input/kh3/ingredients/carrot.toml

@@ -0,0 +1,2 @@
+name = "Carrot"
+group = "vegetable"

input/kh3/ingredients/caviar.toml

@@ -0,0 +1,2 @@
+name = "Caviar"
+group = "other"

input/kh3/ingredients/celery.toml

@@ -0,0 +1,2 @@
+name = "Celery"
+group = "vegetable"

input/kh3/ingredients/chanterelle.toml

@@ -0,0 +1,2 @@
+name = "Chanterelle"
+group = "mushroom"

input/kh3/ingredients/cheese.toml

@@ -0,0 +1,2 @@
+name = "Cheese"
+group = "other"

input/kh3/ingredients/chocolate.toml

@@ -0,0 +1,2 @@
+name = "Chocolate"
+group = "other"

input/kh3/ingredients/cloves.toml

@@ -0,0 +1,2 @@
+name = "Cloves"
+group = "herb"

input/kh3/ingredients/cod.toml

@@ -0,0 +1,7 @@
+name = "Cod"
+group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "At the wharf to the left from save point"

input/kh3/ingredients/cornichon.toml

@@ -0,0 +1,2 @@
+name = "Cornichon"
+group = "other"

input/kh3/ingredients/crab.toml

@@ -0,0 +1,2 @@
+name = "Crab"
+group = "seafood"

input/kh3/ingredients/dill.toml

@@ -0,0 +1,2 @@
+name = "Dill"
+group = "herb"

input/kh3/ingredients/eel.toml

@@ -0,0 +1,2 @@
+name = "Eel"
+group = "seafood"

input/kh3/ingredients/eggplant.toml

@@ -0,0 +1,2 @@
+name = "Eggplant"
+group = "vegetable"

input/kh3/ingredients/filet_mignon.toml

@@ -0,0 +1,2 @@
+name = "Filet Mignon"
+group = "meat"

input/kh3/ingredients/garlic.toml

@@ -0,0 +1,2 @@
+name = "Garlic"
+group = "vegetable"

input/kh3/ingredients/gooseberry.toml

@@ -0,0 +1,2 @@
+name = "Gooseberry"
+group = "fruit"

input/kh3/ingredients/grapes.toml

@@ -0,0 +1,7 @@
+name = "Grapes"
+group = "special"
+
+[[locations]]
+world = "Arendelle"
+room = "Mountain Ridge"
+note = "Grape Flan"

input/kh3/ingredients/honey.toml

@@ -0,0 +1,6 @@
+name = "Honey"
+group = "other"
+
+[[locations]]
+world = "100 Acre Wood"
+room = "Pooh's Hunny Harvest"

input/kh3/ingredients/king_oyster_mushroom.toml

@@ -0,0 +1,2 @@
+name = "King Oyster Mushroom"
+group = "mushroom"

input/kh3/ingredients/lemon.toml

@@ -0,0 +1,2 @@
+name = "Lemon"
+group = "fruit"

input/kh3/ingredients/lobster.toml

@@ -0,0 +1,2 @@
+name = "Lobster"
+group = "seafood"

input/kh3/ingredients/melon.toml

@@ -0,0 +1,7 @@
+name = "Melon"
+group = "special"
+
+[[locations]]
+world = "San Fransokyo"
+room = "South District"
+note = "Honeydew Flan"

input/kh3/ingredients/miller_mushroom.toml

@@ -0,0 +1,2 @@
+name = "Miller Mushroom"
+group = "mushroom"

input/kh3/ingredients/morel.toml

@@ -0,0 +1,2 @@
+name = "Morel"
+group = "mushroom"

input/kh3/ingredients/mussle.toml

@@ -0,0 +1,7 @@
+name = "Mussle"
+group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "At the wharf to the left from save point"

input/kh3/ingredients/olive_oil.toml

@@ -0,0 +1,2 @@
+name = "Olive Oil"
+group = "other"

input/kh3/ingredients/onion.toml

@@ -0,0 +1,2 @@
+name = "Onion"
+group = "vegetable"

input/kh3/ingredients/orange.toml

@@ -0,0 +1,2 @@
+name = "Orange"
+group = "fruit"

input/kh3/ingredients/parsley.toml

@@ -0,0 +1,2 @@
+name = "Parsley"
+group = "herb"

input/kh3/ingredients/pear.toml

@@ -0,0 +1,2 @@
+name = "Pear"
+group = "fruit"

input/kh3/ingredients/porcini.toml

@@ -0,0 +1,2 @@
+name = "Porcini"
+group = "mushroom"

input/kh3/ingredients/portobello.toml

@@ -0,0 +1,2 @@
+name = "Portobello"
+group = "mushroom"

input/kh3/ingredients/pumpkin.toml

@@ -0,0 +1,7 @@
+name = "Pumpkin"
+group = "vegetable"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "Stands on the main street"

input/kh3/ingredients/quail.toml

@@ -0,0 +1,2 @@
+name = "Quail"
+group = "meat"

input/kh3/ingredients/raspberry.toml

@@ -0,0 +1,2 @@
+name = "Raspberry"
+group = "fruit"

input/kh3/ingredients/rice.toml

@@ -0,0 +1,2 @@
+name = "Rice"
+group = "other"

input/kh3/ingredients/rosemary.toml

@@ -0,0 +1,2 @@
+name = "Rosemary"
+group = "herb"

input/kh3/ingredients/saffron.toml

@@ -0,0 +1,2 @@
+name = "Saffron"
+group = "herb"

input/kh3/ingredients/scallop.toml

@@ -0,0 +1,7 @@
+name = "Scallop"
+group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "At the wharf to the left from save point"

input/kh3/ingredients/sea_bass.toml

@@ -0,0 +1,7 @@
+name = "Sea Bass"
+group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "At the wharf to the left from save point"

input/kh3/ingredients/sole.toml

@@ -0,0 +1,7 @@
+name = "Sole"
+group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "At the wharf to the left from save point"

input/kh3/ingredients/sour_cherry.toml

@@ -0,0 +1,7 @@
+name = "Sour Cherry"
+group = "special"
+
+[[locations]]
+world = "Olympus"
+room = "Overlook"
+note = "Cherry Flan"

input/kh3/ingredients/strawberry.toml

@@ -0,0 +1,7 @@
+name = "Strawberry"
+group = "special"
+
+[[locations]]
+world = "Toy Box"
+room = "Rest Area"
+note = "Strawberry Flan"

input/kh3/ingredients/thyme.toml

@@ -0,0 +1,2 @@
+name = "Thyme"
+group = "herb"

input/kh3/ingredients/tomato.toml

@@ -0,0 +1,7 @@
+name = "Tomato"
+group = "vegetable"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "Thoroughfare"
+note = "Stands on the main street"

input/kh3/ingredients/veal.toml

@@ -0,0 +1,2 @@
+name = "Veal"
+group = "meat"

input/kh3/ingredients/watermelon.toml

@@ -0,0 +1,7 @@
+name = "Watermelon"
+group = "special"
+
+[[locations]]
+world = "The Caribbean"
+room = "Fort"
+note = "Watermelon Flan"

input/kh3/ingredients/zucchini.toml

@@ -0,0 +1,2 @@
+name = "Zucchini"
+group = "vegetable"

src/kh3.rs

@@ -1,5 +1,6 @@
 use askama::Template;
 use food::Recipes;
+use ingredient::Ingredient;
 
 use crate::{
 	RuntimeModule,
@@ -8,9 +9,11 @@ use crate::{
 };
 
 mod food;
+mod ingredient;
 
 const ENEMIES_PATH: &str = "./input/kh3/enemies";
 const RECIPES_PATH: &str = "./input/kh3/recipes.toml";
+const INGREDIENTS_PATH: &str = "./input/kh3/ingredients";
 
 #[derive(Template)]
 #[template(path = "pages/kh3/drops.html")]
@@ -24,15 +27,23 @@ struct RecipesTemplate {
 	pub recipes: Recipes,
 }
 
+#[derive(Template)]
+#[template(path = "pages/kh3/ingredients.html")]
+struct IngredientsTemplate {
+	pub ingredients: Vec<Ingredient>,
+}
+
 pub struct Module;
 
 impl RuntimeModule for Module {
 	fn start_module() {
 		tracing::info!("Loading enemy data from {}", ENEMIES_PATH);
 		let enemies = Enemy::import(ENEMIES_PATH);
-
 		let drops = Drops::new(Game::Kh3, enemies);
 
+		tracing::info!("Loading ingredients data from {}", ENEMIES_PATH);
+		let ingredients = Ingredient::import(INGREDIENTS_PATH);
+
 		tracing::info!("Loading recipes data from {}", RECIPES_PATH);
 		let recipes_str = std::fs::read_to_string(RECIPES_PATH).unwrap();
 		let recipes = toml::from_str::<Recipes>(&recipes_str).unwrap();
@@ -42,6 +53,11 @@ impl RuntimeModule for Module {
 
 		create_file("./out/kh3", "drops", drops_template).unwrap();
 
+		tracing::info!("Generating the KH3 ingredients template");
+		let ingredients_template = IngredientsTemplate { ingredients };
+
+		create_file("./out/kh3", "ingredients", ingredients_template).unwrap();
+
 		tracing::info!("Generating the KH3 recipes template");
 		let food_template = RecipesTemplate { recipes };
 

src/kh3/ingredient.rs

@@ -0,0 +1,58 @@
+use std::path::PathBuf;
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum IngredientGroup {
+	Meat,
+	Seafood,
+	Vegetable,
+	Mushroom,
+	Herb,
+	Fruit,
+	Other,
+	Special,
+}
+
+#[derive(Debug, Deserialize, PartialEq, Eq)]
+pub struct Ingredient {
+	pub name: String,
+	pub group: IngredientGroup,
+
+	pub locations: Vec<Location>,
+}
+
+#[derive(Debug, Deserialize, PartialEq, Eq)]
+pub struct Location {
+	pub world: String,
+	pub room: String,
+	pub note: Option<String>,
+}
+
+impl Ingredient {
+	pub fn import(path: &str) -> Vec<Ingredient> {
+		let mut ingredients: Vec<Ingredient> = vec![];
+
+		// Loading multiple files into one vector due to the size of each board
+		let paths = std::fs::read_dir(path)
+			.unwrap()
+			.filter_map(|f| f.ok())
+			.map(|f| f.path())
+			.filter_map(|p| match p.extension().is_some_and(|e| e == "toml") {
+				true => Some(p),
+				false => None,
+			})
+			.collect::<Vec<PathBuf>>();
+
+		for path in paths {
+			let str = std::fs::read_to_string(path).unwrap();
+			let ingredient = toml::from_str::<Ingredient>(&str);
+			if let Ok(ingredient) = ingredient {
+				ingredients.push(ingredient);
+			}
+		}
+
+		ingredients
+	}
+}

templates/components/common/drops.html

@@ -26,8 +26,8 @@
 <br />
 
 {% for drop in data.drops %}
-	{% call macros::drop("shard") %}
-	{% call macros::drop("stone") %}
-	{% call macros::drop("gem") %}
-	{% call macros::drop("crystal") %}
+	{% call drops_macros::drop("shard") %}
+	{% call drops_macros::drop("stone") %}
+	{% call drops_macros::drop("gem") %}
+	{% call drops_macros::drop("crystal") %}
 {% endfor %}

templates/pages/kh1/drops.html

@@ -1,5 +1,5 @@
 {% extends "layouts/base.html" %}
-{% import "macros/common/macros.html" as macros %}
+{% import "macros/common/drops.html" as drops_macros %}
 
 {% block title %}KH1 - Drops{% endblock %}
 

templates/pages/kh1/synth.html

@@ -1,5 +1,4 @@
 {% extends "layouts/base.html" %}
-{% import "macros/common/macros.html" as macros %}
 
 {% block title %}KH1 - Sythensis{% endblock %}
 

templates/pages/kh2/drops.html

@@ -1,5 +1,5 @@
 {% extends "layouts/base.html" %}
-{% import "macros/common/macros.html" as macros %}
+{% import "macros/common/drops.html" as drops_macros %}
 
 {% block title %}KH2 - Drops{% endblock %}
 

templates/pages/kh3/drops.html

@@ -1,7 +1,7 @@
 {% extends "layouts/base.html" %}
-{% import "macros/common/macros.html" as macros %}
+{% import "macros/common/drops.html" as drops_macros %}
 
-{% block title %}KH2 - Drops{% endblock %}
+{% block title %}KH3 - Drops{% endblock %}
 
 {% block head %}
 	<link rel="stylesheet" href="{{ crate::find_hash("/public/styles/common/drops.css") }}"></link>

templates/pages/kh3/ingredients.html

@@ -0,0 +1,14 @@
+{% extends "layouts/base.html" %}
+
+{% block title %}KH3 - Ingredients{% endblock %}
+
+{% block head %}
+	<link rel="stylesheet" href="{{ crate::find_hash("/public/styles/common/ingredients.css") }}"></link>
+	<script
+		type="module"
+		src="{{ crate::find_hash("/public/scripts/common/ingredients.js") }}"
+	></script>
+{% endblock %}
+
+{% block content %}
+{% endblock %}