+ itemGump.AddHTMLGump( 170, 80, 250, 18, false, false, "" + GetDictionaryEntry( 10003, socket.language ) + "" ); // Success Chance:
if( GetServerSetting( "RankSystem" ))
{
- itemGump.AddHTMLGump( 170, 100, 250, 18, 0, 0, "" + GetDictionaryEntry( 10004, socket.language ) + "" ); // Exceptional Chance:
+ itemGump.AddHTMLGump( 170, 100, 250, 18, false, false, "" + GetDictionaryEntry( 10004, socket.language ) + "" ); // Exceptional Chance:
}
itemGump.AddButton( 15, 387, 0xfa5, 1, 0, 1 );
- itemGump.AddHTMLGump( 50, 390, 150, 18, 0, 0, "" + GetDictionaryEntry( 10005, socket.language ) + "" ); // BACK
- itemGump.AddHTMLGump( 170, ( 302 + 20 ), 310, 18, 0, 0, "" + GetDictionaryEntry( 10006, socket.language ) + "" ); // * The item retains the color of this material
+ itemGump.AddHTMLGump( 50, 390, 150, 18, false, false, "" + GetDictionaryEntry( 10005, socket.language ) + "" ); // BACK
+ itemGump.AddHTMLGump( 170, ( 302 + 20 ), 310, 18, false, false, "" + GetDictionaryEntry( 10006, socket.language ) + "" ); // * The item retains the color of this material
itemGump.AddText( 500, 219, textHue, "*" );
}
@@ -1957,7 +425,7 @@ function onGumpPress( pSock, pButton, gumpData )
return;
var bItem = pSock.tempObj;
- var gumpID = scriptID + 0xffff;
+ var gumpID = itemDetailID + 0xffff;
switch( pButton )
{
case 0:
@@ -2090,7 +558,7 @@ function onGumpPress( pSock, pButton, gumpData )
break;
}
break;
- case 8: // Cartography
+ case 8: // Cartography
pUser.SetTempTag( "ITEMDETAILS", null );
pSock.CloseGump( gumpID, 0 );
switch( pUser.GetTempTag( "page" ))
@@ -2111,9 +579,48 @@ function onGumpPress( pSock, pButton, gumpData )
TriggerEvent( Glassblowing, "PageX", pSock, pUser, pUser.GetTempTag( "page" ));
break;
default: TriggerEvent( Glassblowing, "PageX", pSock, pUser, 1 );
- break;
- }
- break;
+ }
+ break;
+ case 10: // masonry
+ pUser.SetTempTag( "ITEMDETAILS", null )
+ pSock.CloseGump( gumpID, 0 );
+ switch( pUser.GetTempTag("page" ))
+ {
+ case 1: // Page 1
+ case 2: // Page 2
+ case 3: // Page 3
+ case 4: // Page 4
+ case 5: // Page 5
+ case 6: // Page 6
+ case 7: // Page 7
+ case 8: // Page 8
+ case 9: // Page 9
+ TriggerEvent( Masonry, "PageX", pSock, pUser, pUser.GetTempTag( "page" ));
+ break;
+ default: TriggerEvent( Masonry, "PageX", pSock, pUser, 1 );
+ break;
+ }
+ break;
+ case 100: // Custom Craft
+ pUser.SetTempTag( "ITEMDETAILS", null );
+ pSock.CloseGump( gumpID, 0 );
+ TriggerEvent( CustomCraft, "PageX", pSock, pUser, pUser.GetTempTag( "page" ) || 1 );
+ break;
}
}
}
+
+function HasLearnedRecipe( pUser, recipeID )
+{
+ var myData = TriggerEvent( 4022, "ReadRecipeID", pUser );
+ if( !myData || myData.length == 0 )
+ return false;
+
+ for( var i = 0; i < myData.length; i++ )
+ {
+ var data = myData[i].split( "," );
+ if( data[0] == recipeID )
+ return true;
+ }
+ return false;
+}
\ No newline at end of file
diff --git a/data/js/skill/craft/masonry.js b/data/js/skill/craft/masonry.js
new file mode 100644
index 000000000..a97b9e7f9
--- /dev/null
+++ b/data/js/skill/craft/masonry.js
@@ -0,0 +1,1106 @@
+///
+// @ts-check
+const textHue = 0x480; // Color of the text.
+const masonryID = 4037; // Script ID used to identify and close this gump
+const gumpDelay = 2000; // Timer for the gump to reappear after crafting.
+const ingotDelay = 200; // Timer for the gump to reappear after selecting an ingot.
+const repairDelay = 200; // Timer for the gump to reappear after repairing an item
+const craftGumpID = 4027;
+const itemDetailsScriptID = 4026;
+
+const itemsPerPage = 10; // Number of craftable items shown per gump subpage
+const displayUnlearnedRecipes = true; // Show recipes player has not learned (if we add any later)
+const coreShardEra = EraStringToNum( GetServerSetting( "CoreShardEra" ));
+
+// If enabled, players can craft coloured variants of weapons, though unless the craftItems array
+// is updated with specific create entries for the coloured weapon variants, they will just be
+// regular weapons with granite colour applied
+const allowColouredWeapons = GetServerSetting( "CraftColouredWeapons" );
+const allowColouredBuildings = false; // Set to true if you want coloured stone walls, stairs, floors
+
+const craftMapRegistryID = 4038;
+var MasonryMap = {};
+var craftItems = [];
+
+/** @type { () => boolean } */
+function LoadMasonryMap()
+{
+ MasonryMap = {};
+ craftItems = [];
+
+ var masonryEntries = TriggerEvent( craftMapRegistryID, "CraftMapRegistry", "masonry" );
+
+ if( !masonryEntries || !IsMasonryArrayValue( masonryEntries ) )
+ {
+ Console.Warning( "Masonry: Unable to load masonry craft map data." );
+ return false;
+ }
+
+ for( var i = 0; i < masonryEntries.length; i++ )
+ {
+ var entry = masonryEntries[i];
+
+ if( !entry || typeof entry.buttonID == "undefined" )
+ continue;
+
+ if( entry.skill === undefined )
+ entry.skill = 11;
+
+ MasonryMap[entry.buttonID] = entry;
+ }
+
+ Console.Print( "Masonry: Loaded " + masonryEntries.length + " craft map entries.\n" );
+ return true;
+}
+
+/** @type { ( value: any ) => boolean } */
+function IsMasonryArrayValue( value )
+{
+ return Object.prototype.toString.call( value ) == "[object Array]";
+}
+
+function PageX( socket, pUser, pageNum )
+{
+ if( !ValidateObject( pUser ))
+ return;
+
+ if( !MasonryMap || Object.keys( MasonryMap ).length == 0 )
+ {
+ if( !LoadMasonryMap() )
+ {
+ socket.SysMessage( "Masonry craft map failed to load." );
+ return;
+ }
+ }
+
+ // Pages 1 - 9: normal crafting pages
+ // Page 999: optional "Last Ten Blacksmith" (if you decide to use it later)
+
+ var subPage = pUser.GetTempTag( "subPage" );
+ var pageItems = [];
+
+ if( pageNum == 999 )
+ {
+ var lastTenRaw = pUser.GetTempTag( "LastTenMasonry" ) || "";
+ var split = lastTenRaw.split( "," );
+ for( var i = 0; i < split.length; i++ )
+ {
+ var val = parseInt( split[i] );
+ if( !isNaN( val ) && MasonryMap[val] )
+ pageItems.push( val ); // here val is the buttonID itself
+ }
+ }
+ else
+ {
+ // Build list of buttonIDs for this page from MasonryMap
+ for( var buttonID in MasonryMap )
+ {
+ var data = MasonryMap[buttonID];
+ if( data.page == pageNum && eraOK( data ))
+ {
+ // If we later add recipes and want to hide unknown ones:
+ var needsRecipe = data.recipeID;
+ var showAll = displayUnlearnedRecipes;
+ if( !needsRecipe || showAll || HasLearnedRecipe( pUser, needsRecipe ))
+ {
+ pageItems.push( parseInt( buttonID ) );
+ }
+ }
+ }
+
+ // Sort by buttonID to keep consistent ordering
+ pageItems.sort( function( a, b ){ return a - b; } );
+ }
+
+ if( pageItems.length == 0 )
+ {
+ var emptyGump = new Gump;
+ TriggerEvent( craftGumpID, "CraftingGumpMenu", emptyGump, socket );
+ emptyGump.AddPage( 1 );
+ emptyGump.AddText( 220, 60, textHue, "No items available on this page." );
+ emptyGump.Send( socket );
+ emptyGump.Free();
+ return;
+ }
+
+ var totalSubPages = Math.ceil( pageItems.length / itemsPerPage );
+
+ if( subPage < 1 )
+ subPage = 1;
+ if( subPage > totalSubPages )
+ subPage = totalSubPages;
+
+ pUser.SetTempTag( "page", pageNum );
+ pUser.SetTempTag( "subPage", subPage );
+
+ var startIndex = ( subPage - 1 ) * itemsPerPage;
+ var endIndex = Math.min( startIndex + itemsPerPage, pageItems.length );
+
+ if( startIndex >= pageItems.length )
+ {
+ subPage = 1;
+ startIndex = 0;
+ endIndex = Math.min( itemsPerPage, pageItems.length );
+ pUser.SetTempTag( "subPage", subPage );
+ }
+
+ var resourceHue = pUser.GetTempTag( "resourceHue" );
+ var blacksmithMenu = new Gump;
+ TriggerEvent( craftGumpID, "CraftingGumpMenu", blacksmithMenu, socket );
+ blacksmithMenu.AddPage( 1 );
+
+ var drawIndex = 0;
+
+ for( var i = startIndex; i < endIndex; i++ )
+ {
+ var buttonID = pageItems[i];
+ var data = MasonryMap[buttonID];
+
+ // Do not show weapons when colored granited ingots selected and colored granited weapons are disabled
+ if( !allowColouredWeapons && resourceHue > 0 && data.page == 6 )
+ continue;
+
+ // Do not show walls when colored granited ingots selected and colored granited walls are disabled
+ if( !allowColouredBuildings && resourceHue > 0 && data.page > 6 )
+ continue;
+
+ var entryText = "";
+ if( data.customName )
+ {
+ entryText = data.customName;
+ }
+ else if( data.dictID )
+ {
+ entryText = GetDictionaryEntry( data.dictID, socket.language );
+ if( !entryText || entryText === "" )
+ entryText = "[Missing EntryID: " + data.dictID + "]";
+ }
+ else
+ {
+ entryText = "[Unnamed Item: " + buttonID + "]";
+ }
+
+ // Same layout as tailoring: button, text, details button
+ blacksmithMenu.AddButton( 220, 60 + ( drawIndex * 20 ), 4005, 4007, 1, 0, buttonID );
+ blacksmithMenu.AddText( 255, 60 + ( drawIndex * 20 ), textHue, entryText );
+ blacksmithMenu.AddButton( 480, 60 + ( drawIndex * 20 ), 4011, 4012, 1, 0, 2000 + buttonID );
+
+ drawIndex++;
+ }
+
+ // Prev subpage
+ if( subPage > 1 )
+ {
+ blacksmithMenu.AddButton( 220, 260, 4014, 4015, 1, 0, 8000 + ( subPage - 1 ));
+ blacksmithMenu.AddHTMLGump( 255, 263, 100, 18, 0, 0,
+ "" + GetDictionaryEntry( 10101, socket.language ) + "" );
+ }
+
+ // Next subpage
+ if( subPage < totalSubPages )
+ {
+ blacksmithMenu.AddButton( 370, 260, 4005, 4007, 1, 0, 9000 + ( subPage + 1 ));
+ blacksmithMenu.AddHTMLGump( 405, 263, 100, 18, 0, 0,
+ "" + GetDictionaryEntry( 10100, socket.language ) + "" );
+ }
+
+ blacksmithMenu.Send( socket );
+ blacksmithMenu.Free();
+}
+
+function Page20( socket, pUser )
+{
+ //granite Choices
+ var myGump = new Gump;
+ pUser.SetTempTag( "page", 20 );
+ TriggerEvent( craftGumpID, "CraftingGumpMenu", myGump, socket );
+ var iron = pUser.ResourceCount( 0x1779 );
+ var bronze = pUser.ResourceCount( 0x1779, 0x06d6 );
+ var copper = pUser.ResourceCount( 0x1779, 0x07dd );
+ var agapite = pUser.ResourceCount( 0x1779, 0x0979 );
+ var dullcopper = pUser.ResourceCount( 0x1779, 0x0973 );
+ var gold = pUser.ResourceCount( 0x1779, 0x08a5 );
+ var shadowiron = pUser.ResourceCount( 0x1779, 0x0966 );
+ var valorite = pUser.ResourceCount( 0x1779, 0x08ab );
+ var verite = pUser.ResourceCount( 0x1779, 0x089f );
+ var myPage20 = [
+ GetDictionaryEntry( 14011, socket.language ) + " (" + iron.toString() + ")",
+ GetDictionaryEntry( 14012, socket.language ) + " (" + dullcopper.toString() + ")",
+ GetDictionaryEntry( 14013, socket.language ) + " (" + shadowiron.toString() + ")",
+ GetDictionaryEntry( 14014, socket.language ) + " (" + copper.toString() + ")",
+ GetDictionaryEntry( 14015, socket.language ) + " (" + bronze.toString() + ")",
+ GetDictionaryEntry( 14016, socket.language ) + " (" + gold.toString() + ")",
+ GetDictionaryEntry( 14017, socket.language ) + " (" + agapite.toString() + ")",
+ GetDictionaryEntry( 14018, socket.language ) + " (" + verite.toString() + ")",
+ GetDictionaryEntry( 14019, socket.language ) + " (" + valorite.toString() + ")"
+ ];
+
+ for( var i = 0; i < myPage20.length; i++ )
+ {
+ var index = i % 10;
+ if( index == 0 )
+ {
+ if( i > 0 )
+ {
+ myGump.AddButton( 370, 260, 4005, 4007, 0, ( i / 10 ) + 1, 0 );
+ myGump.AddHTMLGump( 405, 263, 100, 18, 0, 0, "" + GetDictionaryEntry( 10100, socket.language ) + "" );// NEXT PAGE
+ }
+
+ myGump.AddPage(( i / 10 ) + 1 );
+
+ if( i > 0 )
+ {
+ myGump.AddButton( 220, 260, 4014, 4015, 0, i / 10, 0 );
+ myGump.AddHTMLGump( 255, 263, 100, 18, 0, 0, "" + GetDictionaryEntry( 10101, socket.language ) + "" );// PREV PAGE
+ }
+ }
+
+ myGump.AddButton( 220, 60 + ( index * 20), 4005, 4007, 1, 0, 1000 + i );
+ myGump.AddText( 255, 60 + ( index * 20), textHue, myPage20[i] );
+ }
+ myGump.Send( socket );
+ myGump.Free();
+}
+
+function FindNearbyAnvils( pUser, trgItem, pSock )
+{
+ if( !ValidateObject( trgItem ) || !trgItem.isItem )
+ return false;
+
+ return ( trgItem.id == 0x0faf || trgItem.id == 0x0fb0 || trgItem.id == 0x2dd5 || trgItem.id == 0x2dd6 );
+}
+
+function FindNearbyForges( pUser, trgItem, pSock )
+{
+ if( !ValidateObject( trgItem ) || !trgItem.isItem )
+ return false;
+
+ return (( trgItem.id >= 0x197a && trgItem.id <= 0x19a9 ) || trgItem.id == 0x0Fb1 || trgItem.id == 0x2db0 || trgItem.id == 0x2dd8 );
+}
+
+function SmeltTarget( pSock )
+{
+ pSock.CustomTarget( 1, GetDictionaryEntry( 440, pSock.language )); // What item would you like to smelt?
+}
+
+// Armor and weapons can be smelted back into ingots.
+/** @type { ( tSock: Socket, target: Character | Item | null ) => void } */
+function onCallback1( pSock, ourObj )
+{
+ // Smelt item, get ingots in return
+ var mChar = pSock.currentChar;
+
+ if( !ValidateObject( ourObj ) || !ourObj.isItem )
+ {
+ // Targeted object is not an item that can be smelted
+ mChar.SetTempTag( "prevActionResult", "CANTSMELT" );
+ mChar.StartTimer( ingotDelay, 1, true );
+ return;
+ }
+
+ var nearbyAnvil = AreaItemFunction( "FindNearbyAnvils", mChar, 3, pSock );
+ var nearbyForge = AreaItemFunction( "FindNearbyForges", mChar, 3, pSock );
+ if( nearbyForge == 0 || nearbyAnvil == 0)
+ {
+ // No forge nearby
+ mChar.SetTempTag( "prevActionResult", "NOFORGEORANVIL" );
+ mChar.StartTimer( ingotDelay, 1, true );
+ return;
+ }
+
+ var creatorSerial = ourObj.creator;
+ var entryMadeFrom = ourObj.entryMadeFrom;
+ var createEntry;
+ if( entryMadeFrom != null && entryMadeFrom != 0 )
+ {
+ createEntry = CreateEntries[entryMadeFrom];
+ }
+ if( createEntry != null && createEntry.id != ourObj.id )
+ {
+ createEntry = null;
+ }
+
+ var resourceName = "granite";
+ var resourceAmount = 0;
+ var maxResourceAmount = 1;
+ var resourceHue = ourObj.colour;
+
+ if( creatorSerial == -1 || entryMadeFrom == 0 || createEntry == null )
+ {
+ // Not a player-crafted item, return 1 ingot if item is made of metal
+ var materialType = TriggerEvent( 2506, "GetItemMaterialType", ourObj );
+ if( materialType == "metal" )
+ {
+ resourceAmount = 1;
+ }
+ }
+ else
+ {
+ if( createEntry.avgMinSkill > mChar.skills.mining )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "NOSMELTSKILL" );
+ mChar.StartTimer( gumpDelay, 1, true );
+ return;
+ }
+
+ // Loop through resources used to craft item, see how many ingots were used
+ var resourcesUsed = createEntry.resources;
+ for( var i = 0; i < resourcesUsed.length; i++ )
+ {
+ var resource = resourcesUsed[i];
+ var amountNeeded = resource[0];
+ var colorNeeded = resource[1];
+ var resourceIDs = resource[2];
+
+ // Loop through list of resourceIDs that were valid for crafting this item, see if ANY
+ // were a match for the resource we're trying to return
+ for( var j = 0; j <= resourceIDs.length; j++ )
+ {
+ // If both resource needed matches up, and resource color matches up, go for it
+ if( resourceIDs[j] == 0x1bf2 && colorNeeded == resourceHue )
+ {
+ maxResourceAmount = amountNeeded;
+ break;
+ }
+ }
+ }
+
+ if( maxResourceAmount > 1 )
+ {
+ // Calculate amount of resources returned based on player's mining skill, item's wear and tear,
+ // and amount of resources that went into making the item in the first place
+ if ( ourObj.health >= 1 || ourObj.usesLeft >= 1 )
+ {
+ var healthPercentage = 0;
+ if( ourObj.health >= 1 )
+ {
+ healthPercentage = Math.floor( ( ourObj.health * 100) / ourObj.maxhp );
+ }
+
+ var usesPercentage = 0;
+ if( ourObj.usesLeft >= 1 )
+ {
+ usesPercentage = Math.floor( ( ourObj.usesLeft * 100 ) / ourObj.maxUses );
+ }
+
+ var itemPercentage = usesPercentage > 0 ? Math.min( healthPercentage, usesPercentage ) : healthPercentage;
+
+ resourceAmount = Math.floor( ( maxResourceAmount * itemPercentage ) / 100 );
+ }
+
+ // Halve the amount of resources returned
+ resourceAmount = Math.max( Math.floor( resourceAmount / 2 ), 1 );
+
+ // Fetch player's Mining skill
+ var playerSkill = mChar.skills.mining;
+
+ // Based on player's Mining skill, return between 1 to maxResourceAmount
+ resourceAmount = Math.min( Math.max( Math.floor( resourceAmount * ( playerSkill / 1000 )), 1 ), resourceAmount );
+ }
+ else
+ {
+ resourceAmount = 1;
+ }
+ }
+
+ if( resourceAmount == 0 )
+ {
+ // Targeted object is not an item that can be smelted
+ mChar.SetTempTag( "prevActionResult", "CANTSMELT" );
+ mChar.StartTimer( ingotDelay, 1, true );
+ return;
+ }
+
+ if( ourObj.isDyeable )
+ {
+ // Dyeable items should return regular iron ingots
+ resourceHue = 0;
+ }
+
+ switch( resourceHue )
+ {
+ case 0: // Iron granite
+ default:
+ break;
+ case 0x0973: // Dull Copper
+ resourceName = "dull copper granite";
+ break;
+ case 0x0966: // Shadow Iron
+ resourceName = "shadow iron granite";
+ break;
+ case 0x07dd: // Copper
+ resourceName = "copper granite";
+ break;
+ case 0x06d6: // Bronze
+ resourceName = "bronze granite";
+ break;
+ case 0x08a5: // Gold
+ resourceName = "gold granite";
+ break;
+ case 0x0979: // Agapite
+ resourceName = "agapite granite";
+ break;
+ case 0x089f: // Verite
+ resourceName = "verite granite";
+ break;
+ case 0x08ab: // Valorite
+ resourceName = "valorite granite";
+ break;
+ }
+
+ // Delete the melted item
+ ourObj.Delete();
+
+ // Run a generic skill check to give player a chance to increase their mining skill
+ mChar.CheckSkill( 45, 0, mChar.skillCaps.mining );
+
+ var newResource = CreateDFNItem( pSock, mChar, "0x1779", resourceAmount, "ITEM", true, resourceHue );
+ newResource.name = resourceName;
+
+ mChar.SetTempTag( "ingotsFromSmelting", resourceAmount );
+ mChar.SetTempTag( "prevActionResult", "SMELTITEMSUCCESS" );
+ mChar.StartTimer( gumpDelay, 1, true );
+}
+
+function RepairTarget( pSock )
+{
+ pSock.CustomTarget( 2, GetDictionaryEntry( 485, pSock.language )); // What item would you like to repair?
+}
+
+/** @type { ( tSock: Socket, target: Character | Item | null ) => void } */
+function onCallback2( pSock, ourObj )
+{
+ // Repair Item
+ var mChar = pSock.currentChar;
+
+ // Don't continue if character is invalid, or worse... dead!
+ if( !ValidateObject( mChar ) || mChar.dead )
+ return;
+
+ var bItem = pSock.tempObj;
+ var anvil = AreaItemFunction( "FindNearbyAnvils", mChar, 3, pSock );
+ var gumpID = masonryID + 0xffff;
+ pSock.tempObj = null;
+
+ if( ValidateObject( mChar ) && mChar.isChar && ValidateObject( bItem ) && bItem.isItem )
+ {
+ if( !ValidateObject( ourObj ) || !ourObj.isItem
+ || TriggerEvent( 2506, "GetItemMaterialType", ourObj ) != "metal"
+ || !CheckTileFlag( ourObj.id, 22 )) // TF_WEARABLE
+ {
+ // Targeted object is not an item that can be repaired
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "CANTREPAIR" );
+ mChar.StartTimer( repairDelay, 1, true );
+ return;
+ }
+
+ if( anvil == 0 )
+ {
+ // No anvil nearby
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "NOANVIL" );
+ mChar.StartTimer( repairDelay, 1, true );
+ return;
+ }
+
+ var itemDurabilityLossEnabled = GetServerSetting( "ItemRepairDurabilityLoss" );
+ var repairID = ourObj.id;
+ var ownerObj = GetPackOwner( ourObj, 0 );
+ if( ownerObj && mChar.serial == ownerObj.serial )
+ {
+ var maxHitpoints = ourObj.maxhp;
+ var currentHitpoints = ourObj.health;
+ if( currentHitpoints < maxHitpoints )
+ {
+ // Get base repair difficulty based on amount of HP missing and max hitpoints
+ var deltaHP = maxHitpoints - currentHitpoints;
+ var repairDifficulty = (( deltaHP / maxHitpoints ) * 1000 );
+ var minDifficulty = repairDifficulty - 250;
+ var skillBonus = 0;
+ var repairSkill = mChar.skills.blacksmithing;
+ if( minDifficulty < 0 )
+ {
+ // If minDifficulty is negative, add the negative value as a bonus to player's skill
+ skillBonus = minDifficulty * -1;
+ minDifficulty = 0;
+ }
+ else if( minDifficulty > repairSkill )
+ {
+ // Player skill below minimum repair difficulty, Too difficult to make the attempt!
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "CANTREPAIR" );
+ mChar.StartTimer( repairDelay, 1, true );
+ return;
+ }
+ var maxDifficulty = Math.min( repairDifficulty + 250, mChar.skillCaps.blacksmithing );
+
+ // Allow repair if random number between min and base difficulty is under player's skill
+ if( RandomNumber( minDifficulty, 1000 ) < ( Math.max( repairSkill + skillBonus, 999 )))
+ {
+ // Give player a chance every now and then to gain skill from repairing
+ if( RandomNumber( 1, 5 ) == 1 )
+ {
+ // Run a skill-check, which might trigger a skill-gain if player passes
+ mChar.CheckSkill( 8, minDifficulty, maxDifficulty ); // Skill 8 = blacksmithing
+ }
+
+ // Reduce object's max durability by 1
+ if( itemDurabilityLossEnabled )
+ {
+ ourObj.maxhp -= 1;
+ }
+
+ // Repair item here
+ ourObj.health = ourObj.maxhp;
+ pSock.SoundEffect( 0x002A, true );
+
+ // Reopen gump after a short delay
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "REPAIRSUCCESS" );
+ mChar.StartTimer( repairDelay, 1, true );
+
+ // GM skill (100.0 skillpoints)
+ // Item with 51 HP max
+ // item with 2 hp left - 99.65% chance to repair
+ // item with 25 hp left - 99.86% chance to repair
+ // item with 40 hp left - 99.9% chance to repair
+
+ // Expert Smith (71.5 skill points)
+ // Item with 51 HP max
+ // item with 2 hp left - 1.45% chance to repair
+ // item with 25 hp left - 61.49% chance to repair
+ // item with 40 hp left - 74.9% chance to repair
+ // item with 48 hp left - 90.6% chance to repair
+
+ // Apprentice Smith (51.5 skill points)
+ // Item with 51 HP max
+ // item with 2 hp left - 0% chance to repair
+ // item with 25 hp left - 34.5% chance to repair
+ // item with 40 hp left - 54.9% chance to repair
+ // item with 48 hp left - 70.6% chance to repair
+ }
+ else
+ {
+ // Failed to repair item - decrease item health!
+ if( repairSkill >= 1000 ) // GM Smith
+ {
+ ourObj.health -= 1;
+ }
+ else if( repairSkill >= 715 ) // Expert Smith
+ {
+ ourObj.health -= 2;
+ }
+ else // Below Expert Smith
+ {
+ ourObj.health -= 3;
+ }
+
+ if( ourObj.health <= 0 )
+ {
+ // Item has been destroyed!
+ pSock.SysMessage( GetDictionaryEntry( 311, pSock.language ).replace(/%s/gi, ourObj.name )); // Your %s has been destroyed.
+ ourObj.Delete();
+ }
+
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "FAILREPAIR" );
+ mChar.StartTimer( repairDelay, 1, true );
+ }
+ }
+ else
+ {
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "FULLREPAIR" );
+ mChar.StartTimer( repairDelay, 1, true );
+ }
+ }
+ else
+ {
+ pSock.tempObj = bItem;
+ pSock.CloseGump( gumpID, 0 );
+ mChar.SetTempTag( "prevActionResult", "CHECKPACK" );
+ mChar.StartTimer( repairDelay, 1, true );
+ }
+ }
+}
+
+/** @type { ( tObject: BaseObject, timerId: number ) => void } */
+function onTimer( pUser, timerID )
+{
+ if( !ValidateObject( pUser ))
+ return;
+
+ var socket = pUser.socket;
+
+ if( timerID >= 1 && timerID <= 9 )
+ {
+ PageX( socket, pUser, timerID ); // Pages 1 - 9
+ }
+ else if( timerID == 20 )
+ {
+ Page20( socket, pUser ); // Ingot selection
+ }
+ else if( timerID == 999 )
+ {
+ PageX( socket, pUser, 999 ); // Last Ten Blacksmith (if used)
+ }
+}
+
+
+/** @type { ( myObj: Socket, pressed: number, gump: GumpData ) => void } */
+function onGumpPress( pSock, pButton, gumpData )
+{
+ var pUser = pSock.currentChar;
+ var usedMakeLast = false;
+
+ if( !ValidateObject( pUser ) || pUser.dead )
+ return;
+
+ var bItem = pSock.tempObj;
+ if( !ValidateObject( bItem ) || !pUser.InRange( bItem, 3 ))
+ {
+ pSock.SysMessage( GetDictionaryEntry( 461, pSock.language )); // You are too far away.
+ return;
+ }
+
+ if( bItem.movable == 3 )
+ {
+ pSock.SysMessage( GetDictionaryEntry( 6031, pSock.language )); // Locked down resources cannot be used!
+ return;
+ }
+
+ var iPackOwner = GetPackOwner( bItem, 0 );
+ if( ValidateObject( iPackOwner ))
+ {
+ if( iPackOwner.serial != pUser.serial )
+ {
+ pSock.SysMessage( GetDictionaryEntry( 6032, pSock.language )); // That resource is in someone else's backpack!
+ return;
+ }
+ }
+ else
+ {
+ pSock.SysMessage( GetDictionaryEntry( 6022, pSock.language )); // This has to be in your backpack befgranite you can use it.
+ return;
+ }
+
+ var gumpID = masonryID + 0xffff;
+
+ // Close / Exit
+ if( pButton == 0 )
+ {
+ pUser.SetTempTag( "prevActionResult", null );
+ pUser.SetTempTag( "MAKELAST", null );
+ pSock.CloseGump( gumpID, 0 );
+ return;
+ }
+
+ // Repair Item
+ if( pButton == 49 )
+ {
+ RepairTarget( pSock );
+ return;
+ }
+
+ // Select Materials (ingots)
+ if( pButton == 50 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ Page20( pSock, pUser );
+ return;
+ }
+
+ // Smelt Item
+ if( pButton == 52 )
+ {
+ SmeltTarget( pSock );
+ return;
+ }
+
+ // Page buttons (1..9)
+ if( pButton >= 1 && pButton <= 9 )
+ {
+ pUser.SetTempTag( "page", pButton );
+ pUser.SetTempTag( "subPage", 1 );
+ pSock.CloseGump( gumpID, 0 );
+ PageX( pSock, pUser, pButton );
+ return;
+ }
+
+ // Last Ten page (if you wire it into the gump)
+ if( pButton == 11000 )
+ {
+ pUser.SetTempTag( "page", 999 );
+ pUser.SetTempTag( "subPage", 1 );
+ PageX( pSock, pUser, 999 );
+ return;
+ }
+
+ // Subpage navigation (8000 = prev, 9000 = next)
+ if( pButton >= 8000 && pButton < 9000 )
+ {
+ var prevSub = pButton - 8000;
+ var curPage = pUser.GetTempTag( "page" );
+ pUser.SetTempTag( "subPage", prevSub );
+ PageX( pSock, pUser, curPage );
+ return;
+ }
+
+ if( pButton >= 9000 && pButton < 10000 )
+ {
+ var nextSub = pButton - 9000;
+ var curPage2 = pUser.GetTempTag( "page" );
+ pUser.SetTempTag( "subPage", nextSub );
+ PageX( pSock, pUser, curPage2 );
+ return;
+ }
+
+ // Handle "Make Last"
+ if(( pButton >= 100 && pButton <= 998 ) || pButton == 5000 )
+ {
+ if( pButton == 5000 )
+ {
+ pButton = pUser.GetTempTag( "MAKELAST" );
+ usedMakeLast = true;
+ }
+ else
+ {
+ pUser.SetTempTag( "MAKELAST", pButton );
+ }
+ }
+
+ // Item detail buttons (2000 + buttonID)
+ if( pButton >= 2000 && pButton < 3000 )
+ {
+ var detailButtonID = pButton - 2000;
+ var entry = MasonryMap[detailButtonID];
+ if( entry )
+ {
+ // For details we just pass the granite version (granite index 0) to 4026
+ var graniteMakeID = entry.graniteMake[0];
+ if( graniteMakeID > 0 )
+ {
+ // Masonry uses Carpentry skill
+ pUser.SetTempTag( "Skill", entry.skill | 0 );
+
+ // Clear old harvests
+ pUser.SetTempTag( "Harvest", null );
+ pUser.SetTempTag( "Harvest2", null );
+ pUser.SetTempTag( "Harvest3", null );
+ pUser.SetTempTag( "Harvest4", null );
+
+ // Clear old harvest names
+ pUser.SetTempTag( "HarvestName", null );
+ pUser.SetTempTag( "Harvest2Name", null );
+ pUser.SetTempTag( "Harvest3Name", null );
+ pUser.SetTempTag( "Harvest4Name", null );
+
+ if( entry.harvest && entry.harvest.length > 0 )
+ {
+ if( entry.harvest.length >= 1 )
+ pUser.SetTempTag( "Harvest", entry.harvest[0] );
+ if( entry.harvest.length >= 2 )
+ pUser.SetTempTag( "Harvest2", entry.harvest[1] );
+ if( entry.harvest.length >= 3 )
+ pUser.SetTempTag( "Harvest3", entry.harvest[2] );
+ if( entry.harvest.length >= 4 )
+ pUser.SetTempTag( "Harvest4", entry.harvest[3] );
+ }
+
+ // OPTIONAL custom names – these override the dictionary string
+ if( entry.harvestNames && entry.harvestNames.length > 0 )
+ {
+ if( entry.harvestNames.length >= 1 )
+ pUser.SetTempTag( "HarvestName", entry.harvestNames[0] );
+ if( entry.harvestNames.length >= 2 )
+ pUser.SetTempTag( "Harvest2Name", entry.harvestNames[1] );
+ if( entry.harvestNames.length >= 3 )
+ pUser.SetTempTag( "Harvest3Name", entry.harvestNames[2] );
+ if( entry.harvestNames.length >= 4 )
+ pUser.SetTempTag( "Harvest4Name", entry.harvestNames[3] );
+ }
+
+ if( entry.recipeID && entry.recipeID > 0 )
+ pUser.SetTempTag( "needRecipeID", entry.recipeID );
+ else
+ pUser.SetTempTag( "needRecipeID", 0 );
+
+ pUser.SetTempTag( "ITEMDETAILS", graniteMakeID );
+ TriggerEvent( itemDetailsScriptID, "ItemDetailGump", pUser );
+ }
+ }
+ return;
+ }
+
+ // If this is a craft button in our map:
+ if( MasonryMap[pButton] != undefined )
+ {
+ var entry2 = MasonryMap[pButton];
+ var graniteID = pUser.GetTempTag( "Granite" );
+ var resourceHue = pUser.GetTempTag( "resourceHue" );
+
+ // Ensure graniteID within range
+ if( graniteID < 0 || graniteID >= entry2.graniteMake.length )
+ graniteID = 0;
+
+ // Era / recipe gating
+ if( !eraOK( entry2 ))
+ {
+ pSock.SysMessage( "That item is not available in this era." );
+ return;
+ }
+
+ if( entry2.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, entry2.recipeID ))
+ {
+ pSock.SysMessage( "You must learn that recipe from a scroll." );
+ return;
+ }
+
+ // No colored granited weapons if disabled and using non-iron ingots
+ if( !allowColouredWeapons && resourceHue > 0 && entry2.page > 3 )
+ {
+ pSock.SysMessage( "You cannot use colored granited ingots for weapons on this shard." );
+ return;
+ }
+
+ var makeID = entry2.graniteMake[graniteID];
+ if( !makeID || makeID == 0 )
+ {
+ // Fallback to iron version if for some reason we did not get a specific granite entry
+ makeID = entry2.graniteMake[0];
+ }
+
+ if( !makeID || makeID == 0 )
+ {
+ pSock.SysMessage( "That item is not properly configured." );
+ return;
+ }
+
+ // Runic hammer bonus logic (unchanged from your original)
+ pUser.AddScriptTrigger( 4033 );
+
+ MakeItem( pSock, pUser, makeID, resourceHue );
+
+ // Tool wear
+ var toolUseLimit = GetServerSetting( "ToolUseLimit" );
+ var toolUseBreak = GetServerSetting( "ToolUseBreak" );
+
+ var runicHammer = pUser.FindItemLayer( 0x01 ); // Right Hand
+ if( ValidateObject( runicHammer ) && runicHammer.GetTag( "runicHammer" ) && runicHammer.usesLeft > 0 )
+ {
+ pUser.SetTempTag( "usedRunicHammer", true );
+ pUser.SetTempTag( "runicHammerType", runicHammer.color );
+
+ if( toolUseLimit && runicHammer != bItem )
+ {
+ runicHammer.usesLeft -= 1;
+ if( runicHammer.usesLeft == 0 && toolUseBreak )
+ {
+ runicHammer.Delete();
+ pSock.SysMessage( GetDictionaryEntry( 10202, pSock.language ));
+ }
+ }
+ }
+
+ if( toolUseLimit )
+ {
+ bItem.usesLeft -= 1;
+ if( bItem.usesLeft == 0 && toolUseBreak )
+ {
+ bItem.Delete();
+ pSock.SysMessage( GetDictionaryEntry( 10202, pSock.language ));
+ }
+ }
+
+ // Track in last ten list for blacksmith
+ AddToLastTenmMasonry( pUser, pButton );
+
+ // Reopen page after delay
+ pUser.StartTimer( gumpDelay, entry2.timerID, true );
+ return;
+ }
+
+ // Granite selection buttons (Page20)
+ if( pButton >= 1000 && pButton <= 1008 )
+ {
+ var index = pButton - 1000; // 0..8
+ var newGraniteID = index;
+ var newResourceHue = 0;
+
+ // Optional: use Mining skill gating like ingots
+ var miningSkill = pUser.skills.mining | 0;
+
+ switch( index )
+ {
+ case 0: // Iron
+ newResourceHue = 0;
+ break;
+
+ case 1: // Dull Copper
+ if( miningSkill < 650 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x0973;
+ break;
+
+ case 2: // Shadow Iron
+ if( miningSkill < 700 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x0966;
+ break;
+
+ case 3: // Copper
+ if( miningSkill < 750 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x07dd;
+ break;
+
+ case 4: // Bronze
+ if( miningSkill < 800 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x06d6;
+ break;
+
+ case 5: // Gold
+ if( miningSkill < 850 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x08a5;
+ break;
+
+ case 6: // Agapite
+ if( miningSkill < 900 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x0979;
+ break;
+
+ case 7: // Verite
+ if( miningSkill < 950 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x089f;
+ break;
+
+ case 8: // Valorite
+ if( miningSkill < 990 )
+ {
+ pSock.CloseGump( gumpID, 0 );
+ pUser.StartTimer( ingotDelay, 20, true );
+ pUser.SetTempTag( "prevActionResult", "FAILED" );
+ return;
+ }
+ newResourceHue = 0x08ab;
+ break;
+ }
+
+ // Store selection
+ pUser.SetTempTag( "Granite", newGraniteID );
+ pUser.SetTempTag( "resourceHue", newResourceHue );
+ pUser.SetTempTag( "prevActionResult", null );
+ pUser.SetTempTag( "MAKELAST", null );
+
+ // Close the material select gump
+ pSock.CloseGump( gumpID, 0 );
+
+ // Go back to the last craft page, or default to page 1
+ var curPage = pUser.GetTempTag( "page" );
+ if( !curPage || curPage == 20 )
+ curPage = 1;
+
+ pUser.SetTempTag( "page", curPage );
+ pUser.SetTempTag( "subPage", 1 );
+ PageX( pSock, pUser, curPage );
+ return;
+ }
+}
+
+function AddToLastTenmMasonry( pUser, buttonID )
+{
+ var raw = pUser.GetTempTag( "LastTenMasonry" ) || "";
+ var list = raw.split( "," );
+
+ // Remove if already in list
+ for( var i = 0; i < list.length; i++ )
+ {
+ if( parseInt( list[i] ) == buttonID )
+ {
+ list.splice( i, 1 );
+ break;
+ }
+ }
+
+ var newList = [buttonID];
+ for( var j = 0; j < list.length && newList.length < 10; j++ )
+ {
+ var entry = parseInt( list[j] );
+ if( !isNaN( entry ) && entry > 0 )
+ newList.push( entry );
+ }
+
+ pUser.SetTempTag( "LastTenMasonry", newList.join( "," ) );
+}
+
+function HasLearnedRecipe( pUser, recipeID )
+{
+ var myData = TriggerEvent( 4022, "ReadRecipeID", pUser );
+ if( !myData || myData.length == 0 )
+ return false;
+
+ for( var i = 0; i < myData.length; i++ )
+ {
+ var data = myData[i].split( "," );
+ if( data[0] == recipeID )
+ return true;
+ }
+ return false;
+}
+
+function eraOK( entry )
+{
+ // Optional per-entry gates. Strings like "lbr","aos","ml","sa","hs","tol".
+ // If not present, the entry is valid for all eras.
+ if( entry.minEra && coreShardEra < EraStringToNum( entry.minEra ))
+ return false;
+ if( entry.maxEra && coreShardEra > EraStringToNum( entry.maxEra ))
+ return false;
+ return true;
+}
\ No newline at end of file
diff --git a/data/js/skill/craft/recipe_data.js b/data/js/skill/craft/recipe_data.js
index 2cb20aeb2..fde1c2d01 100644
--- a/data/js/skill/craft/recipe_data.js
+++ b/data/js/skill/craft/recipe_data.js
@@ -6,7 +6,7 @@ function AddRecipe( pUser, iUsed, recipeID, recipeSectionID )
// Read Recipe
var myData = ReadRecipeID( pUser );
- for( let i = 0; i < myData.length; i++ )
+ for( var i = 0; i < myData.length; i++ )
{
var myRecipeData = myData[i].split(",");
@@ -35,7 +35,7 @@ function NeedRecipe( pSock, recipeID )
if( myData && myData.length > 0 )
{
- for( let i = 0; i < myData.length; i++ )
+ for( var i = 0; i < myData.length; i++ )
{
var myRecipeData = myData[i].split(",");
diff --git a/data/js/skill/craft/tailoring.js b/data/js/skill/craft/tailoring.js
index 66cf7874f..f29dcf09f 100644
--- a/data/js/skill/craft/tailoring.js
+++ b/data/js/skill/craft/tailoring.js
@@ -1,194 +1,178 @@
///
// @ts-check
-const textHue = 0x480; // Color hue for all text in the crafting gump
-const scriptID = 4030; // Script ID used to identify and close this gump
-const gumpDelay = 2000; // Delay (ms) before gump reappears after crafting
-const repairDelay = 200; // Delay (ms) before gump reappears after selecting a resource
-const itemDetailsScriptID = 4026; // Script ID used to show item detail tooltips
-const craftGumpID = 4027; // TriggerEvent ID used to build the crafting gump UI
-const itemsPerPage = 10; // Number of craftable items shown per gump subpage
-const displayUnlearnedRecipes = true; // Show recipes player hasn't learned
-const coreShardEra = EraStringToNum( GetServerSetting( "CoreShardEra" ));
-//////////////////////////////////////////////////////////////////////////////////////////
-// UOX3 Tailoring CraftingMap Configuration
-//
-// Description:
-// This file defines the `CraftingMap` used to populate the tailoring crafting gump in UOX3.
-// Each entry links a craftable item (defined in `create/tailoring.dfn`) to its display name,
-// gump page, and crafting behavior. This setup powers the dynamic UI for tailoring.
-//
-// Data Sources:
-// - `makeID` refers to the unique item ID defined in `create/tailoring.dfn`.
-// - `dictID` refers to a localized string entry defined in `dictionaries/dictionary.eng`.
-// - `customName` is an optional hardcoded string that overrides dictionary text if present.
-// - `recipeID` is an optional ID that locks the item behind a learned recipe.
-//
-// Entry Format:
-// makeID: {
-// dictID: , // (Optional) Used for localized names via dictionary.eng
-// customName: "", // (Optional) Overrides dictionary name if present
-// page: , // Gump page to display item on
-// timerID: , // Timer used to re-show gump after crafting
-// recipeID: // (Optional) Requires the player to learn the recipe before crafting
-// }
-//
-// Display Logic:
-// - If `customName` is present, it is used directly in the crafting gump.
-// - If `dictID` is present (and `customName` is not), `GetDictionaryEntry()` is used.
-// - If both are missing, the gump will show a fallback like `[Unnamed Item: ####]`.
-// - The `page` field determines which category tab the item appears under.
-// - If `recipeID` is present and the player has not learned it, the item will either be:
-// - Hidden entirely (default behavior), or
-// - Displayed but uncraftable, depending on `displayUnlearnedRecipes` setting.
-//
-// Example Entries:
-//
-// // Standard item using dictionary ID for localization
-// 130: { dictID: 11415, page: 1, timerID: 1 },
-//
-// // Custom item with hardcoded display name, no dictionary entry required
-// 999: { customName: "harrys sword", page: 1, timerID: 1 },
-//
-// // Recipe-locked item (only craftable if recipe is learned)
-// 185: { dictID: 11469, page: 8, timerID: 8, recipeID: 185 },
-//
-// // Era Gating
-// 130: { dictID: 11415, page: 1, timerID: 1, minEra: "uo" }, // from UO and up
-// 185: { dictID: 11469, page: 8, timerID: 8, recipeID: 185, minEra: "aos" }, // AoS+
-// 169: { dictID: 11454, page: 6, timerID: 6, maxEra: "lbr" }, // up to LBR
-//
-// Organization:
-// - Items are grouped by `page` value (e.g., Hats, Armor, etc.).
-// - The crafting gump dynamically builds its layout from this CraftingMap.
-// - This system supports localized, custom, hybrid, and recipe-locked crafting menus.
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-const CraftingMap = {
- // Hats (Page 1)
- 130: { dictID: 11415, page: 1, timerID: 1 },
- 131: { dictID: 11416, page: 1, timerID: 1 },
- 132: { dictID: 11417, page: 1, timerID: 1 },
- 134: { dictID: 11418, page: 1, timerID: 1 },
- 133: { dictID: 11419, page: 1, timerID: 1 },
- 136: { dictID: 11420, page: 1, timerID: 1 },
- 137: { dictID: 11421, page: 1, timerID: 1 },
- 138: { dictID: 11422, page: 1, timerID: 1 },
- 139: { dictID: 11423, page: 1, timerID: 1 },
- 140: { dictID: 11424, page: 1, timerID: 1 },
- 141: { dictID: 11425, page: 1, timerID: 1 },
- 135: { dictID: 11470, page: 1, timerID: 1 },
-
- // Shirts & Pants (Page 2)
- 142: { dictID: 11426, page: 2, timerID: 2 },
- 143: { dictID: 11427, page: 2, timerID: 2 },
- 144: { dictID: 11428, page: 2, timerID: 2 },
- 145: { dictID: 11429, page: 2, timerID: 2 },
- 146: { dictID: 11430, page: 2, timerID: 2 },
- 147: { dictID: 11431, page: 2, timerID: 2 },
- 148: { dictID: 11432, page: 2, timerID: 2 },
- 149: { dictID: 11433, page: 2, timerID: 2 },
- 150: { dictID: 11434, page: 2, timerID: 2 },
- 151: { dictID: 11435, page: 2, timerID: 2 },
- 180: { dictID: 11436, page: 2, timerID: 2 },
- 152: { dictID: 11437, page: 2, timerID: 2 },
- 153: { dictID: 11438, page: 2, timerID: 2 },
- 154: { dictID: 11439, page: 2, timerID: 2 },
-
- // Misc (Page 3)
- 155: { dictID: 11440, page: 3, timerID: 3 },
- 156: { dictID: 11441, page: 3, timerID: 3 },
- 157: { dictID: 11442, page: 3, timerID: 3 },
- 158: { dictID: 11443, page: 3, timerID: 3 },
-
- // Footwear (Page 4)
- 159: { dictID: 11444, page: 4, timerID: 4 },
- 160: { dictID: 11445, page: 4, timerID: 4 },
- 161: { dictID: 11446, page: 4, timerID: 4 },
- 162: { dictID: 11447, page: 4, timerID: 4 },
-
- // Leather Armor (Page 5)
- 163: { dictID: 11448, page: 5, timerID: 5 },
- 164: { dictID: 11449, page: 5, timerID: 5 },
- 165: { dictID: 11450, page: 5, timerID: 5 },
- 166: { dictID: 11451, page: 5, timerID: 5 },
- 167: { dictID: 11452, page: 5, timerID: 5 },
- 168: { dictID: 11453, page: 5, timerID: 5 },
-
- // Studded Armor (Page 6)
- 169: { dictID: 11454, page: 6, timerID: 6 },
- 170: { dictID: 11455, page: 6, timerID: 6 },
- 171: { dictID: 11456, page: 6, timerID: 6 },
- 172: { dictID: 11457, page: 6, timerID: 6 },
- 173: { dictID: 11458, page: 6, timerID: 6 },
-
- // Female Armor (Page 7)
- 174: { dictID: 11459, page: 7, timerID: 7 },
- 175: { dictID: 11460, page: 7, timerID: 7 },
- 176: { dictID: 11461, page: 7, timerID: 7 },
- 177: { dictID: 11462, page: 7 , timerID: 7},
- 178: { dictID: 11463, page: 7, timerID: 7 },
- 179: { dictID: 11464, page: 7, timerID: 7 },
-
- // Bone Armor (Page 8)
- 181: { dictID: 11465, page: 8, timerID: 8 },
- 182: { dictID: 11466, page: 8, timerID: 8 },
- 183: { dictID: 11467, page: 8, timerID: 8 },
- 184: { dictID: 11468, page: 8, timerID: 8 },
- 185: { dictID: 11469, page: 8, timerID: 8 }
-};
-
-function PageX( socket, pUser, pageNum )
+const textHue = 0x480; // Color hue for all text in the crafting gump
+const tailoringID = 4030; // Script ID used to identify and close this gump
+const gumpDelay = 2000; // Delay (ms) before gump reappears after crafting
+const repairDelay = 200; // Delay (ms) before gump reappears after selecting a resource
+const itemDetailsScriptID = 4026; // Script ID used to show item detail tooltips
+const craftGumpID = 4027; // TriggerEvent ID used to build the crafting gump UI
+const itemsPerPage = 10; // Number of craftable items shown per gump subpage
+const displayUnlearnedRecipes = true; // Show recipes player hasn't learned
+const coreShardEra = EraStringToNum( GetServerSetting( "CoreShardEra" ));
+const tailoringSkillID = 34; // Tailoring skill index
+
+const craftMapRegistryID = 4038;
+var CraftingMap = {};
+
+/** @type { () => boolean } */
+function LoadTailoringMap()
{
- let subPage = pUser.GetTempTag( "subPage" ) || 1;
+ CraftingMap = {};
+
+ var tailoringEntries = TriggerEvent( craftMapRegistryID, "CraftMapRegistry", "tailoring" );
- // Build pages dynamically from CraftingMap
- let myPage = [];
- let dictToMakeID = {}; // local reverse map
+ if( !tailoringEntries || !IsTailoringArrayValue( tailoringEntries ) )
+ {
+ Console.Warning( "Tailoring: Unable to load tailoring craft map data." );
+ return false;
+ }
- for( let makeID in CraftingMap )
+ for( var i = 0; i < tailoringEntries.length; i++ )
{
- let data = CraftingMap[makeID];
- let page = data.page;
- if( !myPage[page - 1] )
- myPage[page - 1] = [];
+ var entry = tailoringEntries[i];
+
+ if( !entry || typeof entry.makeID == "undefined" )
+ continue;
+
+ if( entry.skill === undefined )
+ entry.skill = tailoringSkillID;
+
+ CraftingMap[entry.makeID] = entry;
+ }
+
+ return true;
+}
- let needsRecipe = data.recipeID;
- let showAll = displayUnlearnedRecipes;
+/** @type { ( value: any ) => boolean } */
+function IsTailoringArrayValue( value )
+{
+ return Object.prototype.toString.call( value ) == "[object Array]";
+}
- if( eraOK( data ) && ( !needsRecipe || showAll || HasLearnedRecipe( pUser, needsRecipe )))
+/** @type { ( socket: Socket, pUser: Character, pageNum: number ) => void } */
+function PageX( socket, pUser, pageNum )
+{
+ if( !socket || !ValidateObject( pUser ))
+ return;
+
+ if( !CraftingMap || Object.keys( CraftingMap ).length == 0 )
+ {
+ if( !LoadTailoringMap() )
{
- myPage[page - 1].push( data.dictID );
+ socket.SysMessage( "Tailoring craft map failed to load." );
+ return;
}
-
- dictToMakeID[data.dictID] = parseInt( makeID );
}
- let pageItems;
+ var subPage = pUser.GetTempTag( "subPage" ) || 1;
+ var pageItems;
+ // Last Ten page
if( pageNum == 999 )
{
- let lastTenRaw = pUser.GetTag( "LastTenTailoring" ) || "";
- let split = lastTenRaw.split( "," );
+ var lastTenRaw = pUser.GetTempTag( "LastTenTailoring" ) || "";
+ var split = lastTenRaw.split( "," );
pageItems = [];
for( var i = 0; i < split.length; i++ )
{
- let val = parseInt(split[i]);
+ var val = parseInt( split[i] );
if( !isNaN( val ))
- pageItems.push( val );
+ pageItems.push( val ); // makeID
}
}
else
{
- if( pageNum < 1 || pageNum > myPage.length )
+ // Collect all makeIDs for this page
+ var makeIDs = [];
+ for( var key in CraftingMap )
+ {
+ if( !CraftingMap.hasOwnProperty( key ))
+ continue;
+
+ var makeID = parseInt( key );
+ var data = CraftingMap[makeID];
+ if( !data || data.page != pageNum )
+ continue;
+
+ makeIDs.push( makeID );
+ }
+
+ // Sort by dictID so order matches dictionary sequence
+ makeIDs.sort( function( a, b )
+ {
+ var ea = CraftingMap[a];
+ var eb = CraftingMap[b];
+ if( ea && eb )
+ return ( ea.dictID || 0 ) - ( eb.dictID || 0 );
+ return a - b;
+ });
+
+ // Era / recipe filtering
+ pageItems = [];
+ for( var k = 0; k < makeIDs.length; k++ )
+ {
+ var id = makeIDs[k];
+ var data2 = CraftingMap[id];
+ if( !data2 )
+ continue;
+
+ var needsRecipe = data2.recipeID;
+ var showAll = displayUnlearnedRecipes;
+
+ if( eraOK( data2 ) && ( !needsRecipe || showAll || HasLearnedRecipe( pUser, needsRecipe )) )
+ pageItems.push( id );
+ }
+
+ // Fallback if page empty (and not page 1)
+ if( pageItems.length == 0 && pageNum != 1 )
+ {
pageNum = 1;
- pageItems = myPage[pageNum - 1];
- }
+ makeIDs = [];
+ for( var key2 in CraftingMap )
+ {
+ if( !CraftingMap.hasOwnProperty( key2 ))
+ continue;
+
+ var mid2 = parseInt( key2 );
+ var d3 = CraftingMap[mid2];
+ if( !d3 || d3.page != 1 )
+ continue;
+
+ makeIDs.push( mid2 );
+ }
+
+ makeIDs.sort( function( a, b )
+ {
+ var ea2 = CraftingMap[a];
+ var eb2 = CraftingMap[b];
+ if( ea2 && eb2 )
+ return ( ea2.dictID || 0 ) - ( eb2.dictID || 0 );
+ return a - b;
+ });
+
+ pageItems = [];
+ for( var m = 0; m < makeIDs.length; m++ )
+ {
+ var id2 = makeIDs[m];
+ var data4 = CraftingMap[id2];
+ if( !data4 )
+ continue;
+
+ var needsRecipe2 = data4.recipeID;
+ var showAll2 = displayUnlearnedRecipes;
- let totalSubPages = Math.ceil( pageItems.length / itemsPerPage );
+ if( eraOK( data4 ) && ( !needsRecipe2 || showAll2 || HasLearnedRecipe( pUser, needsRecipe2 )) )
+ pageItems.push( id2 );
+ }
+ }
+ }
+ // Subpage handling
+ var totalSubPages = Math.ceil( pageItems.length / itemsPerPage );
+ if( totalSubPages < 1 )
+ totalSubPages = 1;
if( subPage < 1 )
subPage = 1;
if( subPage > totalSubPages )
@@ -197,108 +181,104 @@ function PageX( socket, pUser, pageNum )
pUser.SetTempTag( "page", pageNum );
pUser.SetTempTag( "subPage", subPage );
- let startIndex = ( subPage - 1 ) * itemsPerPage;
- let endIndex = Math.min( startIndex + itemsPerPage, pageItems.length );
+ var startIndex = ( subPage - 1 ) * itemsPerPage;
+ var endIndex = Math.min( startIndex + itemsPerPage, pageItems.length );
- if( startIndex >= pageItems.length )
+ if( startIndex >= pageItems.length )
{
- subPage = 1;
+ subPage = 1;
startIndex = 0;
- endIndex = Math.min( itemsPerPage, pageItems.length );
+ endIndex = Math.min( itemsPerPage, pageItems.length );
pUser.SetTempTag( "subPage", subPage );
}
- let tailoringMenu = new Gump;
+ var tailoringMenu = new Gump;
TriggerEvent( craftGumpID, "CraftingGumpMenu", tailoringMenu, socket );
tailoringMenu.AddPage( 1 );
- for( let i = startIndex; i < endIndex; i++)
+ for( var j = startIndex; j < endIndex; j++ )
{
- let index = i - startIndex;
- let makeID, entryID, entryText, buttonID;
+ var index = j - startIndex;
+ var makeID = pageItems[j];
+ var entryText;
+ var buttonID = makeID; // craft button uses makeID directly
+ var data5 = CraftingMap[makeID];
- if( pageNum == 999 )
+ if( !data5 )
{
- makeID = pageItems[i];
+ entryText = "[Missing MakeID: " + makeID + "]";
}
else
{
- entryID = pageItems[i];
- makeID = dictToMakeID[entryID];
+ if( data5.customName )
+ {
+ entryText = data5.customName;
+ }
+ else if( data5.dictID )
+ {
+ entryText = GetDictionaryEntry( data5.dictID, socket.language );
+ if( !entryText || entryText === "" )
+ entryText = "[Missing EntryID: " + data5.dictID + "]";
+ }
+ else
+ {
+ entryText = "[Unnamed Item: " + makeID + "]";
+ }
}
- let data = CraftingMap[makeID];
-
- if( !data )
- {
- entryText = "[Missing MakeID: " + makeID + "]";
- buttonID = makeID;
- }
- else
- {
- buttonID = makeID;
-
- if( data.customName )
- {
- entryText = data.customName;
- }
- else if( data.dictID )
- {
- entryText = GetDictionaryEntry( data.dictID, socket.language );
- if( !entryText || entryText === "" )
- entryText = "[Missing EntryID: " + data.dictID + "]";
- }
- else
- {
- entryText = "[Unnamed Item: " + makeID + "]";
- }
+ tailoringMenu.AddButton( 220, 60 + ( index * 20 ), 4005, 4007, 1, 0, buttonID );
+ tailoringMenu.AddText( 255, 60 + ( index * 20 ), textHue, entryText );
+ // Detail button: 20000 + makeID (new system pattern)
+ tailoringMenu.AddButton( 480, 60 + ( index * 20 ), 4011, 4012, 1, 0, 20000 + buttonID );
}
- tailoringMenu.AddButton( 220, 60 + ( index * 20 ), 4005, 4007, 1, 0, buttonID );
- tailoringMenu.AddText( 255, 60 + ( index * 20 ), textHue, entryText );
- tailoringMenu.AddButton( 480, 60 + ( index * 20 ), 4011, 4012, 1, 0, 2000 + buttonID );
-}
-
+ // Prev subpage
if( subPage > 1 )
{
tailoringMenu.AddButton( 220, 260, 4014, 4015, 1, 0, 8000 + ( subPage - 1 ));
- tailoringMenu.AddHTMLGump( 255, 263, 100, 18, 0, 0, "" + GetDictionaryEntry(10101, socket.language ) + "" );
+ tailoringMenu.AddHTMLGump( 255, 263, 100, 18, false, false,
+ "" + GetDictionaryEntry( 10101, socket.language ) + "" );
}
+ // Next subpage
if( subPage < totalSubPages )
{
tailoringMenu.AddButton( 370, 260, 4005, 4007, 1, 0, 9000 + ( subPage + 1 ));
- tailoringMenu.AddHTMLGump( 405, 263, 100, 18, 0, 0, "" + GetDictionaryEntry(10100, socket.language ) + "" );
+ tailoringMenu.AddHTMLGump( 405, 263, 100, 18, false, false,
+ "" + GetDictionaryEntry( 10100, socket.language ) + "" );
}
tailoringMenu.Send( socket );
tailoringMenu.Free();
}
-/** @type { ( tObject: BaseObject, timerId: number ) => void } */
+/** @type { ( pUser: Character, timerID: number ) => void } */
function onTimer( pUser, timerID )
{
if( !ValidateObject( pUser ))
return;
- let socket = pUser.socket;
+ var socket = pUser.socket;
+ if( socket == null )
+ return;
if( timerID >= 1 && timerID <= 8 )
{
- PageX( socket, pUser, timerID ); // Pages 1 - 8
+ PageX( socket, pUser, timerID ); // Pages 1–8
}
- else if ( timerID == 999 )
+ else if( timerID == 999 )
{
- PageX(socket, pUser, 999); // Last Ten
+ PageX( socket, pUser, 999 ); // Last Ten
}
}
-/** @type { ( myObj: Socket, pressed: number, gump: GumpData ) => void } */
+/** @type { ( socket: Socket, pButton: number, gumpData: GumpData ) => void } */
function onGumpPress( socket, pButton, gumpData )
{
- var pUser = socket.currentChar;
- var usedMakeLast = false;
+ if( socket == null )
+ return;
+ var pUser = socket.currentChar;
if( !ValidateObject( pUser ) || pUser.dead )
return;
@@ -315,39 +295,43 @@ function onGumpPress( socket, pButton, gumpData )
return;
}
- var iPackOwner = GetPackOwner(bItem, 0);
+ var iPackOwner = GetPackOwner( bItem, 0 );
if( ValidateObject( iPackOwner ))
{
if( iPackOwner.serial != pUser.serial )
{
- socket.SysMessage(GetDictionaryEntry( 6032, socket.language ));
+ socket.SysMessage( GetDictionaryEntry( 6032, socket.language ));
return;
}
}
else
{
- socket.SysMessage(GetDictionaryEntry( 6022, socket.language ));
+ socket.SysMessage( GetDictionaryEntry( 6022, socket.language ));
return;
}
+ var gumpID = tailoringID + 0xffff;
+
+ // Subpage back/forward
if( pButton >= 8001 && pButton < 9000 )
{
- let subPage = pButton - 8000;
- let pageNum = pUser.GetTempTag( "page" ) || 1;
+ var subPage = pButton - 8000;
+ var pageNum = pUser.GetTempTag( "page" ) || 1;
pUser.SetTempTag( "subPage", subPage );
- PageX(socket, pUser, pageNum);
+ PageX( socket, pUser, pageNum );
return;
}
if( pButton >= 9001 && pButton < 10000 )
{
- let subPage = pButton - 9000;
- let pageNum = pUser.GetTempTag( "page" ) || 1;
- pUser.SetTempTag("subPage", subPage);
- PageX( socket, pUser, pageNum );
+ var subPage2 = pButton - 9000;
+ var pageNum2 = pUser.GetTempTag( "page" ) || 1;
+ pUser.SetTempTag( "subPage", subPage2 );
+ PageX( socket, pUser, pageNum2 );
return;
}
+ // Page tabs (1–8)
if( pButton >= 1 && pButton <= 8 )
{
pUser.SetTempTag( "page", pButton );
@@ -356,83 +340,95 @@ function onGumpPress( socket, pButton, gumpData )
return;
}
+ // Last Ten
if( pButton == 11000 )
{
pUser.SetTempTag( "page", 999 );
pUser.SetTempTag( "subPage", 1 );
- PageX(socket, pUser, 999);
+ PageX( socket, pUser, 999 );
return;
}
+ // Close gump
+ if( pButton == 0 )
+ {
+ pUser.SetTempTag( "MakeLast_Tailoring", null );
+ pUser.SetTempTag( "CRAFT", null );
+ socket.CloseGump( gumpID, 0 );
+ return;
+ }
+
+ // Unravel button
+ if( pButton == 52 )
+ {
+ UnravelTarget( socket );
+ return;
+ }
+
+ var usedMakeLast = false;
var makeID = 0;
var timerID = 0;
- // Handle "Make Last"
- if(( pButton >= 100 && pButton <= 804 ) || pButton == 5000 )
+ // Make Last
+ if( pButton == 5000 )
{
- if( pButton == 5000 )
+ var last = pUser.GetTempTag( "MakeLast_Tailoring" );
+ if( last )
{
- pButton = pUser.GetTempTag( "MAKELAST" );
+ pButton = last;
usedMakeLast = true;
}
else
{
- pUser.SetTempTag( "MAKELAST", pButton );
+ return;
}
}
- // If it's a craft button (found in map)
+ // Craft buttons use makeID directly (if in map)
if( CraftingMap[pButton] != undefined )
{
makeID = pButton;
- timerID = CraftingMap[makeID].timerID || 1;
+ var data = CraftingMap[makeID];
+ timerID = data.timerID || 1;
+
+ // Era / recipe checks
+ if( !eraOK( data ))
+ {
+ socket.SysMessage( "That item is not available in this era." );
+ return;
+ }
+ if( data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
+ {
+ socket.SysMessage( "You must learn that recipe from a scroll." );
+ return;
+ }
+
+ pUser.SetTempTag( "MakeLast_Tailoring", makeID );
- let materialHue = pUser.GetTempTag( "LastResourceColor" );
+ var materialHue = pUser.GetTempTag( "LastResourceColor" );
+
+ // Cloth items: select cloth (colour) unless Make Last + cached hue
if(( makeID >= 100 && makeID <= 158 ) || makeID == 180 )
{
if( usedMakeLast && materialHue != null )
{
- // Check if recipe required and not known
- let data = CraftingMap[makeID];
- if( data && !eraOK( data ))
- {
- socket.SysMessage( "That item is not available in this era." );
- return;
- }
-
- if( data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
- {
- socket.SysMessage("You must learn that recipe from a scroll.");
- return;
- }
MakeItem( socket, pUser, makeID, materialHue );
AddToLastTen( pUser, makeID );
- pUser.StartTimer( gumpDelay, timerID, 4030 );
+ pUser.StartTimer( gumpDelay, timerID, tailoringID );
}
else
{
pUser.SetTempTag( "makeID", makeID );
pUser.SetTempTag( "timerID", timerID );
- socket.CustomTarget(1, GetDictionaryEntry( 444, socket.language ));
+ socket.CustomTarget( 1, GetDictionaryEntry( 444, socket.language )); // Select material:
}
}
else
{
- // Check if recipe required and not known
- let data = CraftingMap[makeID];
- if( data && !eraOK( data ))
- {
- socket.SysMessage( "That item is not available in this era." );
- return;
- }
-
- if( data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
- {
- socket.SysMessage("You must learn that recipe from a scroll.");
- return;
- }
+ // Non-colour-selected tailoring (leather/bone etc.)
MakeItem( socket, pUser, makeID );
AddToLastTen( pUser, makeID );
+
if( GetServerSetting( "ToolUseLimit" ))
{
bItem.usesLeft -= 1;
@@ -442,40 +438,74 @@ function onGumpPress( socket, pButton, gumpData )
socket.SysMessage( GetDictionaryEntry( 10202, socket.language ));
}
}
- pUser.StartTimer( gumpDelay, timerID, 4030 );
+ pUser.StartTimer( gumpDelay, timerID, tailoringID );
}
return;
}
- // If it's a detail button (2000+ button ID pattern)
- if( pButton >= 2000 && pButton <= 3000 )
+ // Detail buttons: 20000 + makeID (new system)
+ if( pButton >= 20000 && pButton < 30000 )
{
- let makeID = pButton - 2000;
- if( CraftingMap[makeID] )
+ var detailMakeID = pButton - 20000;
+ var entry = CraftingMap[detailMakeID];
+ if( entry )
{
- pUser.SetTempTag( "ITEMDETAILS", makeID );
- TriggerEvent( itemDetailsScriptID, "ItemDetailGump", pUser );
- }
- return;
- }
+ // Which item to show
+ pUser.SetTempTag( "ITEMDETAILS", detailMakeID );
+
+ // Skill used
+ pUser.SetTempTag( "Skill", entry.skill || tailoringSkillID );
+
+ // Clear old harvest tags
+ pUser.SetTempTag( "Harvest", null );
+ pUser.SetTempTag( "Harvest2", null );
+ pUser.SetTempTag( "Harvest3", null );
+ pUser.SetTempTag( "Harvest4", null );
+
+ // Clear old custom harvest names
+ pUser.SetTempTag( "HarvestName", null );
+ pUser.SetTempTag( "Harvest2Name", null );
+ pUser.SetTempTag( "Harvest3Name", null );
+ pUser.SetTempTag( "Harvest4Name", null );
+
+ // Optional harvest dictIDs (cloth, leather, bone etc.) – add later per item
+ if( entry.harvest && entry.harvest.length > 0 )
+ {
+ if( entry.harvest.length >= 1 )
+ pUser.SetTempTag( "Harvest", entry.harvest[0] );
+ if( entry.harvest.length >= 2 )
+ pUser.SetTempTag( "Harvest2", entry.harvest[1] );
+ if( entry.harvest.length >= 3 )
+ pUser.SetTempTag( "Harvest3", entry.harvest[2] );
+ if( entry.harvest.length >= 4 )
+ pUser.SetTempTag( "Harvest4", entry.harvest[3] );
+ }
- if( pButton == 0 ) // Exit/Close
- {
- let gumpID = scriptID + 0xffff;
- pUser.SetTempTag( "MAKELAST", null );
- pUser.SetTempTag( "CRAFT", null );
- socket.CloseGump( gumpID, 0 );
- return;
- }
+ // Optional custom resource names (e.g. "Cloth", "Leather")
+ if( entry.harvestNames && entry.harvestNames.length > 0 )
+ {
+ if( entry.harvestNames.length >= 1 )
+ pUser.SetTempTag( "HarvestName", entry.harvestNames[0] );
+ if( entry.harvestNames.length >= 2 )
+ pUser.SetTempTag( "Harvest2Name", entry.harvestNames[1] );
+ if( entry.harvestNames.length >= 3 )
+ pUser.SetTempTag( "Harvest3Name", entry.harvestNames[2] );
+ if( entry.harvestNames.length >= 4 )
+ pUser.SetTempTag( "Harvest4Name", entry.harvestNames[3] );
+ }
- if( pButton == 52 ) // Unravel Item
- {
- UnravelTarget( socket );
+ if( entry.recipeID && entry.recipeID > 0 )
+ pUser.SetTempTag( "needRecipeID", entry.recipeID );
+ else
+ pUser.SetTempTag( "needRecipeID", 0 );
+
+ TriggerEvent( itemDetailsScriptID, "ItemDetailGump", pUser );
+ }
return;
}
}
-/** @type { ( tSock: Socket, target: Character | Item | null ) => void } */
+/** @type { ( socket: Socket, ourObj: Character | Item | null ) => void } */
function onCallback1( socket, ourObj )
{
var pUser = socket.currentChar;
@@ -483,58 +513,57 @@ function onCallback1( socket, ourObj )
return;
// Fetch makeID and timerID from temp tag
- var makeID = pUser.GetTempTag( "makeID" );
+ var makeID = pUser.GetTempTag( "makeID" );
var timerID = pUser.GetTempTag( "timerID" );
pUser.SetTempTag( "makeID", null );
pUser.SetTempTag( "timerID", null );
var bItem = socket.tempObj;
- if( ValidateObject( bItem ))
+ if( !ValidateObject( bItem ))
+ return;
+
+ if( ValidateObject( ourObj ) && ourObj.isItem )
{
- if( ValidateObject( ourObj ) && ourObj.isItem )
+ // Make sure targeted item is in player's backpack
+ var iPackOwner = GetPackOwner( ourObj, 0 );
+ if( ValidateObject( iPackOwner ))
{
- // Make sure targeted item is in player's backpack
- var iPackOwner = GetPackOwner( ourObj, 0 );
- if( ValidateObject( iPackOwner )) // Is the item in a backpack?
+ if( iPackOwner.serial != pUser.serial )
{
- if( iPackOwner.serial != pUser.serial ) // And if so does the pack belong to the user?
- {
- socket.SysMessage( GetDictionaryEntry( 6032, socket.language )); // That resource is in someone else's backpack!
- return;
- }
- }
- else
- {
- socket.SysMessage( GetDictionaryEntry( 6022, socket.language )); // This has to be in your backpack before you can use it.
+ socket.SysMessage( GetDictionaryEntry( 6032, socket.language ));
return;
}
+ }
+ else
+ {
+ socket.SysMessage( GetDictionaryEntry( 6022, socket.language ));
+ return;
+ }
- //Cache cloth color for future "Make Last"
- pUser.SetTempTag( "LastResourceColor", ourObj.colour );
+ // Cache cloth color for Make Last
+ pUser.SetTempTag( "LastResourceColor", ourObj.colour );
- // Check if recipe required and not known
- let data = CraftingMap[makeID];
- if( data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
- {
- socket.SysMessage("You must learn that recipe from a scroll.");
- return;
- }
+ // Recipe re-check (just in case)
+ var data = CraftingMap[makeID];
+ if( data && data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
+ {
+ socket.SysMessage( "You must learn that recipe from a scroll." );
+ return;
+ }
- // Pass in the colour of the desired material to use for crafting
- MakeItem( socket, pUser, makeID, ourObj.colour );
- AddToLastTen( pUser, makeID );
- if( GetServerSetting( "ToolUseLimit" ))
+ MakeItem( socket, pUser, makeID, ourObj.colour );
+ AddToLastTen( pUser, makeID );
+
+ if( GetServerSetting( "ToolUseLimit" ))
+ {
+ bItem.usesLeft -= 1;
+ if( bItem.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
{
- bItem.usesLeft -= 1;
- if( bItem.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
- {
- bItem.Delete();
- socket.SysMessage( GetDictionaryEntry( 10202, socket.language )); // You have worn out your tool!
- // Play sound effect of tool breaking
- }
+ bItem.Delete();
+ socket.SysMessage( GetDictionaryEntry( 10202, socket.language )); // You have worn out your tool!
}
- pUser.StartTimer( gumpDelay, timerID, 4030 );
}
+ pUser.StartTimer( gumpDelay, timerID, tailoringID );
}
}
@@ -544,15 +573,13 @@ function UnravelTarget( socket )
}
// Clothes and leather armor can be unravelled back into cloth and leather
-/** @type { ( tSock: Socket, target: Character | Item | null ) => void } */
+/** @type { ( socket: Socket, ourObj: Character | Item | null ) => void } */
function onCallback2( socket, ourObj )
{
- // Unravel item, get cloth/leather in return
var mChar = socket.currentChar;
if( !ValidateObject( ourObj ) || !ourObj.isItem )
{
- // Targeted object is not an item that can be smelted
mChar.SetTempTag( "prevActionResult", "CANTUNRAVEL" );
mChar.StartTimer( repairDelay, 1, true );
return;
@@ -571,46 +598,40 @@ function onCallback2( socket, ourObj )
var resourceColor = ourObj.colour;
var materialType = TriggerEvent( 2506, "GetItemMaterialType", ourObj, 0 );
+ var resourceID = 0;
+
if( creatorSerial == -1 || entryMadeFrom == 0 || createEntry == null )
{
- // Not a player-crafted item, return 1 resource if item is made of cloth/leather
+ // Not player-crafted; 1 resource if cloth/leather
if( materialType == "cloth" || materialType == "leather" )
- {
resourceAmount = 1;
- }
}
else
{
if( createEntry.avgMinSkill > mChar.skills.tailoring )
{
+ var gumpID = tailoringID + 0xffff;
socket.CloseGump( gumpID, 0 );
mChar.SetTempTag( "prevActionResult", "NOUNRAVELSKILL" );
- mChar.StartTimer( gumpDelay, 1, 4030 );
+ mChar.StartTimer( gumpDelay, 1, tailoringID );
return;
}
- // Loop through resources used to craft item, see how many resources were used
- var resourceID = 0;
+ // Loop resources used to craft item
var resourcesUsed = createEntry.resources;
for( var i = 0; i < resourcesUsed.length; i++ )
{
var resource = resourcesUsed[i];
var amountNeeded = resource[0];
- var colorNeeded = resource[1];
- var resourceIDs = resource[2];
+ var colorNeeded = resource[1]; // unused here but kept for completeness
+ var resourceIDs = resource[2];
- // Loop through list of resourceIDs that were valid for crafting this item, see if ANY
- // were a match for the resource we're trying to return
for( var j = 0; j <= resourceIDs.length; j++ )
{
if( !isNaN( parseInt( resourceIDs[j] )))
{
- // If we found some resource that match up to cloth, or leather, go for it
- var resourceType = TriggerEvent( 2506, "GetResourceType", parseInt( resourceIDs[j] ));
- /*mChar.TextMessage( "MaterialType: " + materialType );
- mChar.TextMessage( "ResourceType: " + resourceType );
- mChar.TextMessage( "resourceID: " + resourceIDs[j] );*/
- if( materialType == resourceType )
+ var resType = TriggerEvent( 2506, "GetResourceType", parseInt( resourceIDs[j] ));
+ if( materialType == resType )
{
maxResourceAmount = amountNeeded;
resourceID = resourceIDs[j];
@@ -619,42 +640,26 @@ function onCallback2( socket, ourObj )
}
}
- // We only really care about the first and primary resource....
if( maxResourceAmount > 0 )
break;
}
if( maxResourceAmount > 1 )
{
- // Calculate amount of resources returned based on player's mining skill, item's wear and tear,
- // and amount of resources that went into making the item in the first place
- if( ourObj.health >= 1 || ourObj.usesLeft >= 1 )
- {
- var healthPercentage = 0;
- if( ourObj.health >= 1 )
- {
- healthPercentage = Math.floor( ( ourObj.health * 100 ) / ourObj.maxhp );
- }
+ var healthPercentage = 0;
+ if( ourObj.health >= 1 )
+ healthPercentage = Math.floor( ( ourObj.health * 100 ) / ourObj.maxhp );
- var usesPercentage = 0;
- if( ourObj.usesLeft >= 1 )
- {
- usesPercentage = Math.floor( ( ourObj.usesLeft * 100 ) / ourObj.maxUses );
- }
+ var usesPercentage = 0;
+ if( ourObj.usesLeft >= 1 )
+ usesPercentage = Math.floor( ( ourObj.usesLeft * 100 ) / ourObj.maxUses );
- var itemPercentage = usesPercentage > 0 ? Math.min( healthPercentage, usesPercentage ) : healthPercentage;
+ var itemPercentage = usesPercentage > 0 ? Math.min( healthPercentage, usesPercentage ) : healthPercentage;
- // Reduce amount of resources returned based on state of object's wear and tear
- resourceAmount = Math.floor( ( maxResourceAmount * itemPercentage ) / 100 );
- }
-
- // Halve the amount of resources returned
+ resourceAmount = Math.floor( ( maxResourceAmount * itemPercentage ) / 100 );
resourceAmount = Math.max( Math.floor( resourceAmount / 2 ), 1 );
- // Fetch player's Tailoring skill
var playerSkill = mChar.skills.tailoring;
-
- // Based on player's Tailoring skill, return between 1 to maxResourceAmount
resourceAmount = Math.min( Math.max( Math.floor( resourceAmount * ( playerSkill / 1000 )), 1 ), resourceAmount );
}
else
@@ -665,76 +670,67 @@ function onCallback2( socket, ourObj )
if( resourceAmount == 0 || resourceID == 0 )
{
- // Targeted object is not an item that can be unravelled
mChar.SetTempTag( "prevActionResult", "CANTUNRAVEL" );
- mChar.StartTimer( repairDelay, 1, 4030 );
+ mChar.StartTimer( repairDelay, 1, tailoringID );
return;
}
- // Delete the unravelled item
+ // Delete unravelled item
ourObj.Delete();
- // Run a generic skill check to give player a chance to increase their tailoring skill
- mChar.CheckSkill( 34, 0, mChar.skillCaps.tailoring );
+ // Generic skill check
+ mChar.CheckSkill( tailoringSkillID, 0, mChar.skillCaps.tailoring );
- // Determine the actual resource item to add to player's backpack
- // We'll default to one specific resource per material type
+ // Determine returned resource
var itemToAdd = "";
switch( materialType )
{
- case "cloth":
- itemToAdd = "0x1766"; // cut cloth
- break;
- case "leather":
- itemToAdd = "0x1068"; // cut leather
- break;
- default:
- break;
+ case "cloth": itemToAdd = "0x1766"; break; // cut cloth
+ case "leather": itemToAdd = "0x1068"; break; // cut leather
+ default: break;
}
+
var newResource = CreateDFNItem( socket, mChar, itemToAdd, resourceAmount, "ITEM", true, resourceColor );
mChar.SetTempTag( "resourceFromUnravelling", resourceAmount );
mChar.SetTempTag( "prevActionResult", "UNRAVELSUCCESS" );
- mChar.StartTimer( gumpDelay, 1, 4030 );
+ mChar.StartTimer( gumpDelay, 1, tailoringID );
}
function AddToLastTen( pUser, makeID )
{
- // Append makeID to last ten list
- var raw = pUser.GetTag( "LastTenTailoring" ) || "";
+ var raw = pUser.GetTempTag( "LastTenTailoring" ) || "";
var list = raw.split( "," );
- // Remove if already in list
for( var i = 0; i < list.length; i++ )
{
- if( parseInt( list[i]) == makeID )
+ if( parseInt( list[i] ) == makeID )
{
- list.splice(i, 1);
+ list.splice( i, 1 );
break;
}
}
- // Add to front (no unshift in SpiderMonkey 1.8)
- var newList = [makeID];
- for( var i = 0; i < list.length && newList.length < 10; i++ )
+ var newList = [ makeID ];
+ for( var j = 0; j < list.length && newList.length < 10; j++ )
{
- var entry = parseInt( list[i] );
+ var entry = parseInt( list[j] );
if( !isNaN( entry ) && entry > 0 )
newList.push( entry );
}
- pUser.SetTag( "LastTenTailoring", newList.join( "," ));
+ pUser.SetTempTag( "LastTenTailoring", newList.join( "," ));
}
function HasLearnedRecipe( pUser, recipeID )
{
var myData = TriggerEvent( 4022, "ReadRecipeID", pUser );
- if( !myData || myData.length == 0)
+ if( !myData || myData.length == 0 )
return false;
- for( let i = 0; i < myData.length; i++ )
+ for( var i = 0; i < myData.length; i++ )
{
- let data = myData[i].split( "," );
+ var data = myData[i].split( "," );
if( data[0] == recipeID )
return true;
}
@@ -743,11 +739,9 @@ function HasLearnedRecipe( pUser, recipeID )
function eraOK( entry )
{
- // Optional per-entry gates. Accept either/both. Strings like "lbr","aos","ml","tol".
- // If not present, the entry is valid for all eras.
if( entry.minEra && coreShardEra < EraStringToNum( entry.minEra ))
return false;
if( entry.maxEra && coreShardEra > EraStringToNum( entry.maxEra ))
return false;
return true;
-}
+}
\ No newline at end of file
diff --git a/data/js/skill/craft/tinkering.js b/data/js/skill/craft/tinkering.js
index dfb4b3623..1af465688 100644
--- a/data/js/skill/craft/tinkering.js
+++ b/data/js/skill/craft/tinkering.js
@@ -1,538 +1,503 @@
///
// @ts-check
-const LabelHue = 0x480; // Color of the text.
-const LabelColor = 0x7FFF; // Second Color of text.
-const scriptID = 4032; // Use this to tell the gump what script to close.
-const gumpDelay = 2000; // Timer for the gump to reapear after crafting.
-const itemDetailsScriptID = 4026;
-const craftGumpID = 4027;
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// The section below is the tables for each page.
-// All you have to do is add the item to your dictionary
-// and then list the dictionary number in the right page and it will
-// add it to the crafting gump.
-///////////////////////////////////////////////////////////////////////////////////////////
+const textHue = 0x480; // Color of the text.
+const tinkeringID = 4032; // Script ID for this tinkering gump
+const gumpDelay = 2000; // Delay (ms) before gump reappears after crafting
+const itemDetailsScriptID = 4026; // Generic item details gump
+const craftGumpID = 4027; // Shared crafting menu frame
+const itemsPerPage = 10; // Items per subpage
+const displayUnlearnedRecipes = true; // For future recipe use
+const coreShardEra = EraStringToNum( GetServerSetting( "CoreShardEra" ));
+const tinkeringSkillID = 37; // Index of "tinkering" in ItemDetailGump.skillNames[]
+
+const craftMapRegistryID = 4038;
+var TinkeringMap = {};
+
+/** @type { () => boolean } */
+function LoadTinkeringMap()
+{
+ TinkeringMap = {};
-const myPage = [
- // Page 1 - Wooden Items
- [ 11801, 11802, 11803, 11804, 11805 ],
+ var tinkeringEntries = TriggerEvent( craftMapRegistryID, "CraftMapRegistry", "tinkering" );
- // Page 2 - Tools
- [ 11820, 11821, 11822, 11823, 11824, 11825, 11826, 11827, 11828, 11829, 11830, 11831, 11832, 11833, 11834, 11835, 11836, 11837, 11838 ],
+ if( !tinkeringEntries )
+ {
+ Console.Warning( "Tinkering: CraftMapRegistry returned null." );
+ return false;
+ }
- // Page 3 - Parts
- [ 11860, 11861, 11862, 11863, 11864, 11865, 11866 ],
+ if( !IsTinkeringArrayValue( tinkeringEntries ))
+ {
+ Console.Warning( "Tinkering: CraftMapRegistry did not return an array." );
+ return false;
+ }
- // Page 4 - Utensils
- [ 11880, 11881, 11882, 11883, 11884, 11885, 11886, 11887, 11888, 11889, 11890, 11891 ],
+ for( var i = 0; i < tinkeringEntries.length; i++ )
+ {
+ var entry = tinkeringEntries[i];
- // Page 5 - Jewelry
- [ 11900, 11901, 11902, 11903, 11904, 11905 ],
+ if( !entry || typeof entry.makeID == "undefined" )
+ continue;
- // Page 6 - Miscellaneuos
- [ 11920, 11921, 11922, 11923, 11924, 11925, 11926, 11927 ],
+ if( entry.skill === undefined )
+ entry.skill = tinkeringSkillID;
- // Page 7 - Multi-Component Items
- [ 11940, 11941, 11942, 11943, 11946, 11947, 11948 ],
+ TinkeringMap[entry.makeID] = entry;
+ }
- // Page 8 - Candles
- [ 11960, 11961, 11962, 11963, 11964, 11965, 11966, 11967 ],
+ return true;
+}
- // Page 9 - Traps
- [ 11980, 11981, 11982 ]
-];
+/** @type { ( value: any ) => boolean } */
+function IsTinkeringArrayValue( value )
+{
+ return Object.prototype.toString.call( value ) == "[object Array]";
+}
+// o--------------------------------------------------------------------------o
+// | PageX() - build a page of tinkering items |
+// o--------------------------------------------------------------------------o
+/** @type { ( socket: Socket, pUser: Character, pageNum: number ) => void } */
function PageX( socket, pUser, pageNum )
{
- // Pages 1 - 9
- var myGump = new Gump;
- pUser.SetTempTag( "page", pageNum );
- TriggerEvent( craftGumpID, "CraftingGumpMenu", myGump, socket );
- for ( var i = 0; i < myPage[pageNum - 1].length; i++ )
+ if( !socket || !ValidateObject( pUser ))
+ return;
+
+ if( !TinkeringMap || Object.keys( TinkeringMap ).length == 0 )
+ {
+ if( !LoadTinkeringMap() )
+ {
+ socket.SysMessage( "Tinkering craft map failed to load." );
+ return;
+ }
+ }
+
+ var pageItems;
+
+ // Last Ten page (if you wire a tab to 999 later)
+ if( pageNum == 999 )
{
- var index = i % 10;
- if ( index == 0 )
+ var lastTenRaw = pUser.GetTempTag( "LastTenTinkering" ) || "";
+ var split = lastTenRaw.split( "," );
+ pageItems = [];
+
+ for( var i = 0; i < split.length; i++ )
{
- if ( i > 0 )
+ var val = parseInt( split[i] );
+ if( !isNaN( val ))
+ pageItems.push( val );
+ }
+ }
+ else
+ {
+ // Collect all makeIDs for this page
+ var makeIDs = [];
+ for( var key in TinkeringMap )
+ {
+ if( !TinkeringMap.hasOwnProperty( key ))
+ continue;
+
+ var makeID = parseInt( key );
+ var data = TinkeringMap[makeID];
+ if( !data || data.page != pageNum )
+ continue;
+
+ makeIDs.push( makeID );
+ }
+
+ // Sort by dictID so order matches dictionary sequence
+ makeIDs.sort( function( a, b )
+ {
+ var ea = TinkeringMap[a];
+ var eb = TinkeringMap[b];
+ if( ea && eb )
+ return ( ea.dictID || 0 ) - ( eb.dictID || 0 );
+ return a - b;
+ });
+
+ // Era / recipe filtering
+ pageItems = [];
+ for( var k = 0; k < makeIDs.length; k++ )
+ {
+ var id = makeIDs[k];
+ var data2 = TinkeringMap[id];
+ if( !data2 )
+ continue;
+
+ var needsRecipe = data2.recipeID;
+ var showAll = displayUnlearnedRecipes;
+
+ if( eraOK( data2 ) && ( !needsRecipe || showAll || HasLearnedRecipe( pUser, needsRecipe )) )
+ pageItems.push( id );
+ }
+
+ // Fallback: if no items on this page and it's not page 1, go to page 1
+ if( pageItems.length == 0 && pageNum != 1 )
+ {
+ pageNum = 1;
+
+ makeIDs = [];
+ for( var key2 in TinkeringMap )
{
- myGump.AddButton( 370, 260, 4005, 4007, 0, ( i / 10 ) + 1, 0 );
- myGump.AddHTMLGump( 405, 263, 100, 18, 0, 0, "" + GetDictionaryEntry( 10100, socket.language ) + "" );// NEXT PAGE
+ if( !TinkeringMap.hasOwnProperty( key2 ))
+ continue;
+
+ var mid2 = parseInt( key2 );
+ var d3 = TinkeringMap[mid2];
+ if( !d3 || d3.page != 1 )
+ continue;
+
+ makeIDs.push( mid2 );
+ }
+
+ makeIDs.sort( function( a, b )
+ {
+ var ea2 = TinkeringMap[a];
+ var eb2 = TinkeringMap[b];
+ if( ea2 && eb2 )
+ return ( ea2.dictID || 0 ) - ( eb2.dictID || 0 );
+ return a - b;
+ });
+
+ pageItems = [];
+ for( var m = 0; m < makeIDs.length; m++ )
+ {
+ var id2 = makeIDs[m];
+ var data4 = TinkeringMap[id2];
+ if( !data4 )
+ continue;
+
+ var needsRecipe2 = data4.recipeID;
+ var showAll2 = displayUnlearnedRecipes;
+
+ if( eraOK( data4 ) && ( !needsRecipe2 || showAll2 || HasLearnedRecipe( pUser, needsRecipe2 )) )
+ pageItems.push( id2 );
}
+ }
+ }
+
+ // Subpage handling (future-proof; currently you effectively have 1 or 2 subpages per category)
+ var subPage = pUser.GetTempTag( "subPage" );
+ var totalSubPages = Math.ceil( pageItems.length / itemsPerPage );
+
+ if( totalSubPages < 1 )
+ totalSubPages = 1;
+ if( subPage < 1 )
+ subPage = 1;
+ if( subPage > totalSubPages )
+ subPage = totalSubPages;
+
+ pUser.SetTempTag( "page", pageNum );
+ pUser.SetTempTag( "subPage", subPage );
+
+ var startIndex = ( subPage - 1 ) * itemsPerPage;
+ var endIndex = Math.min( startIndex + itemsPerPage, pageItems.length );
+
+ if( startIndex >= pageItems.length )
+ {
+ subPage = 1;
+ startIndex = 0;
+ endIndex = Math.min( itemsPerPage, pageItems.length );
+ pUser.SetTempTag( "subPage", subPage );
+ }
+
+ var tinkGump = new Gump;
+ TriggerEvent( craftGumpID, "CraftingGumpMenu", tinkGump, socket );
+ tinkGump.AddPage( 1 );
+
+ for( var j = startIndex; j < endIndex; j++ )
+ {
+ var index = j - startIndex;
+ var makeID = pageItems[j];
+ var entryText;
+ var buttonID = makeID; // use makeID directly as buttonID
- myGump.AddPage( ( i / 10 ) + 1 );
+ var data5 = TinkeringMap[makeID];
- if ( i > 0 )
+ if( !data5 )
+ {
+ entryText = "[Missing MakeID: " + makeID + "]";
+ }
+ else
+ {
+ if( data5.customName )
+ {
+ entryText = data5.customName;
+ }
+ else if( data5.dictID )
+ {
+ entryText = GetDictionaryEntry( data5.dictID, socket.language );
+ if( !entryText || entryText === "" )
+ entryText = "[Missing EntryID: " + data5.dictID + "]";
+ }
+ else
{
- myGump.AddButton( 220, 260, 4014, 4015, 0, i / 10, 0 );
- myGump.AddHTMLGump( 255, 263, 100, 18, 0, 0, "" + GetDictionaryEntry( 10101, socket.language ) + "" );// PREV PAGE
+ entryText = "[Unnamed Item: " + makeID + "]";
}
}
- myGump.AddButton( 220, 60 + ( index * 20 ), 4005, 4007, 1, 0, ( 100 * pageNum ) + i );
- myGump.AddText( 255, 60 + ( index * 20 ), LabelHue, GetDictionaryEntry( myPage[pageNum - 1][i], socket.language ) );
+ // Craft button
+ tinkGump.AddButton( 220, 60 + ( index * 20 ), 4005, 4007, 1, 0, buttonID );
+ tinkGump.AddText( 255, 60 + ( index * 20 ), textHue, entryText );
- myGump.AddButton( 480, 60 + ( index * 20 ), 4011, 4012, 1, 0, 2000 + ( 100 * pageNum ) + i );
+ // Detail button: 20000 + makeID
+ tinkGump.AddButton( 480, 60 + ( index * 20 ), 4011, 4012, 1, 0, 20000 + buttonID );
}
- myGump.Send( socket );
- myGump.Free();
+
+ // Prev subpage
+ if( subPage > 1 )
+ {
+ tinkGump.AddButton( 220, 260, 4014, 4015, 1, 0, 8000 + ( subPage - 1 ));
+ tinkGump.AddHTMLGump( 255, 263, 100, 18, false, false,
+ "" + GetDictionaryEntry( 10101, socket.language ) + "" ); // PREV PAGE
+ }
+
+ // Next subpage
+ if( subPage < totalSubPages )
+ {
+ tinkGump.AddButton( 370, 260, 4005, 4007, 1, 0, 9000 + ( subPage + 1 ));
+ tinkGump.AddHTMLGump( 405, 263, 100, 18, false, false,
+ "" + GetDictionaryEntry( 10100, socket.language ) + "" ); // NEXT PAGE
+ }
+
+ tinkGump.Send( socket );
+ tinkGump.Free();
}
-/** @type { ( tObject: BaseObject, timerId: number ) => void } */
+/** @type { ( pUser: Character, timerID: number ) => void } */
function onTimer( pUser, timerID )
{
if( !ValidateObject( pUser ))
return;
- var socket = pUser.socket;
+ var pSocket = pUser.socket;
+ if( pSocket == null )
+ return;
- switch ( timerID )
+ if( timerID >= 1 && timerID <= 9 )
{
- case 1: // Page 1 - Wooden Items
- case 2: // Page 2 - Tools
- case 3: // Page 3 - Parts
- case 4: // Page 4 - Utensils
- case 5: // Page 5 - Jewelry
- case 6: // Page 6 - Miscellaneous
- case 7: // Page 7 - Multi-Component Items
- case 8: // Page 8 - Candles
- case 9: // Page 9 - Traps
- PageX( socket, pUser, timerID );
- break;
+ PageX( pSocket, pUser, timerID );
+ }
+ else if( timerID == 999 )
+ {
+ PageX( pSocket, pUser, 999 );
}
}
-/** @type { ( myObj: Socket, pressed: number, gump: GumpData ) => void } */
-function onGumpPress( pSock, pButton, gumpData )
+/** @type { ( socket: Socket, pButton: number, gumpData: GumpData ) => void } */
+function onGumpPress( socket, pButton, gumpData )
{
- var pUser = pSock.currentChar;
+ if( socket == null )
+ return;
- // Don't continue if character is invalid, or worse... dead!
+ var pUser = socket.currentChar;
if( !ValidateObject( pUser ) || pUser.dead )
return;
// Don't continue if player no longer has access to the crafting tool
- var bItem = pSock.tempObj;
- if( !ValidateObject( bItem ) || !pUser.InRange( bItem, 3 ))
+ var tool = socket.tempObj;
+ if( !ValidateObject( tool ) || !pUser.InRange( tool, 3 ))
{
- pSock.SysMessage( GetDictionaryEntry( 461, pSock.language )); // You are too far away.
+ socket.SysMessage( GetDictionaryEntry( 461, socket.language )); // You are too far away.
return;
}
- if( bItem.movable == 3 )
+ if( tool.movable == 3 )
{
- pSock.SysMessage( GetDictionaryEntry( 6031, pSock.language )); // Locked down resources cannot be used!
+ socket.SysMessage( GetDictionaryEntry( 6031, socket.language )); // Locked down resources cannot be used!
return;
}
- var iPackOwner = GetPackOwner( bItem, 0 );
- if( ValidateObject( iPackOwner )) // Is the item in a backpack?
+ var packOwner = GetPackOwner( tool, 0 );
+ if( ValidateObject( packOwner ))
{
- if( iPackOwner.serial != pUser.serial ) // And if so does the pack belong to the user?
+ if( packOwner.serial != pUser.serial )
{
- pSock.SysMessage( GetDictionaryEntry( 6032, pSock.language )); // That resource is in someone else's backpack!
+ socket.SysMessage( GetDictionaryEntry( 6032, socket.language )); // That resource is in someone else's backpack!
return;
}
}
else
{
- pSock.SysMessage( GetDictionaryEntry( 6022, pSock.language )); // This has to be in your backpack before you can use it.
+ socket.SysMessage( GetDictionaryEntry( 6022, socket.language )); // This has to be in your backpack before you can use it.
return;
}
- var gumpID = scriptID + 0xffff;
- var makeID = 0;
- var itemDetailsID = 0;
- var timerID = 0;
+ var gumpID = tinkeringID + 0xffff;
- if(( pButton >= 100 && pButton <= 950 ) || pButton == 5000 )
+ // Subpage back / forward
+ if( pButton >= 8001 && pButton < 9000 )
{
- if( pButton == 5000 )
- {
- // Make Last button
- pButton = pUser.GetTempTag( "MAKELAST" );
- }
- else
- {
- pUser.SetTempTag( "MAKELAST", pButton );
- }
+ var subPage = pButton - 8000;
+ var pageNum = pUser.GetTempTag( "page" );
+ pUser.SetTempTag( "subPage", subPage );
+ PageX( socket, pUser, pageNum );
+ return;
}
- switch ( pButton )
+ if( pButton >= 9001 && pButton < 10000 )
{
- case 0: // Abort and do nothing
- pUser.SetTempTag( "MAKELAST", null );
- pUser.SetTempTag( "CRAFT", null )
- pSock.CloseGump( gumpID, 0 );
- break;
- case 1: // Page 1 - Wooden Items
- case 2: // Page 2 - Tools
- case 3: // Page 3 - Parts
- case 4: // Page 4 - Utensils
- case 5: // Page 5 - Jewelry
- case 6: // Page 6 - Miscellaneous
- case 7: // Page 7 - Multi-Component Items
- case 8: // Page 8 - Candles
- case 9: // Page 9 - Traps
- pSock.CloseGump( gumpID, 0 );
- PageX( pSock, pUser, pButton );
- break;
- // Make Items
- // Page 1 - Wooden Items
- case 100: // Axle
- makeID = 274; timerID = 1; break;
- case 101: // Clock Frame
- makeID = 273; timerID = 1; break;
- case 102: // Jointing Plane
- makeID = 270; timerID = 1; break;
- case 103: // Moulding Plane
- makeID = 271; timerID = 1; break;
- case 104: // Smoothing Plane
- makeID = 272; timerID = 1; break;
- // Page 2 - Tools
- case 200: // Dovetail Saw
- makeID = 218; timerID = 2; break;
- case 201: // Draw Knife
- makeID = 215; timerID = 2; break;
- case 202: // Froe
- makeID = 252; timerID = 2; break;
- case 203: // Hammer
- makeID = 255; timerID = 2; break;
- case 204: // Hatchet
- makeID = 214; timerID = 2; break;
- case 205: // Inshave
- makeID = 258; timerID = 2; break;
- case 206: // Lockpick
- makeID = 260; timerID = 2; break;
- case 207: // Mortar and Pestle
- makeID = 211; timerID = 2; break;
- case 208: // Pick Axe
- makeID = 259; timerID = 2; break;
- case 209: // Saw
- makeID = 217; timerID = 2; break;
- case 210: // Scissors
- makeID = 210; timerID = 2; break;
- case 211: // Scorp
- makeID = 212; timerID = 2; break;
- case 212: // Sewing Kit
- makeID = 216; timerID = 2; break;
- case 213: // Shovel
- makeID = 254; timerID = 2; break;
- case 214: // Sledge Hammer
- makeID = 257; timerID = 2; break;
- case 215: // Smith's Hammer
- makeID = 256; timerID = 2; break;
- case 216: // Tongs
- makeID = 253; timerID = 2; break;
- case 217: // Tool Kit (Tinker's tools)
- makeID = 213; timerID = 2; break;
- case 218: // Fletcher's Tools
- makeID = 284; timerID = 2; break;
- // Page 3 - Parts
- case 300: // Barrel Hoops
- makeID = 224; timerID = 3; break;
- case 301: // Barrel Tap
- makeID = 221; timerID = 3; break;
- case 302: // Clock parts
- makeID = 220; timerID = 3; break;
- case 303: // Gears
- makeID = 219; timerID = 3; break;
- case 304: // Hinge
- makeID = 225; timerID = 3; break;
- case 305: // Sextant parts
- makeID = 223; timerID = 3; break;
- case 306: // Springs
- makeID = 222; timerID = 3; break;
- // Page 4 - Utensils
- case 400: // Butcher Knife
- makeID = 226; timerID = 4; break;
- case 401: // Cleaver
- makeID = 232; timerID = 4; break;
- case 402: // Fork
- makeID = 230; timerID = 4; break;
- case 403: // Fork
- makeID = 231; timerID = 4; break;
- case 404: // Goblet
- makeID = 235; timerID = 4; break;
- case 405: // Knife
- makeID = 233; timerID = 4; break;
- case 406: // Knife
- makeID = 234; timerID = 4; break;
- case 407: // Pewter Mug
- makeID = 236; timerID = 4; break;
- case 408: // Plate
- makeID = 229; timerID = 4; break;
- case 409: // Skinning Knife
- makeID = 237; timerID = 4; break;
- case 410: // Spoon
- makeID = 227; timerID = 4; break;
- case 411: // Spoon
- makeID = 228; timerID = 4; break;
- // Page 5 - Jewelry
- case 500: // Bracelet
- makeID = 243; timerID = 5; break;
- case 501: // Earrings
- makeID = 241; timerID = 5; break;
- case 502: // Necklage (Golden beads)
- makeID = 239; timerID = 5; break;
- case 503: // Necklace (Silver beads)
- makeID = 240; timerID = 5; break;
- case 504: // Necklace (Round)
- makeID = 242; timerID = 5; break;
- case 505: // Weddingband (newbiefied)
- makeID = 238; timerID = 5; break;
- // Page 6 - Miscellaneous
- case 600: // Candelabra
- makeID = 245; timerID = 6; break;
- case 601: // Globe
- makeID = 248; timerID = 6; break;
- case 602: // Heating stand
- makeID = 251; timerID = 6; break;
- case 603: // Iron Key
- makeID = 247; timerID = 6; break;
- case 604: // Keyring
- makeID = 244; timerID = 6; break;
- case 605: // Lantern
- makeID = 250; timerID = 6; break;
- case 606: // Scales
- makeID = 246; timerID = 6; break;
- case 607: // Spy glass
- makeID = 249; timerID = 6; break;
- // Page 7 - Multi-Component Items
- case 700: // Axle and Gears
- makeID = 275; timerID = 7; break;
- case 701: // Clock
- makeID = 276; timerID = 7; break;
- case 702: // Clock
- makeID = 277; timerID = 7; break;
- case 703: // Clock Parts
- makeID = 278; timerID = 7; break;
- case 704: // Potion Keg
- makeID = 281; timerID = 7; break;
- case 705: // Sextant
- makeID = 282; timerID = 7; break;
- case 706: // Sextant Parts
- makeID = 283; timerID = 7; break;
- // Page 8 - Candles
- case 800: // Candelabra
- makeID = 245; timerID = 8; break;
- case 801: // Standing Candelabra
- makeID = 310; timerID = 8; break;
- case 802: // Regular Candle
- makeID = 315; timerID = 8; break;
- case 803: // Round Candle
- makeID = 312; timerID = 8; break;
- case 804: // Skull with Candle
- makeID = 316; timerID = 8; break;
- case 805: // Small Candle
- makeID = 314; timerID = 8; break;
- case 806: // Tall Candle
- makeID = 311; timerID = 8; break;
- case 807: // Thick Candle
- makeID = 313; timerID = 8; break;
- // Page 9 - Traps
- case 900: // Dart Trap
- makeID = 261; timerID = 9; break;
- case 901: // Explosion Trap
- makeID = 263; timerID = 9; break;
- case 902: // Poison Trap
- makeID = 262; timerID = 9; break;
- // Show Item Details
- case 2100: // Axle
- itemDetailsID = 274; break;
- case 2101: // Clock Frame
- itemDetailsID = 273; break;
- case 2102: // Jointing Plane
- itemDetailsID = 270; break;
- case 2103: // Moulding Plane
- itemDetailsID = 271; break;
- case 2104: // Smoothing Plane
- itemDetailsID = 272; break;
- // Page 2 - Tools
- case 2200: // Dovetail Saw
- itemDetailsID = 218; break;
- case 2201: // Draw Knife
- itemDetailsID = 215; break;
- case 2202: // Froe
- itemDetailsID = 252; break;
- case 2203: // Hammer
- itemDetailsID = 255; break;
- case 2204: // Hatchet
- itemDetailsID = 214; break;
- case 2205: // Inshave
- itemDetailsID = 258; break;
- case 2206: // Lockpick
- itemDetailsID = 260; break;
- case 2207: // Mortar and Pestle
- itemDetailsID = 211; break;
- case 2208: // Pick Axe
- itemDetailsID = 259; break;
- case 2209: // Saw
- itemDetailsID = 217; break;
- case 2210: // Scissors
- itemDetailsID = 210; break;
- case 2211: // Scorp
- itemDetailsID = 212; break;
- case 2212: // Sewing Kit
- itemDetailsID = 216; break;
- case 2213: // Shovel
- itemDetailsID = 254; break;
- case 2214: // Sledge Hammer
- itemDetailsID = 257; break;
- case 2215: // Smith's Hammer
- itemDetailsID = 256; break;
- case 2216: // Tongs
- itemDetailsID = 253; break;
- case 2217: // Tool Kit (Tinker's tools)
- itemDetailsID = 213; break;
- case 2218: // Fletcher's Tools
- itemDetailsID = 284; break;
- // Page 3 - Parts
- case 2300: // Barrel Hoops
- itemDetailsID = 224; break;
- case 2301: // Barrel Tap
- itemDetailsID = 221; break;
- case 2302: // Clock parts
- itemDetailsID = 220; break;
- case 2303: // Gears
- itemDetailsID = 219; break;
- case 2304: // Hinge
- itemDetailsID = 225; break;
- case 2305: // Sextant parts
- itemDetailsID = 223; break;
- case 2306: // Springs
- itemDetailsID = 222; break;
- // Page 4 - Utensils
- case 2400: // Butcher Knife
- itemDetailsID = 226; break;
- case 2401: // Cleaver
- itemDetailsID = 232; break;
- case 2402: // Fork
- itemDetailsID = 230; break;
- case 2403: // Fork
- itemDetailsID = 231; break;
- case 2404: // Goblet
- itemDetailsID = 235; break;
- case 2405: // Knife
- itemDetailsID = 233; break;
- case 2406: // Knife
- itemDetailsID = 234; break;
- case 2407: // Pewter Mug
- itemDetailsID = 236; break;
- case 2408: // Plate
- itemDetailsID = 229; break;
- case 2409: // Skinning Knife
- itemDetailsID = 237; break;
- case 2410: // Spoon
- itemDetailsID = 227; break;
- case 2411: // Spoon
- itemDetailsID = 228; break;
- // Page 5 - Jewelry
- case 2500: // Bracelet
- itemDetailsID = 243; break;
- case 2501: // Earrings
- itemDetailsID = 241; break;
- case 2502: // Necklage (Golden beads)
- itemDetailsID = 239; break;
- case 2503: // Necklace (Silver beads)
- itemDetailsID = 240; break;
- case 2504: // Necklace (Round)
- itemDetailsID = 242; break;
- case 2505: // Weddingband (newbiefied)
- itemDetailsID = 238; break;
- // Page 6 - Miscellaneous
- case 2600: // Candelabra
- itemDetailsID = 245; break;
- case 2601: // Globe
- itemDetailsID = 248; break;
- case 2602: // Heating stand
- itemDetailsID = 251; break;
- case 2603: // Iron Key
- itemDetailsID = 247; break;
- case 2604: // Keyring
- itemDetailsID = 244; break;
- case 2605: // Lantern
- itemDetailsID = 250; break;
- case 2606: // Scales
- itemDetailsID = 246; break;
- case 2607: // Spy glass
- itemDetailsID = 249; break;
- // Page 7 - Multi-Component Items
- case 2700: // Axle and Gears
- itemDetailsID = 275; break;
- case 2701: // Clock
- itemDetailsID = 276; break;
- case 2702: // Clock
- itemDetailsID = 277; break;
- case 2703: // Clock Parts
- itemDetailsID = 278; break;
- case 2704: // Potion Keg
- itemDetailsID = 281; break;
- case 2705: // Sextant
- itemDetailsID = 282; break;
- case 2706: // Sextant Parts
- itemDetailsID = 283; break;
- // Page 8 - Candles
- case 2800: // Candelabra
- itemDetailsID = 245; break;
- case 2801: // Standing Candelabra
- itemDetailsID = 310; break;
- case 2802: // Regular Candle
- itemDetailsID = 315; break;
- case 2803: // Round Candle
- itemDetailsID = 312; break;
- case 2804: // Skull with Candle
- itemDetailsID = 316; break;
- case 2805: // Small Candle
- itemDetailsID = 314; break;
- case 2806: // Tall Candle
- itemDetailsID = 311; break;
- case 2807: // Thick Candle
- itemDetailsID = 313; break;
- // Page 9 - Traps
- case 2900: // Dart Trap
- itemDetailsID = 261; break;
- case 2901: // Explosion Trap
- itemDetailsID = 263; break;
- case 2902: // Poison Trap
- itemDetailsID = 262; break;
- default:
- break;
+ var subPage2 = pButton - 9000;
+ var pageNum2 = pUser.GetTempTag( "page" );
+ pUser.SetTempTag( "subPage", subPage2 );
+ PageX( socket, pUser, pageNum2 );
+ return;
+ }
+
+ // Page tabs (1–9)
+ if( pButton >= 1 && pButton <= 9 )
+ {
+ pUser.SetTempTag( "page", pButton );
+ pUser.SetTempTag( "subPage", 1 );
+ PageX( socket, pUser, pButton );
+ return;
+ }
+
+ // Last Ten (if you add a tab that sends 11000)
+ if( pButton == 11000 )
+ {
+ pUser.SetTempTag( "page", 999 );
+ pUser.SetTempTag( "subPage", 1 );
+ PageX( socket, pUser, 999 );
+ return;
+ }
+
+ // Close gump
+ if( pButton == 0 )
+ {
+ pUser.SetTempTag( "MakeLast_Tinkering", null );
+ pUser.SetTempTag( "CRAFT", null );
+ socket.CloseGump( gumpID, 0 );
+ return;
+ }
+
+ // Make Last
+ if( pButton == 5000 )
+ {
+ var last = pUser.GetTempTag( "MakeLast_Tinkering" );
+ if( last )
+ pButton = last;
+ else
+ return;
}
- if( makeID != 0 )
+ var makeID = 0;
+ var timerID = 0;
+
+ // Craft buttons use makeID directly
+ if( TinkeringMap[pButton] != undefined )
{
- if(( pButton >= 500 && pButton <= 505 ))
+ makeID = pButton;
+ var data = TinkeringMap[makeID];
+ timerID = data.timerID || 1;
+
+ // Era / recipe checks
+ if( !eraOK( data ))
+ {
+ socket.SysMessage( "That item is not available in this era." );
+ return;
+ }
+
+ if( data.recipeID && !TriggerEvent( 4022, "NeedRecipe", pUser, data.recipeID ))
+ {
+ socket.SysMessage( "You must learn that recipe from a scroll." );
+ return;
+ }
+
+ // Jewelry that needs gem targeting
+ if( data.requiresGemTarget )
{
- // Ask crafter which material to use
pUser.SetTempTag( "makeID", makeID );
pUser.SetTempTag( "timerID", timerID );
- pUser.AddScriptTrigger( 4033 );
- pSock.CustomTarget( 2, GetDictionaryEntry( 12008, pSock.language )); // Select material to use:
+ pUser.AddScriptTrigger( 4033 ); // crafting_complete.js
+ socket.CustomTarget( 2, GetDictionaryEntry( 12008, socket.language )); // Select material to use:
return;
}
- MakeItem( pSock, pUser, makeID );
+ // Normal craft
+ pUser.SetTempTag( "MakeLast_Tinkering", makeID );
+
+ MakeItem( socket, pUser, makeID );
+ AddToLastTen( pUser, makeID );
+
if( GetServerSetting( "ToolUseLimit" ))
{
- bItem.usesLeft -= 1;
- if( bItem.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
+ tool.usesLeft -= 1;
+ if( tool.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
{
- bItem.Delete();
- pSock.SysMessage( GetDictionaryEntry( 10202, pSock.language )); // You have worn out your tool!
- // Play sound effect of tool breaking
+ tool.Delete();
+ socket.SysMessage( GetDictionaryEntry( 10202, socket.language )); // You have worn out your tool!
}
- }
- pUser.StartTimer( gumpDelay, timerID, true );
+ }
+
+ pUser.StartTimer( gumpDelay, timerID, tinkeringID );
+ return;
}
- else if( itemDetailsID != 0 )
+
+ // Detail buttons: 20000 + makeID
+ if( pButton >= 20000 && pButton < 30000 )
{
- pUser.SetTempTag( "ITEMDETAILS", itemDetailsID );
- TriggerEvent( itemDetailsScriptID, "ItemDetailGump", pUser );
+ var detailMakeID = pButton - 20000;
+ var entry = TinkeringMap[detailMakeID];
+
+ if( entry )
+ {
+ // Which item details to show
+ pUser.SetTempTag( "ITEMDETAILS", detailMakeID );
+
+ // Skill used
+ pUser.SetTempTag( "Skill", entry.skill || tinkeringSkillID );
+
+ // Clear old harvest tags
+ pUser.SetTempTag( "Harvest", null );
+ pUser.SetTempTag( "Harvest2", null );
+ pUser.SetTempTag( "Harvest3", null );
+ pUser.SetTempTag( "Harvest4", null );
+
+ // Clear old custom harvest names
+ pUser.SetTempTag( "HarvestName", null );
+ pUser.SetTempTag( "Harvest2Name", null );
+ pUser.SetTempTag( "Harvest3Name", null );
+ pUser.SetTempTag( "Harvest4Name", null );
+
+ // Optional harvest dictIDs
+ if( entry.harvest && entry.harvest.length > 0 )
+ {
+ if( entry.harvest.length >= 1 )
+ pUser.SetTempTag( "Harvest", entry.harvest[0] );
+ if( entry.harvest.length >= 2 )
+ pUser.SetTempTag( "Harvest2", entry.harvest[1] );
+ if( entry.harvest.length >= 3 )
+ pUser.SetTempTag( "Harvest3", entry.harvest[2] );
+ if( entry.harvest.length >= 4 )
+ pUser.SetTempTag( "Harvest4", entry.harvest[3] );
+ }
+
+ // Optional custom names – plugs into your ItemDetail custom harvest name logic
+ if( entry.harvestNames && entry.harvestNames.length > 0 )
+ {
+ if( entry.harvestNames.length >= 1 )
+ pUser.SetTempTag( "HarvestName", entry.harvestNames[0] );
+ if( entry.harvestNames.length >= 2 )
+ pUser.SetTempTag( "Harvest2Name", entry.harvestNames[1] );
+ if( entry.harvestNames.length >= 3 )
+ pUser.SetTempTag( "Harvest3Name", entry.harvestNames[2] );
+ if( entry.harvestNames.length >= 4 )
+ pUser.SetTempTag( "Harvest4Name", entry.harvestNames[3] );
+ }
+
+ if( entry.recipeID && entry.recipeID > 0 )
+ pUser.SetTempTag( "needRecipeID", entry.recipeID );
+ else
+ pUser.SetTempTag( "needRecipeID", 0 );
+
+ TriggerEvent( itemDetailsScriptID, "ItemDetailGump", pUser );
+ }
+ return;
}
}
-/** @type { ( tSock: Socket, target: Character | Item | null ) => void } */
+/** @type { ( pSock: Socket, targObj: Character | Item | null ) => void } */
function onCallback2( pSock, targObj )
{
var pUser = pSock.currentChar;
@@ -540,61 +505,109 @@ function onCallback2( pSock, targObj )
return;
// Fetch makeID and timerID from temp tag
- var makeID = pUser.GetTempTag( "makeID" );
+ var makeID = pUser.GetTempTag( "makeID" );
var timerID = pUser.GetTempTag( "timerID" );
pUser.SetTempTag( "makeID", null );
pUser.SetTempTag( "timerID", null );
var bItem = pSock.tempObj; // tool
- if( ValidateObject( bItem ))
+ if( !ValidateObject( bItem ))
+ return;
+
+ if( ValidateObject( targObj ) && targObj.isItem )
{
- if( ValidateObject( targObj ) && targObj.isItem )
+ // Make sure targeted item is in player's backpack
+ var iPackOwner = GetPackOwner( targObj, 0 );
+ if( ValidateObject( iPackOwner ))
{
- // Make sure targeted item is in player's backpack
- var iPackOwner = GetPackOwner( targObj, 0 );
- if( ValidateObject( iPackOwner )) // Is the item in a backpack?
- {
- if( iPackOwner.serial != pUser.serial ) // And if so does the pack belong to the user?
- {
- pSock.SysMessage( GetDictionaryEntry( 6032, pSock.language )); // That resource is in someone else's backpack!
- return;
- }
- }
- else
+ if( iPackOwner.serial != pUser.serial )
{
- pSock.SysMessage( GetDictionaryEntry( 6022, pSock.language )); // This has to be in your backpack before you can use it.
+ pSock.SysMessage( GetDictionaryEntry( 6032, pSock.language )); // That resource is in someone else's backpack!
return;
}
+ }
+ else
+ {
+ pSock.SysMessage( GetDictionaryEntry( 6022, pSock.language )); // This has to be in your backpack before you can use it.
+ return;
+ }
- if( makeID >= 238 && makeID <= 243 )
+ // Jewelry: verify gem
+ if( makeID >= 238 && makeID <= 243 )
+ {
+ var resourceType = TriggerEvent( 2506, "GetResourceType", targObj.id );
+ if( resourceType != "gems" )
{
- // Jewlery
- var resourceType = TriggerEvent( 2506, "GetResourceType", targObj.id );
- if( resourceType != "gems" )
- {
- pSock.SysMessage( GetDictionaryEntry( 12007, pSock.language )); // That's not a gem resource!
- return;
- }
-
- // Set a temporary tag on character with ID of selected gem
- // We'll check for this ID in the crafting process, and remove it
- // in the onMakeItem event script (crafting_complete.js)
- pUser.SetTempTag( "targetedSubResourceId", targObj.id );
- pUser.SetTempTag( "targetedSubResourceName", targObj.name );
+ pSock.SysMessage( GetDictionaryEntry( 12007, pSock.language )); // That's not a gem resource!
+ return;
}
- MakeItem( pSock, pUser, makeID );
- if( GetServerSetting( "ToolUseLimit" ))
+ // Tags used by crafting_complete.js
+ pUser.SetTempTag( "targetedSubResourceId", targObj.id );
+ pUser.SetTempTag( "targetedSubResourceName", targObj.name );
+ }
+
+ MakeItem( pSock, pUser, makeID );
+ AddToLastTen( pUser, makeID );
+
+ if( GetServerSetting( "ToolUseLimit" ))
+ {
+ bItem.usesLeft -= 1;
+ if( bItem.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
{
- bItem.usesLeft -= 1;
- if( bItem.usesLeft == 0 && GetServerSetting( "ToolUseBreak" ))
- {
- bItem.Delete();
- pSock.SysMessage( GetDictionaryEntry( 10202, pSock.language )); // You have worn out your tool!
- // Play sound effect of tool breaking
- }
+ bItem.Delete();
+ pSock.SysMessage( GetDictionaryEntry( 10202, pSock.language )); // You have worn out your tool!
}
- pUser.StartTimer( gumpDelay, timerID, true );
+ }
+ pUser.StartTimer( gumpDelay, timerID, tinkeringID );
+ }
+}
+
+function AddToLastTen( pUser, makeID )
+{
+ var raw = pUser.GetTempTag( "LastTenTinkering" ) || "";
+ var list = raw.split( "," );
+
+ for( var i = 0; i < list.length; i++ )
+ {
+ if( parseInt( list[i] ) == makeID )
+ {
+ list.splice( i, 1 );
+ break;
}
}
+
+ var newList = [ makeID ];
+ for( var j = 0; j < list.length && newList.length < 10; j++ )
+ {
+ var entry = parseInt( list[j] );
+ if( !isNaN( entry ) && entry > 0 )
+ newList.push( entry );
+ }
+
+ pUser.SetTempTag( "LastTenTinkering", newList.join( "," ) );
+}
+
+function HasLearnedRecipe( pUser, recipeID )
+{
+ var myData = TriggerEvent( 4022, "ReadRecipeID", pUser );
+ if( !myData || myData.length == 0 )
+ return false;
+
+ for( var i = 0; i < myData.length; i++ )
+ {
+ var data = myData[i].split( "," );
+ if( data[0] == recipeID )
+ return true;
+ }
+ return false;
+}
+
+function eraOK( entry )
+{
+ if( entry.minEra && coreShardEra < EraStringToNum( entry.minEra ))
+ return false;
+ if( entry.maxEra && coreShardEra > EraStringToNum( entry.maxEra ))
+ return false;
+ return true;
}
diff --git a/docs/index.html b/docs/index.html
index 287904d4d..343406068 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6040,6 +6040,456 @@
Rank System
Calculation of rank takes place as part of the crafting process. First, a range of potential ranks is determined based on the values of the MINRANK and MAXRANK tags for an item in the create DFNs. Then, for each skill required to craft the item, the system calculates a temporary rank based on the player's skill, random chance, and a UOX.INI setting (SKILLLEVEL=7) which acts as a global modifier to the system to make it easier (low SKILLLEVEL value) to get high rank items, or harder (high SKILLLEVEL value) to get high rank items. A value of 10 makes the difficulty roughly similar to the difficulty of the official UO shards around the LBR era.
When a temporary rank has been calculated for all skills required to craft the item, the average of all these is chosen as the item's final rank, and the modifiers are permanently applied to the item's properties.
+
JSON Crafting Data
+
In addition to the older DFN-based create system, UOX3 can use JSON files to control the visible crafting menu data. The JSON files do not replace the actual CreateEntry definitions that decide what item is made, what resources are consumed, and what skills are checked. Instead, they make the crafting menus easier to organize, customize and extend without editing the crafting scripts directly.
+
+
The JSON crafting files are stored in:
+
js/jsdata/crafting/
+
+
+
+
+
+
alchemy.json - Alchemy menu entries
+
blacksmithing.json - Blacksmithing menu entries
+
carpentry.json - Carpentry menu entries
+
cartography.json - Cartography menu entries
+
cooking.json - Cooking menu entries
+
fletching.json - Bowcraft/Fletching menu entries
+
glassblowing.json - Glassblowing menu entries
+
masonry.json - Masonry menu entries
+
tailoring.json - Tailoring menu entries
+
tinkering.json - Tinkering menu entries
+
resourcemap.json - Shared resource definitions used by crafting menus
+
+
+
+
Why Use JSON Crafting Data?
+
The JSON crafting system makes crafting easier to maintain. Shard admins can move items between pages, rename menu entries, add custom labels, add era limits, add recipe requirements, define item detail resources and configure some special post-crafting behavior without digging through the crafting scripts.
+
+
+
Move an item to a different crafting page by changing its page value.
+
Change the order of items by changing their position or button mapping in the JSON file.
+
Use dictID for dictionary-based names, or customName for a custom display name.
+
Add recipe locks with recipeID.
+
Add expansion or era limits with minEra and maxEra.
+
Show custom resource names in the item detail gump with harvest and harvestNames.
+
Define special post-craft behavior with craftComplete.
+
Update resource lists, hues, dictionary labels and skill gates through resourcemap.json.
This entry adds a craftable item to the menu. The makeID points to the CreateEntry that actually creates the item. The dictID is used for the displayed name, page decides which menu page the item appears on and timerID decides which page reopens after crafting.
+
+
+
Craft Entry Fields
+
Each crafting JSON file is an array of craft entries. Most entries use only a few fields, but more can be added when needed.
+
+
+
+
+
+
makeID: number
+ The CreateEntry ID used when the player crafts the item. This must match a valid entry from the create system.
+
+
+
+
buttonID: number
+ Optional menu button ID used by crafting skills that need one visible row to map to different makeIDs based on the selected resource. Blacksmithing and Masonry commonly use this style.
+
+
+
+
dictID: number
+ Dictionary entry used for the menu text. This allows the crafting menu to use UOX3 dictionary files for display names.
+
+
+
+
label: text
+ A readable label for admins editing the JSON file. This is useful so the item can be identified without looking up the dictionary ID. It does not have to be the final in-game item name.
+
+
+
+
customName: text
+ Overrides the dictionary text shown in the crafting menu. Use this for custom items that do not have a dictionary entry.
+
+
+
+
page: number
+ The crafting page the entry appears on. Changing this value moves the item to another page in the crafting menu.
+
+
+
+
timerID: number
+ The page/timer value used when the crafting menu reopens after crafting or after a failed attempt.
+
+
+
+
skill: number
+ Optional skill ID override used by the item detail gump and menu logic. If omitted, the crafting script uses the default skill for that craft.
+
+
+
+
harvest: number array
+ Dictionary IDs used to show resource names in the item detail gump. This does not consume resources by itself; the actual resource requirements still come from the CreateEntry.
+
+
+
+
harvestNames: text array
+ Optional custom resource labels for the item detail gump. Use this when a resource name should be clearer than the dictionary entry.
+
+
+
+
recipeID: number
+ Optional recipe requirement. If set, the player must know the recipe before crafting the item.
+
+
+
+
minEra: text
+ Optional minimum shard era required before the entry appears or can be crafted.
+
+
+
+
maxEra: text
+ Optional maximum shard era allowed before the entry is hidden or blocked.
+
+
+
+
requiresGemTarget: true/false
+ Used by Tinkering jewelry entries that require the player to target a gem before crafting.
+
+
+
+
oreMake: number array
+ Used by Blacksmithing entries where one visible menu row can craft different CreateEntries based on the selected ore type.
+
+
+
+
graniteMake: number array
+ Used by Masonry entries where one visible menu row can craft different CreateEntries based on the selected granite type.
+
+
+
+
craftComplete: object
+ Optional post-crafting behavior. This lets the JSON entry request special handling after the item is successfully crafted.
+
+
+
+
Era Restrictions
+
Craft entries can be limited by shard era. This is useful for keeping newer content hidden on older-era shards.
This entry only appears when the shard era is Stygian Abyss or later.
+
+
+
Common era values include:
+
t2a, uor, lbr, aos, se, ml, sa, hs, tol
+
+
Recipe Locked Crafting
+
An entry with a recipeID requires the player to know that recipe before the item can be crafted. This allows custom shards to add rare recipe scrolls or progression-based unlocks without changing the menu script.
The menu will display hollow prism instead of looking up a dictionary entry.
+
+
+
Item Detail Resources
+
The harvest field controls what resource names are shown in the item detail gump. This is for display only. The real resource amounts and item IDs still come from the CreateEntry in the create system.
This entry crafts a bracelet, requires a gem target and uses the selected gem name as part of the crafted item's name.
+
+
+
Blacksmithing and Masonry Resource Variants
+
Some crafting menus have one visible menu row, but the final CreateEntry changes depending on the selected resource. Blacksmithing uses oreMake, while Masonry uses graniteMake.
The first value is used for iron, the second for dull copper, the third for shadow iron and so on. The resource order comes from resourcemap.json.
+
+
+
Resource Map
+
The file resourcemap.json defines resource sets used by the crafting menus. It controls the resource display name, item ID, hue, selected resource index and optional skill requirement for resource selection menus.
This defines selectable ore types for crafting menus. The menu can count the player's matching resources by using the item ID and hue from the selected entry.
+
+
+
+
+
+
+
resourceSet: text
+ Unique name for this resource group. Examples: ore, granite, dragonScales, wood, tailoring.
+
+
+
+
label: text
+ Readable label for admins editing the resource map.
+
+
+
+
dictID: number
+ Optional default dictionary entry for the resource set.
+
+
+
+
tempTag: text
+ Temp tag used to remember the player's selected resource. Examples: ORE, Granite, Scale.
+
+
+
+
defaultIndex: number
+ Which resource index is used if the player has not selected anything yet.
+
+
+
+
items: array
+ List of resources in the set. Each item can define index, label, dictID, itemID, hue and minSkill.
+
+
+
+
itemID: number
+ Item ID used when counting the player's resources.
+
+
+
+
hue: number
+ Item hue used when counting the player's resources. Use 0 for normal uncolored resources.
+
+
+
+
minSkill: number
+ Optional skill requirement for selecting this resource. For ores this is usually Mining skill. For scales this can be Blacksmithing skill or left at 0.
+
+
+
+
Grouped Resources
+
Some resource sets count more than one item ID. For example, wood can count both logs and boards, and tailoring can count leather and hides. These grouped resources do not need an index for every item because the menu adds them together.
This entry adds a custom item to a crafting page, gives it a custom menu name, requires a recipe, limits it to Mondain's Legacy or later and gives clearer resource names in the detail gump.
+
+
+
Adding a New Resource
+
To add a new selectable resource such as a new ore, granite or scale type, add a new item entry to the correct resource set in resourcemap.json. The new entry should have a unique index, display label, dictionary ID, item ID, hue and skill requirement.