warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Partial Branch Sync

Browse source
This commit is contained in:
mark 2007-08-27 08:49:15 +00:00
parent 4718a4b911
commit 1ef98f10ec
32 changed files with 166 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Scripts/Engines/Craft/Core/CraftGump.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.Gumps;
using Server.Network;
using Server.Items;
@ -116,20 +117,33 @@ namespace Server.Engines.Craft
int resIndex = ( context == null ? -1 : context.LastResourceIndex );
Type resourceType = craftSystem.CraftSubRes.ResType;
if ( resIndex > -1 )
{
CraftSubRes subResource = craftSystem.CraftSubRes.GetAt( resIndex );
nameString = subResource.NameString;
nameNumber = subResource.NameNumber;
resourceType = subResource.ItemType;
}
int resourceCount = 0;
if ( from.Backpack != null )
{
Item[] items = from.Backpack.FindItemsByType( resourceType, true );
for ( int i = 0; i < items.Length; ++i )
resourceCount += items[i].Amount;
}
AddButton( 15, 362, 4005, 4007, GetButtonID( 6, 0 ), GumpButtonType.Reply, 0 );
if ( nameNumber > 0 )
AddHtmlLocalized( 50, 365, 250, 18, nameNumber, LabelColor, false, false );
AddHtmlLocalized( 50, 365, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false );
else
AddLabel( 50, 362, LabelHue, nameString );
AddLabel( 50, 362, LabelHue, String.Format( "{0} ({1} Available)", nameString, resourceCount ) );
}
// ****************************************
@ -141,20 +155,33 @@ namespace Server.Engines.Craft
int resIndex = ( context == null ? -1 : context.LastResourceIndex2 );
Type resourceType = craftSystem.CraftSubRes.ResType;
if ( resIndex > -1 )
{
CraftSubRes subResource = craftSystem.CraftSubRes2.GetAt( resIndex );
nameString = subResource.NameString;
nameNumber = subResource.NameNumber;
resourceType = subResource.ItemType;
}
int resourceCount = 0;
if ( from.Backpack != null )
{
Item[] items = from.Backpack.FindItemsByType( resourceType, true );
for ( int i = 0; i < items.Length; ++i )
resourceCount += items[i].Amount;
}
AddButton( 15, 382, 4005, 4007, GetButtonID( 6, 7 ), GumpButtonType.Reply, 0 );
if ( nameNumber > 0 )
AddHtmlLocalized( 50, 385, 250, 18, nameNumber, LabelColor, false, false );
AddHtmlLocalized( 50, 385, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false );
else
AddLabel( 50, 385, LabelHue, nameString );
AddLabel( 50, 385, LabelHue, String.Format( "{0} ({1} Available)", nameString, resourceCount ) );
}
// ****************************************

9
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -624,15 +624,6 @@ namespace Server.Engines.Craft
if ( types[i] == null )
types[i] = new Type[]{ baseType };
/*if ( !retainedColor && RetainsColorFrom( craftSystem, baseType ) )
{
retainedColor = true;
Item resItem = ourPack.FindItemByType( types[i] );
if ( resItem != null )
resHue = resItem.Hue;
}*/
amounts[i] = craftRes.Amount;
// For stackable items that can ben crafted more than one at a time

2
Scripts/Engines/RemoteAdmin/Network.cs
View file

@ -5,7 +5,7 @@ using System.Collections;
using Server.Accounting;
using Server.Network;
namespace Server.Admin
namespace Server.RemoteAdmin
{
public class AdminNetwork
{

2
Scripts/Engines/RemoteAdmin/PacketHandlers.cs
View file

@ -6,7 +6,7 @@ using Server.Accounting;
using Server.Items;
using Server.Mobiles;
namespace Server.Admin
namespace Server.RemoteAdmin
{
public class RemoteAdminHandlers
{

2
Scripts/Engines/RemoteAdmin/Packets.cs
View file

@ -6,7 +6,7 @@ using Server.Network;
using Server.Accounting;
using Server.Commands;
namespace Server.Admin
namespace Server.RemoteAdmin
{
public enum LoginResponse : byte
{

2
Scripts/Engines/Reports/Reports.cs
View file

@ -418,4 +418,4 @@ namespace Server.Engines.Reports
return report;
}
}
}
}