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

Generic-y goodness. Or hatred. You choose.

Browse source
This commit is contained in:
asayre 2006-06-21 08:02:49 +00:00
parent 8737c38c85
commit c5027649a1
9 changed files with 105 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Scripts/Items/Addons/BallotBox.cs
View file

@ -5,6 +5,7 @@ using Server.Multis;
using Server.Gumps;
using Server.Network;
using Server.Prompts;
using System.Collections.Generic;
namespace Server.Items
{
@ -15,20 +16,20 @@ namespace Server.Items
public override int LabelNumber{ get{ return 1041006; } } // a ballot box
private string[] m_Topic;
private ArrayList m_Yes;
private ArrayList m_No;
private List<Mobile> m_Yes;
private List<Mobile> m_No;
public string[] Topic
{
get{ return m_Topic; }
}
public ArrayList Yes
public List<Mobile> Yes
{
get{ return m_Yes; }
}
public ArrayList No
public List<Mobile> No
{
get{ return m_No; }
}
@ -37,8 +38,8 @@ namespace Server.Items
public BallotBox() : base( 0x9A8 )
{
m_Topic = new string[0];
m_Yes = new ArrayList();
m_No = new ArrayList();
m_Yes = new List<Mobile>();
m_No = new List<Mobile>();
}
public BallotBox( Serial serial ) : base( serial )
@ -311,8 +312,8 @@ namespace Server.Items
for ( int i = 0; i < m_Topic.Length; i++ )
writer.Write( (string) m_Topic[i] );
writer.WriteMobileList( m_Yes, true );
writer.WriteMobileList( m_No, true );
writer.Write( m_Yes, true );
writer.Write( m_No, true );
}
public override void Deserialize( GenericReader reader )
@ -326,8 +327,8 @@ namespace Server.Items
for ( int i = 0; i < m_Topic.Length; i++ )
m_Topic[i] = reader.ReadString();
m_Yes = reader.ReadMobileList();
m_No = reader.ReadMobileList();
m_Yes = reader.ReadStrongMobileList();
m_No = reader.ReadStrongMobileList();
}
}

12
Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
private Mobile m_Owner;
private bool m_Temporary;
private ArrayList m_Guardians;
private List<Mobile> m_Guardians;
[CommandProperty( AccessLevel.GameMaster )]
public int Level{ get{ return m_Level; } set{ m_Level = value; } }
@ -47,7 +47,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Temporary{ get{ return m_Temporary; } set{ m_Temporary = value; } }
public ArrayList Guardians{ get{ return m_Guardians; } }
public List<Mobile> Guardians { get { return m_Guardians; } }
[Constructable]
public TreasureMapChest( int level ) : this( null, level, false )
@ -61,7 +61,7 @@ namespace Server.Items
m_DeleteTime = DateTime.Now + TimeSpan.FromHours( 3.0 );
m_Temporary = temporary;
m_Guardians = new ArrayList();
m_Guardians = new List<Mobile>();
m_Timer = new DeleteTimer( this, m_DeleteTime );
m_Timer.Start();
@ -342,7 +342,7 @@ namespace Server.Items
writer.Write( (int) 2 ); // version
writer.WriteMobileList( m_Guardians, true );
writer.Write( m_Guardians, true );
writer.Write( (bool) m_Temporary );
writer.Write( m_Owner );
@ -362,7 +362,7 @@ namespace Server.Items
{
case 2:
{
m_Guardians = reader.ReadMobileList();
m_Guardians = reader.ReadStrongMobileList();
m_Temporary = reader.ReadBool();
goto case 1;
@ -380,7 +380,7 @@ namespace Server.Items
m_Lifted = reader.ReadItemList();
if ( version < 2 )
m_Guardians = new ArrayList();
m_Guardians = new List<Mobile>();
break;
}

17
Scripts/Items/Misc/CommunicationCrystals.cs
View file

@ -3,6 +3,7 @@ using System.Collections;
using Server;
using Server.Network;
using Server.Targeting;
using System.Collections.Generic;
namespace Server.Items
{
@ -51,7 +52,7 @@ namespace Server.Items
public override int LabelNumber{ get{ return 1060740; } } // communication crystal
private int m_Charges;
private ArrayList m_Receivers;
private List<ReceiverCrystal> m_Receivers;
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
@ -75,7 +76,7 @@ namespace Server.Items
}
}
public ArrayList Receivers
public List<ReceiverCrystal> Receivers
{
get{ return m_Receivers; }
}
@ -92,7 +93,7 @@ namespace Server.Items
m_Charges = charges;
m_Receivers = new ArrayList();
m_Receivers = new List<ReceiverCrystal>();
}
public BroadcastCrystal( Serial serial ) : base( serial )
@ -233,7 +234,7 @@ namespace Server.Items
}
else if ( targeted == from )
{
foreach ( ReceiverCrystal receiver in new ArrayList( m_Crystal.Receivers ) )
foreach( ReceiverCrystal receiver in new List<ReceiverCrystal>( m_Crystal.Receivers ) )
{
receiver.Sender = null;
}
@ -286,7 +287,7 @@ namespace Server.Items
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt( m_Charges );
writer.WriteItemList( m_Receivers );
writer.WriteItemList<ReceiverCrystal>( m_Receivers );
}
public override void Deserialize( GenericReader reader )
@ -296,7 +297,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
m_Charges = reader.ReadEncodedInt();
m_Receivers = reader.ReadItemList();
m_Receivers = reader.ReadStrongItemList<ReceiverCrystal>();
}
}
@ -468,7 +469,7 @@ namespace Server.Items
writer.WriteEncodedInt( 0 ); // version
writer.Write( (Item) m_Sender );
writer.WriteItem<BroadcastCrystal>( m_Sender );
}
public override void Deserialize( GenericReader reader )
@ -477,7 +478,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
m_Sender = (BroadcastCrystal) reader.ReadItem();
m_Sender = reader.ReadItem<BroadcastCrystal>();
}
}
}

15
Scripts/Items/Misc/KeyRing.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections;
using Server;
using Server.Targeting;
using System.Collections.Generic;
namespace Server.Items
{
@ -9,16 +10,16 @@ namespace Server.Items
{
public static readonly int MaxKeys = 20;
private ArrayList m_Keys;
private List<Key> m_Keys;
public ArrayList Keys{ get{ return m_Keys; } }
public List<Key> Keys { get { return m_Keys; } }
[Constructable]
public KeyRing() : base( 0x1011 )
{
Weight = 1.0; // They seem to have no weight on OSI ?!
m_Keys = new ArrayList();
m_Keys = new List<Key>();
}
public override bool OnDragDrop( Mobile from, Item dropped )
@ -131,7 +132,7 @@ namespace Server.Items
for ( int i = m_Keys.Count - 1; i >= 0; i-- )
{
Key key = (Key) m_Keys[i];
Key key = m_Keys[i];
if ( !key.Deleted && !cont.TryDropItem( from, key, true ) )
break;
@ -146,7 +147,7 @@ namespace Server.Items
{
for ( int i = m_Keys.Count - 1; i >= 0; i-- )
{
Key key = (Key) m_Keys[i];
Key key = m_Keys[i];
if ( key.KeyValue == keyValue )
{
@ -191,7 +192,7 @@ namespace Server.Items
writer.WriteEncodedInt( 0 ); // version
writer.WriteItemList( m_Keys );
writer.WriteItemList<Key>( m_Keys );
}
public override void Deserialize( GenericReader reader )
@ -200,7 +201,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
m_Keys = reader.ReadItemList();
m_Keys = reader.ReadStrongItemList<Key>();
}
}
}