From 96bda4af3f29489e26e768b757ec2e6dc562dfc8 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:29:52 -0500
Subject: [PATCH 1/2] Fixes

cooking Fixes
duped dictonary number fixed
corrected items needed for sweet dough and dough
---
 data/dictionaries/dictionary.CSY      | 2 +-
 data/dictionaries/dictionary.ENG      | 2 +-
 data/dictionaries/dictionary.FRE      | 2 +-
 data/dictionaries/dictionary.GER      | 2 +-
 data/dictionaries/dictionary.ITA      | 2 +-
 data/dictionaries/dictionary.POL      | 2 +-
 data/dictionaries/dictionary.PTG      | 2 +-
 data/dictionaries/dictionary.SPA      | 2 +-
 data/dictionaries/dictionary.ZRO      | 2 +-
 data/js/skill/craft/cooking.js        | 2 +-
 data/js/skill/craft/itemdetailgump.js | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/dictionaries/dictionary.CSY b/data/dictionaries/dictionary.CSY
index d19756c34..c73b6389a 100644
--- a/data/dictionaries/dictionary.CSY
+++ b/data/dictionaries/dictionary.CSY
@@ -4679,7 +4679,6 @@
 11619=chlebový bochník
 11620=pánev sušenek
 11621=koláč
-11622=muffiny
 11622=pečený quiche
 11623=pečený masový koláč
 11624=pizza s uzeninou
@@ -4715,6 +4714,7 @@
 11654=Pro přípravu jídla musíte být v blízkosti zdroje tepla.
 11655=Musíte být v blízkosti mlýna, abyste mohli vyrábět mouku.
 11656=Musíte být v blízkosti pece, abyste mohli péct jídlo.
+11657=muffiny
 // 11801 - 12000 Dovednost řemeslné výroby
 // Strana 1 - Dřevěné předměty
 11801=Náprava
diff --git a/data/dictionaries/dictionary.ENG b/data/dictionaries/dictionary.ENG
index c3dc18d54..727ceb1b6 100644
--- a/data/dictionaries/dictionary.ENG
+++ b/data/dictionaries/dictionary.ENG
@@ -4679,7 +4679,6 @@
 11619=bread loaf
 11620=pan of cookies
 11621=cake
-11622=muffins
 11622=baked quiche
 11623=baked meat pie
 11624=sausage pizza
@@ -4715,6 +4714,7 @@
 11654=You must be near a heat source to cook food.
 11655=You must be near a mill to create flour.
 11656=You must be near an oven to bake food.
+11657=muffins
 // 11801 - 12000 Tinkering Crafting Skill
 // Page 1 - Wooden Items
 11801=Axle
diff --git a/data/dictionaries/dictionary.FRE b/data/dictionaries/dictionary.FRE
index 9465437b6..0ff49ad3e 100644
--- a/data/dictionaries/dictionary.FRE
+++ b/data/dictionaries/dictionary.FRE
@@ -4835,7 +4835,6 @@
 11619=miche de pain
 11620=panier de biscuits
 11621=gâteau
-11622=muffins
 11622=quiche au four
 11623=tarte à la viande cuite au four
 11624=pizza à la saucisse
@@ -4871,6 +4870,7 @@
 11654=Il faut être près d'une source de chaleur pour cuire les aliments.
 11655=Il faut être près d'un moulin pour créer de la farine.
 11656=Il faut être près d'un four pour cuire des aliments.
+11657=muffins
 // 11801 - 12000 Compétence en artisanat de bricolage
 // Page 1 - Objets en bois
 11801=Axe
diff --git a/data/dictionaries/dictionary.GER b/data/dictionaries/dictionary.GER
index 2376f9a36..4bd6e227e 100644
--- a/data/dictionaries/dictionary.GER
+++ b/data/dictionaries/dictionary.GER
@@ -4679,7 +4679,6 @@
 11619=Brotlaib
 11620=Keksdose
 11621=Kuchen
-11622=Muffins
 11622=gebackene Quiche
 11623=gebackene Fleischpastete
 11624=Wurstpizza
@@ -4715,6 +4714,7 @@
 11654=Du musst in der Nähe einer Wärmequelle sein, um Essen zu kochen.
 11655=Du musst in der Nähe einer Mühle sein, um Mehl herzustellen.
 11656=Du musst in der Nähe eines Ofens sein, um Essen zu backen.
+11657=Muffins
 // 11801 - 12000 Handwerkliches Geschick
 // Seite 1 - Hölzerne Gegenstände
 11801=Achse
diff --git a/data/dictionaries/dictionary.ITA b/data/dictionaries/dictionary.ITA
index 882528064..3e731fe9f 100644
--- a/data/dictionaries/dictionary.ITA
+++ b/data/dictionaries/dictionary.ITA
@@ -4679,7 +4679,6 @@
 11619=pagnotta di pane
 11620=torta di biscotti
 11621=torta
-11622=muffin
 11622=quiche al forno
 11623=pasticcio di carne al forno
 11624=pizza con salsiccia
@@ -4715,6 +4714,7 @@
 11654=Devi essere vicino a una fonte di calore per cucinare il cibo.
 11655=Devi essere vicino a un mulino per creare farina.
 11656=Devi essere vicino a un forno per cuocere il cibo.
+11657=muffin
 // 11801 - 12000 Abilità Artigianato Tinkering
 // Pagina 1 - Oggetti in legno
 11801=Assale
diff --git a/data/dictionaries/dictionary.POL b/data/dictionaries/dictionary.POL
index 144ca3bbf..377632cee 100644
--- a/data/dictionaries/dictionary.POL
+++ b/data/dictionaries/dictionary.POL
@@ -4679,7 +4679,6 @@
 11619=bochenek chleba
 11620=panka ciasteczek
 11621=ciasto
