Updated some ingredients locations + saving food simulator selection

Cargo.toml

@@ -4,15 +4,15 @@ version = "1.4.0"
 edition = "2024"
 
 [dependencies]
-askama = "0.14"
+askama = "0.14.0"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0"
+serde_json = "1.0.145"
-toml = "0.8"
+toml = "0.9.8"
-tracing = "0.1"
+tracing = "0.1.41"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
-itertools = "0.14"
+itertools = "0.14.0"
-blake3 = "1.8"
+blake3 = "1.8.2"
-ordered-float = { version = "5.0", features = ["serde"] }
+ordered-float = { version = "5.1.0", features = ["serde"] }
 
 [features]
 default = ["bbs", "ddd", "kh3", "kh2", "kh1"]

input/kh3/ingredients/basil.toml

@@ -1,2 +1,12 @@
 name = "Basil"
 group = "herb"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest around the trees"
+
+[[locations]]
+world = "Toy Box"
+room = "Andy's House"
+note = "Outside the house in the garden"

input/kh3/ingredients/bay_leaf.toml

@@ -1,2 +1,16 @@
 name = "Bay Leaf"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest around the trees"
+
+[[locations]]
+world = "Toy Box"
+room = "Andy's House"
+note = "Outside the house in the garden"

input/kh3/ingredients/beef.toml

@@ -1,2 +1,11 @@
 name = "Beef"
 group = "meat"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+notes = "Rest Area"

input/kh3/ingredients/black_truffle.toml

@@ -1,2 +1,6 @@
 name = "Black Truffle"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/black_trumpet.toml

@@ -1,2 +1,6 @@
 name = "Black Trumpet"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/butter.toml

@@ -1,2 +1,6 @@
 name = "Butter"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/caviar.toml

@@ -1,2 +1,6 @@
 name = "Caviar"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/celery.toml

@@ -1,2 +1,6 @@
 name = "Celery"
 group = "vegetable"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/chanterelle.toml

@@ -1,2 +1,11 @@
 name = "Chanterelle"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest around the trees"

input/kh3/ingredients/cheese.toml

@@ -1,2 +1,11 @@
 name = "Cheese"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+notes = "1F on the right side stands"

input/kh3/ingredients/chocolate.toml

@@ -1,2 +1,11 @@
 name = "Chocolate"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+notes = "2F on the right side at the very end of the platform"

input/kh3/ingredients/cloves.toml

@@ -1,2 +1,6 @@
 name = "Cloves"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/cornichon.toml

@@ -1,2 +1,21 @@
 name = "Cornichon"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+note = "1F outside the store to the right"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+note = "Rest Area"
+
+[[locations]]
+world = "Toy Box"
+room = "Galaxy Toys"
+note = "Action Figures, in the very back of the store"

input/kh3/ingredients/dill.toml

@@ -1,2 +1,7 @@
 name = "Dill"
 group = "herb"
+
+[[locations]]
+world = "Monstropolis"
+room = "Lobby & Offices"
+note = "Vending Machine at the Laugh Floor's entrance"

input/kh3/ingredients/eel.toml

@@ -1,2 +1,11 @@
 name = "Eel"
 group = "seafood"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest near the water"

input/kh3/ingredients/filet_mignon.toml

@@ -1,2 +1,12 @@
 name = "Filet Mignon"
 group = "meat"
+
+[[locations]]
+world = "Monstropolis"
+room = "Lobby & Offices"
+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"

input/kh3/ingredients/king_oyster_mushroom.toml

@@ -1,2 +1,6 @@
 name = "King Oyster Mushroom"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/lemon.toml

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

input/kh3/ingredients/lobster.toml

@@ -1,2 +1,7 @@
 name = "Lobster"
 group = "seafood"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest near the water"

input/kh3/ingredients/miller_mushroom.toml

@@ -1,2 +1,6 @@
 name = "Miller Mushroom"
 group = "mushroom"
+
+[[locations]]
+world = "The Carribean"
+room = "Hudded Isles"

input/kh3/ingredients/morel.toml

@@ -1,2 +1,6 @@
 name = "Morel"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/olive_oil.toml

