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

Browse source
This commit is contained in:
mark 2008-05-29 03:57:42 +00:00
parent e41632fe95
commit 9c5abc3b0d
48 changed files with 261 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
namespace Server.Engines.Craft
{
@ -12,14 +13,14 @@ namespace Server.Engines.Craft
public class CraftContext
{
private ArrayList m_Items;
private List<CraftItem> m_Items;
private int m_LastResourceIndex;
private int m_LastResourceIndex2;
private int m_LastGroupIndex;
private bool m_DoNotColor;
private CraftMarkOption m_MarkOption;
public ArrayList Items{ get{ return m_Items; } }
public List<CraftItem> Items { get { return m_Items; } }
public int LastResourceIndex{ get{ return m_LastResourceIndex; } set{ m_LastResourceIndex = value; } }
public int LastResourceIndex2{ get{ return m_LastResourceIndex2; } set{ m_LastResourceIndex2 = value; } }
public int LastGroupIndex{ get{ return m_LastGroupIndex; } set{ m_LastGroupIndex = value; } }
@ -28,7 +29,7 @@ namespace Server.Engines.Craft
public CraftContext()
{
m_Items = new ArrayList();
m_Items = new List<CraftItem>();
m_LastResourceIndex = -1;
m_LastResourceIndex2 = -1;
m_LastGroupIndex = -1;
@ -39,7 +40,7 @@ namespace Server.Engines.Craft
get
{
if ( m_Items.Count > 0 )
return (CraftItem)m_Items[0];
return m_Items[0];
return null;
}

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

@ -188,14 +188,14 @@ namespace Server.Engines.Craft
CreateGroupList();
if ( page == CraftPage.PickResource )
CreateResList( false );
CreateResList( false, from );
else if ( page == CraftPage.PickResource2 )
CreateResList( true );
CreateResList( true, from );
else if ( context != null && context.LastGroupIndex > -1 )
CreateItemList( context.LastGroupIndex );
}
public void CreateResList( bool opt )
public void CreateResList( bool opt, Mobile from )
{
CraftSubResCol res = ( opt ? m_CraftSystem.CraftSubRes2 : m_CraftSystem.CraftSubRes );
@ -221,12 +221,22 @@ namespace Server.Engines.Craft
AddHtmlLocalized( 255, 263, 200, 18, (context == null || !context.DoNotColor) ? 1061591 : 1061590, LabelColor, false, false );
}
int resourceCount = 0;
if ( from.Backpack != null )
{
Item[] items = from.Backpack.FindItemsByType( subResource.ItemType, true );
for ( int j = 0; j < items.Length; ++j )
resourceCount += items[j].Amount;
}
AddButton( 220, 60 + (index * 20), 4005, 4007, GetButtonID( 5, i ), GumpButtonType.Reply, 0 );
if ( subResource.NameNumber > 0 )
AddHtmlLocalized( 255, 63 + (index * 20), 250, 18, subResource.NameNumber, LabelColor, false, false );
AddHtmlLocalized( 255, 63 + (index * 20), 250, 18, subResource.NameNumber, resourceCount.ToString(), LabelColor, false, false );
else
AddLabel( 255, 60 + (index * 20), LabelHue, subResource.NameString );
AddLabel( 255, 60 + ( index * 20 ), LabelHue, String.Format( "{0} ({1})", subResource.NameString, resourceCount ) );
}
}
@ -237,7 +247,7 @@ namespace Server.Engines.Craft
if ( context == null )
return;
ArrayList items = context.Items;
List<CraftItem> items = context.Items;
if ( items.Count > 0 )
{
@ -245,7 +255,7 @@ namespace Server.Engines.Craft
{
int index = i % 10;
CraftItem craftItem = (CraftItem)items[i];
CraftItem craftItem = items[i];
if ( index == 0 )
{
@ -449,10 +459,10 @@ namespace Server.Engines.Craft
if ( context == null )
break;
ArrayList lastTen = context.Items;
List<CraftItem> lastTen = context.Items;
if ( index >= 0 && index < lastTen.Count )
CraftItem( (CraftItem)lastTen[index] );
CraftItem( lastTen[index] );
break;
}
@ -461,10 +471,10 @@ namespace Server.Engines.Craft
if ( context == null )
break;
ArrayList lastTen = context.Items;
List<CraftItem> lastTen = context.Items;
if ( index >= 0 && index < lastTen.Count )
m_From.SendGump( new CraftGumpItem( m_From, system, (CraftItem)lastTen[index], m_Tool ) );
m_From.SendGump( new CraftGumpItem( m_From, system, lastTen[index], m_Tool ) );
break;
}

4
Scripts/Engines/Spawner/Spawner.cs
View file

@ -709,7 +709,7 @@ namespace Server.Mobiles
private class WarnTimer : Timer
{
private ArrayList m_List;
private List<WarnEntry> m_List;
private class WarnEntry
{
@ -727,7 +727,7 @@ namespace Server.Mobiles
public WarnTimer() : base( TimeSpan.FromSeconds( 1.0 ) )
{
m_List = new ArrayList();
m_List = new List<WarnEntry>();
Start();
}