Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #298

Merged
merged 5 commits into from
Jan 26, 2025
Merged

Fixes #298

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.CSY
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,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
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.ENG
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,6 @@
11619=bread loaf
11620=pan of cookies
11621=cake
11622=muffins
11622=baked quiche
11623=baked meat pie
11624=sausage pizza
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.FRE
Original file line number Diff line number Diff line change
Expand Up @@ -4836,7 +4836,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
Expand Down Expand Up @@ -4872,6 +4871,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.GER
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,6 @@
11619=Brotlaib
11620=Keksdose
11621=Kuchen
11622=Muffins
11622=gebackene Quiche
11623=gebackene Fleischpastete
11624=Wurstpizza
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.ITA
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,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
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.POL
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,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ą
Expand Down Expand Up @@ -4716,6 +4715,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ś
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.PTG
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,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
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.SPA
Original file line number Diff line number Diff line change
Expand Up @@ -4680,7 +4680,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
Expand Down Expand Up @@ -4716,6 +4715,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
Expand Down
2 changes: 1 addition & 1 deletion data/dictionaries/dictionary.ZRO
Original file line number Diff line number Diff line change
Expand Up @@ -4675,7 +4675,6 @@
11619=bread loaf
11620=pan of cookies
11621=cake
11622=muffins
11622=baked quiche
11623=baked meat pie
11624=sausage pizza
Expand Down Expand Up @@ -4711,6 +4710,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
Expand Down
2 changes: 1 addition & 1 deletion data/js/skill/craft/cooking.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
4 changes: 2 additions & 2 deletions data/js/skill/craft/itemdetailgump.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions source/Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,21 @@
12/08/2024 - Dragon Slayer
Fixed an issue where Imbuing and Mysticism skills were listed in wrong order in skills.dfn and enums.h

4/8/2024 - Dragon Slayer
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.

04/08/2024 - Dragon Slayer
Added Run a skillcheck for NPC to give them a chance to gain skill - if that option is enabled in ini (xuri)

16/07/2024 - Dragon Slayer
Added fallback in 'add menu for older clients that don't support buttontileart (Thanks Xuri)(gumps.cpp)

7/07/2024 - Dragon Slayer
07/07/2024 - Dragon Slayer
Added Requirement to drink potion hand has to be free, This can be disabled within the potion.js file by switching the reqfreehand to false. (js potion).

4/07/2024 - Dragon Slayer
04/07/2024 - Dragon Slayer
Fixed Cleaver ID missing in the jse_objectassociations.scp for carving corpses

18/06/2024 - Dragon Slayer
Expand Down Expand Up @@ -52,7 +57,7 @@
Add this properties to any weapon/armor/jewlery will give the player more hp/mana/stam why its equiped. depending on number you add with it
These are also available as JS Engine object properties: .healthBonus, .staminaBonus, .manaBonus

6/06/2024 - Dragon Slayer
06/06/2024 - Dragon Slayer
Fixed Accepting bods, When the expansion is to to lbr or later.

29/05/2024 - Dragon Slayer
Expand All @@ -72,11 +77,11 @@
-ARTIFACTRARITY=#
-Artifact Rarity is an item property that is visible on some artifacts and meant to give players an idea of how rare the item is. Items with rarity 1 are supposed to be common while rarity 12 are extremely scarce.

5/05/2024 - Dragon Slayer
05/05/2024 - Dragon Slayer
Added Spawner Gump and attached to the base_spawner, just another option for making editing spawners without using commands. (js spawnergump)
-Just double click any spawner you create from the addmenu or add from spawners.dfn file, gump will appear if you create a spawner with commands you would have to attach the script directly to it.

1/05/2024 - Dragon Slayer/Xuri
01/05/2024 - Dragon Slayer/Xuri
Fixed AutoUnequipAttempt function in clumsy.js, createfood.js level1target.js, will no longer fail on casting and return to hardcode.
Fixed createfood to check for reagents on cast.
Fixed many places missing proper null checks and refresh checks in magic js scripts.
Expand Down
Loading