@@ -1,2 +1,6 @@
 name = "Olive Oil"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/onion.toml

@@ -1,2 +1,6 @@
 name = "Onion"
 group = "vegetable"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/parsley.toml

@@ -1,2 +1,11 @@
 name = "Parsley"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Andy's House"
+note = "Outside the house in the garden"

input/kh3/ingredients/porcini.toml

@@ -1,2 +1,6 @@
 name = "Porcini"
 group = "mushroom"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/rice.toml

@@ -1,2 +1,6 @@
 name = "Rice"
 group = "other"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/rosemary.toml

@@ -1,2 +1,11 @@
 name = "Rosemary"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Andy's House"
+note = "Outside the house in the garden"

input/kh3/ingredients/saffron.toml

@@ -1,2 +1,6 @@
 name = "Saffron"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

input/kh3/ingredients/scallop.toml

@@ -5,3 +5,8 @@ group = "seafood"
 world = "Kingdom of Corona"
 room = "Thoroughfare"
 note = "At the wharf to the left from save point"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest near the water"

input/kh3/ingredients/sea_bass.toml

@@ -5,3 +5,8 @@ group = "seafood"
 world = "Kingdom of Corona"
 room = "Thoroughfare"
 note = "At the wharf to the left from save point"
+
+[[locations]]
+world = "Kingdom of Corona"
+room = "The Forest"
+note = "Spawn in Thoroughfare and go back to The Forest near the water"

input/kh3/ingredients/sole.toml

@@ -1,6 +1,10 @@
 name = "Sole"
 group = "seafood"
 
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
 [[locations]]
 world = "Kingdom of Corona"
 room = "Thoroughfare"

input/kh3/ingredients/thyme.toml

@@ -1,2 +1,11 @@
 name = "Thyme"
 group = "herb"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"
+
+[[locations]]
+world = "Toy Box"
+room = "Andy's House"
+note = "Outside the house in the garden"

input/kh3/ingredients/veal.toml

@@ -1,2 +1,6 @@
 name = "Veal"
 group = "meat"
+
+[[locations]]
+world = "Any"
+room = "Moogle Shop"

public/scripts/kh1/synth.js

@@ -1,5 +1,8 @@
 import "../common/prototypes.js";
 
