Merge pull request UOX3DevTeam#141 from DragonSlayer62/tinker-fixes

Fixed Tinkering
DragonSlayer62 · Nov 8, 2022 · 028f4c9 · 028f4c9
2 parents 0eb417d + 7faa421
commit 028f4c9
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 2 deletions.
diff --git a/data/dfndata/create/tinkering.dfn b/data/dfndata/create/tinkering.dfn
@@ -97,6 +97,7 @@ ITEM=210
 ITEM=211
 ITEM=212
 ITEM=213
+ITEM=284
 ITEM=214
 ITEM=215
 ITEM=216
@@ -948,7 +949,16 @@ ADDITEM=0x1059
 MINRANK=1
 MAXRANK=10
 }
-
+[ITEM 284]
+{
+NAME=Fletcher's Tools
+ID=0x1022
+RESOURCE=METAL 3
+SKILL=37 350 830
+ADDITEM=0x1022
+MINRANK=1
+MAXRANK=10
+}
 
 // end of tinkering section
 //*****************************************

diff --git a/data/dictionaries/dictionary.CSY b/data/dictionaries/dictionary.CSY
@@ -4592,6 +4592,7 @@
 11835=Kovářské kladivo
 11836=Kleště
 11837=Sada nářadí (dráteník)
+11838=Fletcherovy nástroje
 // Strana 3 - Díly
 11860=Obruče na hlavně
 11861=Závit na hlaveň
@@ -4807,5 +4808,8 @@
 17112=Béžová
 17113=Zlatá
 17114=DK hnědá
+17116=Nemáš vousy k barvení.
+17117=Nabídka výběru barvy vousů
+17118=Barvi mi vousy touto barvou!
 }
 EOF
diff --git a/data/dictionaries/dictionary.ENG b/data/dictionaries/dictionary.ENG
@@ -4585,6 +4585,7 @@
 11835=Smith's Hammer
 11836=Tongs
 11837=Tool Kit (Tinker's tools)
+11838=Fletcher's Tools
 // Page 3 - Parts
 11860=Barrel Hoops
 11861=Barrel Tap

diff --git a/data/dictionaries/dictionary.FRE b/data/dictionaries/dictionary.FRE
@@ -4749,6 +4749,7 @@
 11835=Marteau de forgeron
 11836=Tongs
 11837=Kit d'outils (outils de bricolage)
+11838=Outils du plieur
 // Page 3 - Pièces détachées
 11860=Cerceaux de canon
 11861=Taraud de canon
@@ -4964,5 +4965,8 @@
 17112=Beige
 17113=Doré
 17114=Brun foncé
+17116=Vous n'avez pas de barbe à teindre.
+17117=Menu de sélection de la couleur de la barbe
+17118=Toignez ma barbe de cette couleur !
 }
 EOF
diff --git a/data/dictionaries/dictionary.GER b/data/dictionaries/dictionary.GER
@@ -4585,6 +4585,7 @@
 11835=Schmiedehammer
 11836=Zange
 11837=Werkzeugsatz (Bastelwerkzeug)
+11838=Fletcher's Werkzeuge
 // Seite 3 - Teile
 11860=Laufbügel
 11861=Fassgewindebohrer
@@ -4800,5 +4801,8 @@
 17112=Beige
 17113=Gold
 17114=DK Braun
+17116=Sie haben keinen Bart zum Färben.
+17117=Menü zur Auswahl der Bartfarbe
+17118=Färbe meinen Bart in dieser Farbe!
 }
 EOF
diff --git a/data/dictionaries/dictionary.ITA b/data/dictionaries/dictionary.ITA
@@ -4585,6 +4585,7 @@
 11835=Martello da fabbro
 11836=Tonghe
 11837=Kit di attrezzi (attrezzi da scultore)
+11838=Strumenti di Fletcher
 // Pagina 3 - Parti
 11860=Cerchi per canne
 11861=Barile Tap
@@ -4800,5 +4801,8 @@
 17112=Beige
 17113=Dorato
 17114=Marrone chiaro
+17116=Non hai barba da tingere.
+17117=Menu di selezione del colore della barba
+17118=Tingi la mia barba di questo colore!
 }
 EOF
diff --git a/data/dictionaries/dictionary.POL b/data/dictionaries/dictionary.POL
@@ -4585,6 +4585,7 @@
 11835=Młotek kowalski
 11836=Zęby
 11837=Zestaw narzędzi (narzędzia dla majsterkowiczów)
+11838=Narzędzia Fletcher'a
 // Strona 3 - Części
 11860=Obręcze lufy
 11861=Kran do lufy
@@ -4800,4 +4801,7 @@
 17112=Beżowy
 17113=złoty
 17114=DK Brązowy
+17116=Nie masz brody do farbowania.
+17117=Menu wyboru koloru brody
+17118=Przefarbuj moją brodę na ten kolor!
 }