-11622=muffiny
 11622=pieczony quiche
 11623=pieczony placek z mięsem
 11624=pizza z kiełbasą
@@ -4715,6 +4714,7 @@
 11654=Musisz być w pobliżu źródła ciepła, aby gotować jedzenie.
 11655=Musisz być w pobliżu młyna, aby wytworzyć mąkę.
 11656=Musisz być w pobliżu piekarnika, aby upiec jedzenie.
+11657=muffiny
 // 11801 - 12000 Umiejętność majsterkowania
 // Strona 1 - Przedmioty z drewna
 11801=Oś
diff --git a/data/dictionaries/dictionary.PTG b/data/dictionaries/dictionary.PTG
index 416dcad46..07e6b7efc 100644
--- a/data/dictionaries/dictionary.PTG
+++ b/data/dictionaries/dictionary.PTG
@@ -4679,7 +4679,6 @@
 11619=pão de pão
 11620=panha de biscoitos
 11621=bolo
-11622=muffins
 11622=quiché cozido
 11623=torta de carne assada
 11624=sausage pizza
@@ -4715,6 +4714,7 @@
 11654=É preciso estar perto de uma fonte de calor para cozinhar os alimentos.
 11655=Tem de estar perto de um moinho para criar farinha.
 11656=Tem de estar perto de um forno para cozer alimentos.
+11657=muffins
 // 11801 - 12000 Habilidade de Artesanato de Sininho
 // Página 1 - Artigos de madeira
 11801=Eixo
diff --git a/data/dictionaries/dictionary.SPA b/data/dictionaries/dictionary.SPA
index aa5807812..5aabd7d66 100644
--- a/data/dictionaries/dictionary.SPA
+++ b/data/dictionaries/dictionary.SPA
@@ -4679,7 +4679,6 @@
 11619=pan de pan
 11620=pan de galletas
 11621=pastel
-11622=magdalenas
 11622=quiche al horno
 11623=pastel de carne al horno
 11624=pizza de salchicha
@@ -4715,6 +4714,7 @@
 11654=Debes estar cerca de una fuente de calor para cocinar los alimentos.
 11655=Debes estar cerca de un molino para crear harina.
 11656=Debes estar cerca de un horno para cocer alimentos.
+11657=magdalenas
 // 11801 - 12000 Habilidad de Artesanía
 // Página 1 - Artículos de madera
 11801=Eje
diff --git a/data/dictionaries/dictionary.ZRO b/data/dictionaries/dictionary.ZRO
index 5792f2860..33e71a7de 100644
--- a/data/dictionaries/dictionary.ZRO
+++ b/data/dictionaries/dictionary.ZRO
@@ -4674,7 +4674,6 @@
 11619=bread loaf
 11620=pan of cookies
 11621=cake
-11622=muffins
 11622=baked quiche
 11623=baked meat pie
 11624=sausage pizza
@@ -4710,6 +4709,7 @@
 11654=You must be near a heat source to cook food.
 11655=You must be near a mill to create flour.
 11656=You must be near an oven to bake food.
+11657=muffins
 // 11801 - 12000 Tinkering Crafting Skill
 // Page 1 - Wooden Items
 11801=Axle
diff --git a/data/js/skill/craft/cooking.js b/data/js/skill/craft/cooking.js
index 654533e8a..1ce12dd8f 100644
--- a/data/js/skill/craft/cooking.js
+++ b/data/js/skill/craft/cooking.js
@@ -21,7 +21,7 @@ const myPage = [
 	[ 11611, 11612, 11613, 11614, 11615, 11616, 11617, 11618 ],
 
 	// Page 3 - Baking
-	[ 11619, 11620, 11621, 11622, 11623, 11624, 11625, 11626, 11627, 11628, 11629 ],
+	[11619, 11620, 11621, 11657, 11622, 11623, 11624, 11625, 11626, 11627, 11628, 11629 ],
 
 	// Page 4 - Barbecue
 	[ 11630, 11631, 11632, 11633, 11634, 11635 ]
diff --git a/data/js/skill/craft/itemdetailgump.js b/data/js/skill/craft/itemdetailgump.js
index 0f4e1ad20..7ddbe18ee 100644
--- a/data/js/skill/craft/itemdetailgump.js
+++ b/data/js/skill/craft/itemdetailgump.js
@@ -1525,12 +1525,12 @@ function ItemDetailGump( pUser )
 			break;
 		case 1501: // Dough
 			createEntry = CreateEntries[1501];
-			HARVEST = [11637, 11639];
+			HARVEST = [11637, 11638];
 			mainSkill = parseInt( pUser.skills.cooking );
 			break;
 		case 1502: // Sweet Dough
 			createEntry = CreateEntries[1502];
-			HARVEST = [11607, 11638];
+			HARVEST = [11607, 11639];
 			mainSkill = parseInt( pUser.skills.cooking );
 			break;
 		case 1503: // Cake Mix

From 7b553d852d41a95d3261c24ee52d030e0fa97e21 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Fri, 24 Jan 2025 19:07:35 -0600
Subject: [PATCH 2/2] Update Changelog.txt

---
 source/Changelog.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/Changelog.txt b/source/Changelog.txt
index b0801d426..4757a4bea 100644
--- a/source/Changelog.txt
+++ b/source/Changelog.txt
@@ -1,3 +1,8 @@
+05/08/2024 - Dragon Slayer Update
+	Resolved an issue with cooking functionality.
+	Fixed a duplicated dictionary number.
+	Corrected the required items for crafting sweet dough and regular dough.
+
 13/05/2024 - Dragon Slayer
 	Added New Shield Type 107 so shield ID's no longer have to be in hard code for shields to work properly