+const RECIPE_STORAGE_NAME = "kh1/synth/recipe.";
+const LIST_STORAGE_NAME = "kh1/synth/needed-maths";
+
 let markedNeededMaterials = [];
 
 document.addEventListener("DOMContentLoaded", (event) => {
@@ -7,12 +10,13 @@ document.addEventListener("DOMContentLoaded", (event) => {
 
 	for (const recipe of recipes) {
 		recipe.checked =
-			localStorage.getItem("kh1-synth-" + recipe.id) === "true" ?? false;
+			localStorage.getItem(RECIPE_STORAGE_NAME + recipe.id) === "true" ??
+			false;
 		updateSynthRecipeState(recipe);
 
 		recipe.addEventListener("input", function () {
 			// Change the recipe's state and update and needed materials list based on the remaining recipes
-			localStorage.setItem("kh1-synth-" + this.id, this.checked);
+			localStorage.setItem(RECIPE_STORAGE_NAME + this.id, this.checked);
 			updateSynthRecipeState(this);
 			calcNeededMats();
 		});
@@ -26,8 +30,8 @@ document.addEventListener("DOMContentLoaded", (event) => {
 	}
 
 	// Turn the single saved string into an array with each material
-	if (localStorage.getItem("kh1-synth-needed-mats") != null) {
+	if (localStorage.getItem(LIST_STORAGE_NAME) != null) {
-		let saved = localStorage.getItem("kh1-synth-needed-mats");
+		let saved = localStorage.getItem(LIST_STORAGE_NAME);
 		saved = saved.split(",");
 		markedNeededMaterials = saved;
 		markedNeededMaterials = markedNeededMaterials.filter(
@@ -128,7 +132,7 @@ function updateMarkedNeededMats(ingredient) {
 		markedNeededMaterials.push(ingredient);
 	}
 	markedNeededMaterials = markedNeededMaterials.filter((n) => n && n !== "");
-	localStorage.setItem("kh1-synth-needed-mats", markedNeededMaterials);
+	localStorage.setItem(LIST_STORAGE_NAME, markedNeededMaterials);
 }
 
 function markNeededMat(mat) {

public/scripts/kh3/food-sim.js

@@ -1,17 +1,27 @@
-let globalStats = { str: 0, mag: 0, def: 0, hp: 0, mp: 0 };
+const STORAGE_NAME = "kh3/food-sim/recipe.";
 const types = ["starters", "soups", "fish", "meat", "deserts"];
+
+let globalStats = { str: 0, mag: 0, def: 0, hp: 0, mp: 0 };
 let typeItem = [];
 let hasSelection = [false, false, false, false, false];
+let ingredientsList = [];
 
 document.addEventListener("DOMContentLoaded", (event) => {
 	updateStats();
 
 	types.forEach(function (type, typeIdx) {
+		let savedRecipe = localStorage.getItem(STORAGE_NAME + typeIdx);
+
 		const recipes = document.querySelectorAll(
 			"div.recipes." + type + " .recipe",
 		);
 
 		recipes.forEach(function (item, index) {
+			let recipeName = item.querySelector(".title").innerText;
+			if (savedRecipe != undefined && recipeName == savedRecipe) {
+				selectRecipe(item, typeIdx);
+			}
+
 			item.addEventListener("click", function () {
 				if (!hasSelection[typeIdx]) {
 					hasSelection[typeIdx] = true;
@@ -71,6 +81,16 @@ document.addEventListener("DOMContentLoaded", (event) => {
 });
 
 function unselectRecipe(index) {
+	// Remove all ingredients of this recipe
+	let ingredients = typeItem[index].querySelectorAll(".ingredients ul li");
+	for (let ingredient of ingredients) {
+		ingredientsList = ingredientsList.filter(
+			(ing) => ing != ingredient["innerText"],
+		);
+	}
+
+	localStorage.removeItem(STORAGE_NAME + index);
+
 	typeItem[index].style["box-shadow"] = "0px 0px 10px rgba(0, 0, 0, 0.4)";
 	let stats = JSON.parse(typeItem[index].dataset["stats"]);
 	removeStats(stats);
@@ -80,6 +100,17 @@ function selectRecipe(item, index) {
 	typeItem[index] = item;
 	item.style["box-shadow"] = "0px 0px 10px rgba(0, 255, 0, 0.8)";
 
+	// Add all ingredients of this recipe to a global list
+	let ingredients = item.querySelectorAll(".ingredients ul li");
+	for (let ingredient of ingredients) {
+		ingredientsList.push(ingredient["innerText"]);
+	}
+
+	let recipeName = item.querySelector(".title").innerText;
+	console.log(item);
+	console.log(item.querySelectorAll(".title"));
+	localStorage.setItem(STORAGE_NAME + index, recipeName);
+
 	let stats = JSON.parse(item.dataset["stats"]);
 	addStats(stats);
 }
@@ -149,6 +180,14 @@ function updateStats() {
 	);
 	updatePoint(poly, 2, HP_MAX_POINT, hpProgress, globalStats.hp, "stat-hp");
 	updatePoint(poly, 3, MP_MAX_POINT, mpProgress, globalStats.mp, "stat-mp");
+
+	// let list = document.getElementById("ingredients-list");
+	// list.innerHTML = "";
+	// for (let ingredient of ingredientsList) {
+	// 	let ingredientElem = document.createElement("li");
+	// 	ingredientElem.innerText = ingredient;
+	// 	list.appendChild(ingredientElem);
+	// }
 }
 
 function updatePoint(poly, statId, max, progress, value, statElem) {

templates/pages/kh3/food-sim.html

@@ -57,6 +57,8 @@
 			<input type="checkbox" id="hearty-meal" name="hearty-meal" />
 			<label for="hearty-meal">Hearty Meal</label>
 		</div>
+
+		<ul id="ingredients-list"></ul>
 	</div>
 
 	<h1>Starters</h1>