diff --git a/data/dictionaries/dictionary.PTG b/data/dictionaries/dictionary.PTG
@@ -4584,6 +4584,7 @@
 11835=Martelo de martelo de Smith
 11836=Tenazes
 11837=Kit de ferramentas (Tinker's tools)
+11838=Ferramentas de Fletcher
 // Página 3 - Peças
 11860=Anéis de Barril
 11861=Torneira de barril
@@ -4799,5 +4800,8 @@
 17112=Bege
 17113=Golden
 17114=DK Brown
+17116=Não se tem barba para tingir.
+17117= Menu de selecção de cor de barba
+17118=Tinja a minha barba desta cor!
 }
 EOF
diff --git a/data/dictionaries/dictionary.SPA b/data/dictionaries/dictionary.SPA
@@ -4585,6 +4585,7 @@
 11835=Martillo de herrero
 11836=Pinzas
 11837=Juego de herramientas (herramientas de calderero)
+11838=Herramientas de Carpintero
 // Página 3 - Piezas
 11860=Aros de barril
 11861=Grifo de barril
@@ -4800,5 +4801,8 @@
 17112=Beige
 17113=Dorado
 17114=Marrón Rojo
+17116=No tiene barba para teñir.
+17117=Menú de selección del color de la barba
+17118=¡Tiña mi barba de este color!
 }
 EOF
diff --git a/data/dictionaries/dictionary.ZRO b/data/dictionaries/dictionary.ZRO
@@ -4582,6 +4582,7 @@
 11835=Smith's Hammer
 11836=Tongs
 11837=Tool Kit (Tinker's tools)
+11838=Fletcher's Tools
 // Page 3 - Parts
 11860=Barrel Hoops
 11861=Barrel Tap
@@ -4797,5 +4798,8 @@
 17112=Beige
 17113=Golden
 17114=DK Brown
+17116=You have no beard to dye.
+17117=Beard Color Selection Menu
+17118=Dye my beard this color!
 }
 EOF
diff --git a/data/js/skill/craft/itemdetailgump.js b/data/js/skill/craft/itemdetailgump.js
@@ -1140,6 +1140,11 @@ function ItemDetailGump( pUser )
 			HARVEST = [10015];
 			mainSkill = parseInt( pUser.skills.tinkering );
 			break;
+		case 214: // Fletcher's Tools
+			createEntry = CreateEntries[284];
+			HARVEST = [10015];
+			mainSkill = parseInt( pUser.skills.tinkering );
+			break;
 		// Page 3 - Parts
 		case 224: // Barrel Hoops
 			createEntry = CreateEntries[224];

diff --git a/data/js/skill/craft/tinkering.js b/data/js/skill/craft/tinkering.js
@@ -17,7 +17,7 @@ const myPage = [
 	[ 11801, 11802, 11803, 11804, 11805 ],
 
 	// Page 2 - Tools
-	[ 11820, 11821, 11822, 11823, 11824, 11825, 11826, 11827, 11828, 11829, 11830, 11831, 11832, 11833, 11834, 11835, 11836, 11837 ],
+	[ 11820, 11821, 11822, 11823, 11824, 11825, 11826, 11827, 11828, 11829, 11830, 11831, 11832, 11833, 11834, 11835, 11836, 11837, 11838 ],
 
 	// Page 3 - Parts
 	[ 11860, 11861, 11862, 11863, 11864, 11865, 11866 ],
@@ -222,6 +222,8 @@ function onGumpPress( pSock, pButton, gumpData )
 			makeID = 253; timerID = 2; break;
 		case 217: // Tool Kit (Tinker's tools)
 			makeID = 213; timerID = 2; break;
+		case 218: // Fletcher's Tools
+			makeID = 214; timerID = 2; break;
 		// Page 3 - Parts
 		case 300: // Barrel Hoops
 			makeID = 224; timerID = 3; break;
@@ -379,6 +381,8 @@ function onGumpPress( pSock, pButton, gumpData )
 			itemDetailsID = 253; break;
 		case 2217: // Tool Kit (Tinker's tools)
 			itemDetailsID = 213; break;
+		case 2218: // Fletcher's Tools
+			itemDetailsID = 214; break;
 		// Page 3 - Parts
 		case 2300: // Barrel Hoops
 			itemDetailsID = 224; break;

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -4,6 +4,7 @@
 	Added dyes to alchemist shoplist (items/shoplist.dfn) (Xuri)
 	Removed old hair dye menu from legacy gump DFN (dfndata/misc/gumps.dfn) (Xuri)
 	Selling items to NPC shopkeepers now relies on sectionID of items instead of their ID/Type/Morex values (Xuri)
+	Tinkerers can now craft Fletching Tools (Dragon Slayer)
 
 08/11/2022 - Dragon Slayer/ldilley
 	Added item definition (misc/consumables.dfn), JS script (item/hairdye.js) and dictionary entries for hair dye