From 8150706a3caa49d40de2ec87dbfd613abe2f288b Mon Sep 17 00:00:00 2001 From: asayre Date: Sun, 16 Jul 2006 19:49:58 +0000 Subject: [PATCH] --- .../Collections/CandidateCollection.cs | 199 ----------------- .../Factions/Collections/FactionCollection.cs | 199 ----------------- .../Collections/FactionGuardCollection.cs | 199 ----------------- .../Collections/FactionItemCollection.cs | 199 ----------------- .../Collections/FactionTrapCollection.cs | 199 ----------------- .../Collections/FactionVendorCollection.cs | 199 ----------------- .../Collections/GuardListCollection.cs | 199 ----------------- .../Collections/MonolithCollection.cs | 199 ----------------- .../Collections/PlayerStateCollection.cs | 199 ----------------- .../Factions/Collections/SigilCollection.cs | 199 ----------------- .../Collections/SilverGivenCollection.cs | 199 ----------------- .../Factions/Collections/TownCollection.cs | 199 ----------------- .../Collections/VendorListCollection.cs | 200 ------------------ Scripts/Engines/Factions/Core/Election.cs | 31 +-- Scripts/Engines/Factions/Core/Faction.cs | 65 +++--- Scripts/Engines/Factions/Core/FactionState.cs | 25 +-- Scripts/Engines/Factions/Core/Generator.cs | 7 +- Scripts/Engines/Factions/Core/GuardList.cs | 7 +- Scripts/Engines/Factions/Core/Persistance.cs | 5 +- Scripts/Engines/Factions/Core/PlayerState.cs | 15 +- Scripts/Engines/Factions/Core/Reflector.cs | 19 +- Scripts/Engines/Factions/Core/Town.cs | 43 ++-- Scripts/Engines/Factions/Core/VendorList.cs | 7 +- .../Factions/Gumps/FactionStoneGump.cs | 5 +- Scripts/Engines/Factions/Gumps/FinanceGump.cs | 5 +- Scripts/Engines/Factions/Gumps/SheriffGump.cs | 3 +- .../Engines/Factions/Items/BaseMonolith.cs | 5 +- Scripts/Engines/Factions/Items/Sigil.cs | 5 +- .../Mobiles/Guards/BaseFactionGuard.cs | 2 +- .../Engines/Factions/Mobiles/Guards/Orders.cs | 11 +- Scripts/Engines/Reports/Reports.cs | 13 +- 31 files changed, 145 insertions(+), 2716 deletions(-) delete mode 100644 Scripts/Engines/Factions/Collections/CandidateCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/FactionCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/FactionGuardCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/FactionItemCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/FactionTrapCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/FactionVendorCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/GuardListCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/MonolithCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/PlayerStateCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/SigilCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/SilverGivenCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/TownCollection.cs delete mode 100644 Scripts/Engines/Factions/Collections/VendorListCollection.cs diff --git a/Scripts/Engines/Factions/Collections/CandidateCollection.cs b/Scripts/Engines/Factions/Collections/CandidateCollection.cs deleted file mode 100644 index 93ce4d0f9..000000000 --- a/Scripts/Engines/Factions/Collections/CandidateCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.Candidate. - /// - public class CandidateCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public CandidateCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.Candidate at a specific position in the CandidateCollection. - /// - public Server.Factions.Candidate this[int index] - { - get - { - return ((Server.Factions.Candidate)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.Candidate entry to this collection. - /// - /// Server.Factions.Candidate instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.Candidate value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.Candidate instance is in this collection. - /// - /// Server.Factions.Candidate instance to search for. - /// True if the Server.Factions.Candidate instance is in the collection; otherwise false. - public bool Contains(Server.Factions.Candidate value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.Candidate instance is in this collection. - /// - /// Server.Factions.Candidate instance to find. - /// The zero-based index of the specified Server.Factions.Candidate instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.Candidate value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.Candidate instance from this collection. - /// - /// The Server.Factions.Candidate instance to remove. - public void Remove(Server.Factions.Candidate value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.Candidate instance. - /// - /// An Server.Factions.Candidate's enumerator. - public new CandidateCollectionEnumerator GetEnumerator() - { - return new CandidateCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.Candidate instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.Candidate instance to insert. - public void Insert(int index, Server.Factions.Candidate value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.Candidate. - /// - public class CandidateCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.Candidate _currentElement; - - /// - /// Collection to enumerate. - /// - private CandidateCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal CandidateCollectionEnumerator(CandidateCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.Candidate object in the enumerated CandidateCollection currently indexed by this instance. - /// - public Server.Factions.Candidate Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/FactionCollection.cs b/Scripts/Engines/Factions/Collections/FactionCollection.cs deleted file mode 100644 index afcab53a1..000000000 --- a/Scripts/Engines/Factions/Collections/FactionCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.Faction. - /// - public class FactionCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public FactionCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.Faction at a specific position in the FactionCollection. - /// - public Server.Factions.Faction this[int index] - { - get - { - return ((Server.Factions.Faction)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.Faction entry to this collection. - /// - /// Server.Factions.Faction instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.Faction value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.Faction instance is in this collection. - /// - /// Server.Factions.Faction instance to search for. - /// True if the Server.Factions.Faction instance is in the collection; otherwise false. - public bool Contains(Server.Factions.Faction value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.Faction instance is in this collection. - /// - /// Server.Factions.Faction instance to find. - /// The zero-based index of the specified Server.Factions.Faction instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.Faction value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.Faction instance from this collection. - /// - /// The Server.Factions.Faction instance to remove. - public void Remove(Server.Factions.Faction value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.Faction instance. - /// - /// An Server.Factions.Faction's enumerator. - public new FactionCollectionEnumerator GetEnumerator() - { - return new FactionCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.Faction instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.Faction instance to insert. - public void Insert(int index, Server.Factions.Faction value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.Faction. - /// - public class FactionCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.Faction _currentElement; - - /// - /// Collection to enumerate. - /// - private FactionCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal FactionCollectionEnumerator(FactionCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.Faction object in the enumerated FactionCollection currently indexed by this instance. - /// - public Server.Factions.Faction Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/FactionGuardCollection.cs b/Scripts/Engines/Factions/Collections/FactionGuardCollection.cs deleted file mode 100644 index 24eecfa34..000000000 --- a/Scripts/Engines/Factions/Collections/FactionGuardCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.BaseFactionGuard. - /// - public class FactionGuardCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public FactionGuardCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.BaseFactionGuard at a specific position in the FactionGuardCollection. - /// - public Server.Factions.BaseFactionGuard this[int index] - { - get - { - return ((Server.Factions.BaseFactionGuard)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.BaseFactionGuard entry to this collection. - /// - /// Server.Factions.BaseFactionGuard instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.BaseFactionGuard value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.BaseFactionGuard instance is in this collection. - /// - /// Server.Factions.BaseFactionGuard instance to search for. - /// True if the Server.Factions.BaseFactionGuard instance is in the collection; otherwise false. - public bool Contains(Server.Factions.BaseFactionGuard value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.BaseFactionGuard instance is in this collection. - /// - /// Server.Factions.BaseFactionGuard instance to find. - /// The zero-based index of the specified Server.Factions.BaseFactionGuard instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.BaseFactionGuard value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.BaseFactionGuard instance from this collection. - /// - /// The Server.Factions.BaseFactionGuard instance to remove. - public void Remove(Server.Factions.BaseFactionGuard value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.BaseFactionGuard instance. - /// - /// An Server.Factions.BaseFactionGuard's enumerator. - public new FactionGuardCollectionEnumerator GetEnumerator() - { - return new FactionGuardCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.BaseFactionGuard instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.BaseFactionGuard instance to insert. - public void Insert(int index, Server.Factions.BaseFactionGuard value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.BaseFactionGuard. - /// - public class FactionGuardCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.BaseFactionGuard _currentElement; - - /// - /// Collection to enumerate. - /// - private FactionGuardCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal FactionGuardCollectionEnumerator(FactionGuardCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.BaseFactionGuard object in the enumerated FactionGuardCollection currently indexed by this instance. - /// - public Server.Factions.BaseFactionGuard Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/FactionItemCollection.cs b/Scripts/Engines/Factions/Collections/FactionItemCollection.cs deleted file mode 100644 index 10cd9c102..000000000 --- a/Scripts/Engines/Factions/Collections/FactionItemCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.FactionItem. - /// - public class FactionItemCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public FactionItemCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.FactionItem at a specific position in the FactionItemCollection. - /// - public Server.Factions.FactionItem this[int index] - { - get - { - return ((Server.Factions.FactionItem)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.FactionItem entry to this collection. - /// - /// Server.Factions.FactionItem instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.FactionItem value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.FactionItem instance is in this collection. - /// - /// Server.Factions.FactionItem instance to search for. - /// True if the Server.Factions.FactionItem instance is in the collection; otherwise false. - public bool Contains(Server.Factions.FactionItem value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.FactionItem instance is in this collection. - /// - /// Server.Factions.FactionItem instance to find. - /// The zero-based index of the specified Server.Factions.FactionItem instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.FactionItem value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.FactionItem instance from this collection. - /// - /// The Server.Factions.FactionItem instance to remove. - public void Remove(Server.Factions.FactionItem value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.FactionItem instance. - /// - /// An Server.Factions.FactionItem's enumerator. - public new FactionItemCollectionEnumerator GetEnumerator() - { - return new FactionItemCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.FactionItem instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.FactionItem instance to insert. - public void Insert(int index, Server.Factions.FactionItem value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.FactionItem. - /// - public class FactionItemCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.FactionItem _currentElement; - - /// - /// Collection to enumerate. - /// - private FactionItemCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal FactionItemCollectionEnumerator(FactionItemCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.FactionItem object in the enumerated FactionItemCollection currently indexed by this instance. - /// - public Server.Factions.FactionItem Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/FactionTrapCollection.cs b/Scripts/Engines/Factions/Collections/FactionTrapCollection.cs deleted file mode 100644 index e7356f783..000000000 --- a/Scripts/Engines/Factions/Collections/FactionTrapCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.BaseFactionTrap. - /// - public class FactionTrapCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public FactionTrapCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.BaseFactionTrap at a specific position in the FactionTrapCollection. - /// - public Server.Factions.BaseFactionTrap this[int index] - { - get - { - return ((Server.Factions.BaseFactionTrap)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.BaseFactionTrap entry to this collection. - /// - /// Server.Factions.BaseFactionTrap instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.BaseFactionTrap value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.BaseFactionTrap instance is in this collection. - /// - /// Server.Factions.BaseFactionTrap instance to search for. - /// True if the Server.Factions.BaseFactionTrap instance is in the collection; otherwise false. - public bool Contains(Server.Factions.BaseFactionTrap value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.BaseFactionTrap instance is in this collection. - /// - /// Server.Factions.BaseFactionTrap instance to find. - /// The zero-based index of the specified Server.Factions.BaseFactionTrap instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.BaseFactionTrap value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.BaseFactionTrap instance from this collection. - /// - /// The Server.Factions.BaseFactionTrap instance to remove. - public void Remove(Server.Factions.BaseFactionTrap value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.BaseFactionTrap instance. - /// - /// An Server.Factions.BaseFactionTrap's enumerator. - public new FactionTrapCollectionEnumerator GetEnumerator() - { - return new FactionTrapCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.BaseFactionTrap instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.BaseFactionTrap instance to insert. - public void Insert(int index, Server.Factions.BaseFactionTrap value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.BaseFactionTrap. - /// - public class FactionTrapCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.BaseFactionTrap _currentElement; - - /// - /// Collection to enumerate. - /// - private FactionTrapCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal FactionTrapCollectionEnumerator(FactionTrapCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.BaseFactionTrap object in the enumerated FactionTrapCollection currently indexed by this instance. - /// - public Server.Factions.BaseFactionTrap Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/FactionVendorCollection.cs b/Scripts/Engines/Factions/Collections/FactionVendorCollection.cs deleted file mode 100644 index 55c15b5f5..000000000 --- a/Scripts/Engines/Factions/Collections/FactionVendorCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.BaseFactionVendor. - /// - public class FactionVendorCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public FactionVendorCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.BaseFactionVendor at a specific position in the FactionVendorCollection. - /// - public Server.Factions.BaseFactionVendor this[int index] - { - get - { - return ((Server.Factions.BaseFactionVendor)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.BaseFactionVendor entry to this collection. - /// - /// Server.Factions.BaseFactionVendor instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.BaseFactionVendor value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.BaseFactionVendor instance is in this collection. - /// - /// Server.Factions.BaseFactionVendor instance to search for. - /// True if the Server.Factions.BaseFactionVendor instance is in the collection; otherwise false. - public bool Contains(Server.Factions.BaseFactionVendor value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.BaseFactionVendor instance is in this collection. - /// - /// Server.Factions.BaseFactionVendor instance to find. - /// The zero-based index of the specified Server.Factions.BaseFactionVendor instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.BaseFactionVendor value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.BaseFactionVendor instance from this collection. - /// - /// The Server.Factions.BaseFactionVendor instance to remove. - public void Remove(Server.Factions.BaseFactionVendor value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.BaseFactionVendor instance. - /// - /// An Server.Factions.BaseFactionVendor's enumerator. - public new FactionVendorCollectionEnumerator GetEnumerator() - { - return new FactionVendorCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.BaseFactionVendor instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.BaseFactionVendor instance to insert. - public void Insert(int index, Server.Factions.BaseFactionVendor value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.BaseFactionVendor. - /// - public class FactionVendorCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.BaseFactionVendor _currentElement; - - /// - /// Collection to enumerate. - /// - private FactionVendorCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal FactionVendorCollectionEnumerator(FactionVendorCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.BaseFactionVendor object in the enumerated FactionVendorCollection currently indexed by this instance. - /// - public Server.Factions.BaseFactionVendor Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/GuardListCollection.cs b/Scripts/Engines/Factions/Collections/GuardListCollection.cs deleted file mode 100644 index 283b28d67..000000000 --- a/Scripts/Engines/Factions/Collections/GuardListCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.GuardList. - /// - public class GuardListCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public GuardListCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.GuardList at a specific position in the GuardListCollection. - /// - public Server.Factions.GuardList this[int index] - { - get - { - return ((Server.Factions.GuardList)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.GuardList entry to this collection. - /// - /// Server.Factions.GuardList instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.GuardList value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.GuardList instance is in this collection. - /// - /// Server.Factions.GuardList instance to search for. - /// True if the Server.Factions.GuardList instance is in the collection; otherwise false. - public bool Contains(Server.Factions.GuardList value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.GuardList instance is in this collection. - /// - /// Server.Factions.GuardList instance to find. - /// The zero-based index of the specified Server.Factions.GuardList instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.GuardList value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.GuardList instance from this collection. - /// - /// The Server.Factions.GuardList instance to remove. - public void Remove(Server.Factions.GuardList value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.GuardList instance. - /// - /// An Server.Factions.GuardList's enumerator. - public new GuardListCollectionEnumerator GetEnumerator() - { - return new GuardListCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.GuardList instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.GuardList instance to insert. - public void Insert(int index, Server.Factions.GuardList value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.GuardList. - /// - public class GuardListCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.GuardList _currentElement; - - /// - /// Collection to enumerate. - /// - private GuardListCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal GuardListCollectionEnumerator(GuardListCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.GuardList object in the enumerated GuardListCollection currently indexed by this instance. - /// - public Server.Factions.GuardList Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/MonolithCollection.cs b/Scripts/Engines/Factions/Collections/MonolithCollection.cs deleted file mode 100644 index b28f0fdfd..000000000 --- a/Scripts/Engines/Factions/Collections/MonolithCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.BaseMonolith. - /// - public class MonolithCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public MonolithCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.BaseMonolith at a specific position in the MonolithCollection. - /// - public Server.Factions.BaseMonolith this[int index] - { - get - { - return ((Server.Factions.BaseMonolith)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.BaseMonolith entry to this collection. - /// - /// Server.Factions.BaseMonolith instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.BaseMonolith value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.BaseMonolith instance is in this collection. - /// - /// Server.Factions.BaseMonolith instance to search for. - /// True if the Server.Factions.BaseMonolith instance is in the collection; otherwise false. - public bool Contains(Server.Factions.BaseMonolith value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.BaseMonolith instance is in this collection. - /// - /// Server.Factions.BaseMonolith instance to find. - /// The zero-based index of the specified Server.Factions.BaseMonolith instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.BaseMonolith value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.BaseMonolith instance from this collection. - /// - /// The Server.Factions.BaseMonolith instance to remove. - public void Remove(Server.Factions.BaseMonolith value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.BaseMonolith instance. - /// - /// An Server.Factions.BaseMonolith's enumerator. - public new MonolithCollectionEnumerator GetEnumerator() - { - return new MonolithCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.BaseMonolith instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.BaseMonolith instance to insert. - public void Insert(int index, Server.Factions.BaseMonolith value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.BaseMonolith. - /// - public class MonolithCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.BaseMonolith _currentElement; - - /// - /// Collection to enumerate. - /// - private MonolithCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal MonolithCollectionEnumerator(MonolithCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.BaseMonolith object in the enumerated MonolithCollection currently indexed by this instance. - /// - public Server.Factions.BaseMonolith Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/PlayerStateCollection.cs b/Scripts/Engines/Factions/Collections/PlayerStateCollection.cs deleted file mode 100644 index a68fa49d8..000000000 --- a/Scripts/Engines/Factions/Collections/PlayerStateCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.PlayerState. - /// - public class PlayerStateCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public PlayerStateCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.PlayerState at a specific position in the PlayerStateCollection. - /// - public Server.Factions.PlayerState this[int index] - { - get - { - return ((Server.Factions.PlayerState)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.PlayerState entry to this collection. - /// - /// Server.Factions.PlayerState instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.PlayerState value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.PlayerState instance is in this collection. - /// - /// Server.Factions.PlayerState instance to search for. - /// True if the Server.Factions.PlayerState instance is in the collection; otherwise false. - public bool Contains(Server.Factions.PlayerState value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.PlayerState instance is in this collection. - /// - /// Server.Factions.PlayerState instance to find. - /// The zero-based index of the specified Server.Factions.PlayerState instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.PlayerState value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.PlayerState instance from this collection. - /// - /// The Server.Factions.PlayerState instance to remove. - public void Remove(Server.Factions.PlayerState value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.PlayerState instance. - /// - /// An Server.Factions.PlayerState's enumerator. - public new PlayerStateCollectionEnumerator GetEnumerator() - { - return new PlayerStateCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.PlayerState instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.PlayerState instance to insert. - public void Insert(int index, Server.Factions.PlayerState value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.PlayerState. - /// - public class PlayerStateCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.PlayerState _currentElement; - - /// - /// Collection to enumerate. - /// - private PlayerStateCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal PlayerStateCollectionEnumerator(PlayerStateCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.PlayerState object in the enumerated PlayerStateCollection currently indexed by this instance. - /// - public Server.Factions.PlayerState Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/SigilCollection.cs b/Scripts/Engines/Factions/Collections/SigilCollection.cs deleted file mode 100644 index 5898d8472..000000000 --- a/Scripts/Engines/Factions/Collections/SigilCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.Sigil. - /// - public class SigilCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public SigilCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.Sigil at a specific position in the SigilCollection. - /// - public Server.Factions.Sigil this[int index] - { - get - { - return ((Server.Factions.Sigil)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.Sigil entry to this collection. - /// - /// Server.Factions.Sigil instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.Sigil value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.Sigil instance is in this collection. - /// - /// Server.Factions.Sigil instance to search for. - /// True if the Server.Factions.Sigil instance is in the collection; otherwise false. - public bool Contains(Server.Factions.Sigil value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.Sigil instance is in this collection. - /// - /// Server.Factions.Sigil instance to find. - /// The zero-based index of the specified Server.Factions.Sigil instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.Sigil value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.Sigil instance from this collection. - /// - /// The Server.Factions.Sigil instance to remove. - public void Remove(Server.Factions.Sigil value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.Sigil instance. - /// - /// An Server.Factions.Sigil's enumerator. - public new SigilCollectionEnumerator GetEnumerator() - { - return new SigilCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.Sigil instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.Sigil instance to insert. - public void Insert(int index, Server.Factions.Sigil value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.Sigil. - /// - public class SigilCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.Sigil _currentElement; - - /// - /// Collection to enumerate. - /// - private SigilCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal SigilCollectionEnumerator(SigilCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.Sigil object in the enumerated SigilCollection currently indexed by this instance. - /// - public Server.Factions.Sigil Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/SilverGivenCollection.cs b/Scripts/Engines/Factions/Collections/SilverGivenCollection.cs deleted file mode 100644 index ccc2d7fa9..000000000 --- a/Scripts/Engines/Factions/Collections/SilverGivenCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.SilverGivenEntry. - /// - public class SilverGivenCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public SilverGivenCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.SilverGivenEntry at a specific position in the SilverGivenCollection. - /// - public Server.Factions.SilverGivenEntry this[int index] - { - get - { - return ((Server.Factions.SilverGivenEntry)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.SilverGivenEntry entry to this collection. - /// - /// Server.Factions.SilverGivenEntry instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.SilverGivenEntry value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.SilverGivenEntry instance is in this collection. - /// - /// Server.Factions.SilverGivenEntry instance to search for. - /// True if the Server.Factions.SilverGivenEntry instance is in the collection; otherwise false. - public bool Contains(Server.Factions.SilverGivenEntry value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.SilverGivenEntry instance is in this collection. - /// - /// Server.Factions.SilverGivenEntry instance to find. - /// The zero-based index of the specified Server.Factions.SilverGivenEntry instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.SilverGivenEntry value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.SilverGivenEntry instance from this collection. - /// - /// The Server.Factions.SilverGivenEntry instance to remove. - public void Remove(Server.Factions.SilverGivenEntry value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.SilverGivenEntry instance. - /// - /// An Server.Factions.SilverGivenEntry's enumerator. - public new SilverGivenCollectionEnumerator GetEnumerator() - { - return new SilverGivenCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.SilverGivenEntry instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.SilverGivenEntry instance to insert. - public void Insert(int index, Server.Factions.SilverGivenEntry value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.SilverGivenEntry. - /// - public class SilverGivenCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.SilverGivenEntry _currentElement; - - /// - /// Collection to enumerate. - /// - private SilverGivenCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal SilverGivenCollectionEnumerator(SilverGivenCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.SilverGivenEntry object in the enumerated SilverGivenCollection currently indexed by this instance. - /// - public Server.Factions.SilverGivenEntry Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/TownCollection.cs b/Scripts/Engines/Factions/Collections/TownCollection.cs deleted file mode 100644 index f3e901054..000000000 --- a/Scripts/Engines/Factions/Collections/TownCollection.cs +++ /dev/null @@ -1,199 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.Town. - /// - public class TownCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public TownCollection() - { - } - - /// - /// Gets or sets the value of the Server.Factions.Town at a specific position in the TownCollection. - /// - public Server.Factions.Town this[int index] - { - get - { - return ((Server.Factions.Town)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.Town entry to this collection. - /// - /// Server.Factions.Town instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.Town value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.Town instance is in this collection. - /// - /// Server.Factions.Town instance to search for. - /// True if the Server.Factions.Town instance is in the collection; otherwise false. - public bool Contains(Server.Factions.Town value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.Town instance is in this collection. - /// - /// Server.Factions.Town instance to find. - /// The zero-based index of the specified Server.Factions.Town instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.Town value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.Town instance from this collection. - /// - /// The Server.Factions.Town instance to remove. - public void Remove(Server.Factions.Town value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.Town instance. - /// - /// An Server.Factions.Town's enumerator. - public new TownCollectionEnumerator GetEnumerator() - { - return new TownCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.Town instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.Town instance to insert. - public void Insert(int index, Server.Factions.Town value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.Town. - /// - public class TownCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.Town _currentElement; - - /// - /// Collection to enumerate. - /// - private TownCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal TownCollectionEnumerator(TownCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.Town object in the enumerated TownCollection currently indexed by this instance. - /// - public Server.Factions.Town Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Collections/VendorListCollection.cs b/Scripts/Engines/Factions/Collections/VendorListCollection.cs deleted file mode 100644 index a110acf8e..000000000 --- a/Scripts/Engines/Factions/Collections/VendorListCollection.cs +++ /dev/null @@ -1,200 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version: 1.1.4322.573 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Server.Factions -{ - using System; - using System.Collections; - - - /// - /// Strongly typed collection of Server.Factions.VendorList. - /// - public class VendorListCollection : System.Collections.CollectionBase - { - - /// - /// Default constructor. - /// - public VendorListCollection() : - base() - { - } - - /// - /// Gets or sets the value of the Server.Factions.VendorList at a specific position in the VendorListCollection. - /// - public Server.Factions.VendorList this[int index] - { - get - { - return ((Server.Factions.VendorList)(this.List[index])); - } - set - { - this.List[index] = value; - } - } - - /// - /// Append a Server.Factions.VendorList entry to this collection. - /// - /// Server.Factions.VendorList instance. - /// The position into which the new element was inserted. - public int Add(Server.Factions.VendorList value) - { - return this.List.Add(value); - } - - /// - /// Determines whether a specified Server.Factions.VendorList instance is in this collection. - /// - /// Server.Factions.VendorList instance to search for. - /// True if the Server.Factions.VendorList instance is in the collection; otherwise false. - public bool Contains(Server.Factions.VendorList value) - { - return this.List.Contains(value); - } - - /// - /// Retrieve the index a specified Server.Factions.VendorList instance is in this collection. - /// - /// Server.Factions.VendorList instance to find. - /// The zero-based index of the specified Server.Factions.VendorList instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Factions.VendorList value) - { - return this.List.IndexOf(value); - } - - /// - /// Removes a specified Server.Factions.VendorList instance from this collection. - /// - /// The Server.Factions.VendorList instance to remove. - public void Remove(Server.Factions.VendorList value) - { - this.List.Remove(value); - } - - /// - /// Returns an enumerator that can iterate through the Server.Factions.VendorList instance. - /// - /// An Server.Factions.VendorList's enumerator. - public new VendorListCollectionEnumerator GetEnumerator() - { - return new VendorListCollectionEnumerator(this); - } - - /// - /// Insert a Server.Factions.VendorList instance into this collection at a specified index. - /// - /// Zero-based index. - /// The Server.Factions.VendorList instance to insert. - public void Insert(int index, Server.Factions.VendorList value) - { - this.List.Insert(index, value); - } - - /// - /// Strongly typed enumerator of Server.Factions.VendorList. - /// - public class VendorListCollectionEnumerator : System.Collections.IEnumerator - { - - /// - /// Current index - /// - private int _index; - - /// - /// Current element pointed to. - /// - private Server.Factions.VendorList _currentElement; - - /// - /// Collection to enumerate. - /// - private VendorListCollection _collection; - - /// - /// Default constructor for enumerator. - /// - /// Instance of the collection to enumerate. - internal VendorListCollectionEnumerator(VendorListCollection collection) - { - _index = -1; - _collection = collection; - } - - /// - /// Gets the Server.Factions.VendorList object in the enumerated VendorListCollection currently indexed by this instance. - /// - public Server.Factions.VendorList Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Gets the current element in the collection. - /// - object IEnumerator.Current - { - get - { - if (((_index == -1) - || (_index >= _collection.Count))) - { - throw new System.IndexOutOfRangeException("Enumerator not started."); - } - else - { - return _currentElement; - } - } - } - - /// - /// Reset the cursor, so it points to the beginning of the enumerator. - /// - public void Reset() - { - _index = -1; - _currentElement = null; - } - - /// - /// Advances the enumerator to the next queue of the enumeration, if one is currently available. - /// - /// true, if the enumerator was succesfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration. - public bool MoveNext() - { - if ((_index - < (_collection.Count - 1))) - { - _index = (_index + 1); - _currentElement = this._collection[_index]; - return true; - } - _index = _collection.Count; - return false; - } - } - } -} diff --git a/Scripts/Engines/Factions/Core/Election.cs b/Scripts/Engines/Factions/Core/Election.cs index 45eb2d948..e66305061 100644 --- a/Scripts/Engines/Factions/Core/Election.cs +++ b/Scripts/Engines/Factions/Core/Election.cs @@ -3,6 +3,7 @@ using System.Net; using System.Collections; using Server; using Server.Mobiles; +using System.Collections.Generic; namespace Server.Factions { @@ -16,14 +17,14 @@ namespace Server.Factions public const int CandidateRank = 5; private Faction m_Faction; - private CandidateCollection m_Candidates; + private List m_Candidates; private ElectionState m_State; private DateTime m_LastStateTime; public Faction Faction{ get{ return m_Faction; } } - public CandidateCollection Candidates{ get{ return m_Candidates; } } + public List Candidates { get { return m_Candidates; } } public ElectionState State{ get{ return m_State; } set{ m_State = value; m_LastStateTime = DateTime.Now; } } public DateTime LastStateTime{ get{ return m_LastStateTime; } } @@ -79,7 +80,7 @@ namespace Server.Factions public Election( Faction faction ) { m_Faction = faction; - m_Candidates = new CandidateCollection(); + m_Candidates = new List(); StartTimer(); } @@ -97,7 +98,7 @@ namespace Server.Factions m_LastStateTime = reader.ReadDateTime(); m_State = (ElectionState)reader.ReadEncodedInt(); - m_Candidates = new CandidateCollection(); + m_Candidates = new List(); int count = reader.ReadEncodedInt(); @@ -146,11 +147,11 @@ namespace Server.Factions { for ( int i = 0; i < m_Candidates.Count; ++i ) { - ArrayList voters = m_Candidates[i].Voters; + List voters = m_Candidates[i].Voters; for ( int j = 0; j < voters.Count; ++j ) { - Voter voter = (Voter)voters[j]; + Voter voter = voters[j]; if ( voter.From == mob ) voters.RemoveAt( j-- ); @@ -233,11 +234,11 @@ namespace Server.Factions { for ( int i = 0; i < m_Candidates.Count; ++i ) { - ArrayList voters = m_Candidates[i].Voters; + List voters = m_Candidates[i].Voters; for ( int j = 0; j < voters.Count; ++j ) { - Voter voter = (Voter)voters[j]; + Voter voter = voters[j]; if ( voter.From == mob ) return m_Candidates[i]; @@ -479,10 +480,10 @@ namespace Server.Factions public class Candidate { private Mobile m_Mobile; - private ArrayList m_Voters; + private List m_Voters; public Mobile Mobile{ get{ return m_Mobile; } } - public ArrayList Voters{ get{ return m_Voters; } } + public List Voters { get { return m_Voters; } } public int Votes{ get{ return m_Voters.Count; } } @@ -500,7 +501,7 @@ namespace Server.Factions public Candidate( Mobile mob ) { m_Mobile = mob; - m_Voters = new ArrayList(); + m_Voters = new List(); } public Candidate( GenericReader reader ) @@ -514,7 +515,7 @@ namespace Server.Factions m_Mobile = reader.ReadMobile(); int count = reader.ReadEncodedInt(); - m_Voters = new ArrayList( count ); + m_Voters = new List( count ); for ( int i = 0; i < count; ++i ) { @@ -530,11 +531,11 @@ namespace Server.Factions { m_Mobile = reader.ReadMobile(); - ArrayList mobs = reader.ReadMobileList(); - m_Voters = new ArrayList( mobs.Count ); + List mobs = reader.ReadStrongMobileList(); + m_Voters = new List( mobs.Count ); for ( int i = 0; i < mobs.Count; ++i ) - m_Voters.Add( new Voter( (Mobile)mobs[i], m_Mobile ) ); + m_Voters.Add( new Voter( mobs[i], m_Mobile ) ); break; } diff --git a/Scripts/Engines/Factions/Core/Faction.cs b/Scripts/Engines/Factions/Core/Faction.cs index e2f1fd6a1..e8fee9c48 100644 --- a/Scripts/Engines/Factions/Core/Faction.cs +++ b/Scripts/Engines/Factions/Core/Faction.cs @@ -9,6 +9,7 @@ using Server.Targeting; using Server.Accounting; using Server.Commands; using Server.Commands.Generic; +using System.Collections.Generic; namespace Server.Factions { @@ -65,7 +66,7 @@ namespace Server.Factions set{ m_State.Silver = value; } } - public PlayerStateCollection Members + public List Members { get{ return m_State.Members; } set{ m_State.Members = value; } @@ -85,7 +86,7 @@ namespace Server.Factions public void Broadcast( int hue, string text ) { - PlayerStateCollection members = Members; + List members = Members; for ( int i = 0; i < members.Count; ++i ) members[i].Mobile.SendMessage( hue, text ); @@ -93,7 +94,7 @@ namespace Server.Factions public void Broadcast( int number ) { - PlayerStateCollection members = Members; + List members = Members; for ( int i = 0; i < members.Count; ++i ) members[i].Mobile.SendLocalizedMessage( number ); @@ -428,7 +429,7 @@ namespace Server.Factions pm.SendLocalizedMessage( 1018031 ); // In the interest of faction stability, this faction declines to accept new members for now. else { - ArrayList members = new ArrayList( guild.Members ); + List members = new List( guild.Members ); for ( int i = 0; i < members.Count; ++i ) { @@ -497,9 +498,9 @@ namespace Server.Factions public void UpdateRanks() { - PlayerStateCollection members = Members; + List members = Members; - ArrayList list = new ArrayList( members ); + List list = new List( members ); list.Sort(); @@ -507,7 +508,7 @@ namespace Server.Factions for ( int i = 0; i < list.Count; ++i ) { - PlayerState pl = (PlayerState)list[i]; + PlayerState pl = list[i]; int percent; @@ -553,12 +554,12 @@ namespace Server.Factions public static void FactionTownReset_OnCommand( CommandEventArgs e ) { - MonolithCollection monoliths = BaseMonolith.Monoliths; + List monoliths = BaseMonolith.Monoliths; for ( int i = 0; i < monoliths.Count; ++i ) monoliths[i].Sigil = null; - TownCollection towns = Town.Towns; + List towns = Town.Towns; for ( int i = 0; i < towns.Count; ++i ) { @@ -569,7 +570,7 @@ namespace Server.Factions towns[i].Owner = null; } - SigilCollection sigils = Sigil.Sigils; + List sigils = Sigil.Sigils; for ( int i = 0; i < sigils.Count; ++i ) { @@ -583,17 +584,17 @@ namespace Server.Factions sigils[i].ReturnHome(); } - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { Faction f = factions[i]; - ArrayList list = new ArrayList( f.State.FactionItems ); + List list = new List( f.State.FactionItems ); for ( int j = 0; j < list.Count; ++j ) { - FactionItem fi = (FactionItem)list[j]; + FactionItem fi = list[j]; if ( fi.Expiration == DateTime.MinValue ) fi.Item.Delete(); @@ -605,12 +606,12 @@ namespace Server.Factions public static void FactionReset_OnCommand( CommandEventArgs e ) { - MonolithCollection monoliths = BaseMonolith.Monoliths; + List monoliths = BaseMonolith.Monoliths; for ( int i = 0; i < monoliths.Count; ++i ) monoliths[i].Sigil = null; - TownCollection towns = Town.Towns; + List towns = Town.Towns; for ( int i = 0; i < towns.Count; ++i ) { @@ -621,7 +622,7 @@ namespace Server.Factions towns[i].Owner = null; } - SigilCollection sigils = Sigil.Sigils; + List sigils = Sigil.Sigils; for ( int i = 0; i < sigils.Count; ++i ) { @@ -635,22 +636,22 @@ namespace Server.Factions sigils[i].ReturnHome(); } - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { Faction f = factions[i]; - ArrayList list = new ArrayList( f.Members ); + List playerStateList = new List( f.Members ); - for ( int j = 0; j < list.Count; ++j ) - f.RemoveMember( ((PlayerState)list[j]).Mobile ); + for( int j = 0; j < playerStateList.Count; ++j ) + f.RemoveMember( playerStateList[j].Mobile ); - list = new ArrayList( f.State.FactionItems ); + List factionItemList = new List( f.State.FactionItems ); - for ( int j = 0; j < list.Count; ++j ) + for( int j = 0; j < factionItemList.Count; ++j ) { - FactionItem fi = (FactionItem)list[j]; + FactionItem fi = (FactionItem)factionItemList[j]; if ( fi.Expiration == DateTime.MinValue ) fi.Item.Delete(); @@ -658,10 +659,10 @@ namespace Server.Factions fi.Detach(); } - list = new ArrayList( f.Traps ); + List factionTrapList = new List( f.Traps ); - for ( int j = 0; j < list.Count; ++j ) - ((BaseFactionTrap)list[j]).Delete(); + for( int j = 0; j < factionTrapList.Count; ++j ) + factionTrapList[j].Delete(); } } @@ -800,7 +801,7 @@ namespace Server.Factions public static void ProcessTick() { - SigilCollection sigils = Sigil.Sigils; + List sigils = Sigil.Sigils; for ( int i = 0; i < sigils.Count; ++i ) { @@ -936,7 +937,7 @@ namespace Server.Factions public virtual int MaximumTraps{ get{ return 15; } } - public FactionTrapCollection Traps + public List Traps { get{ return m_State.Traps; } set{ m_State.Traps = value; } @@ -947,7 +948,7 @@ namespace Server.Factions public static Faction FindSmallestFaction() { - FactionCollection factions = Factions; + List factions = Factions; Faction smallest = null; for ( int i = 0; i < factions.Count; ++i ) @@ -963,7 +964,7 @@ namespace Server.Factions public static bool StabilityActive() { - FactionCollection factions = Factions; + List factions = Factions; for ( int i = 0; i < factions.Count; ++i ) { @@ -1191,7 +1192,7 @@ namespace Server.Factions writer.WriteEncodedInt( (int) (idx + 1) ); } - public static FactionCollection Factions{ get{ return Reflector.Factions; } } + public static List Factions{ get{ return Reflector.Factions; } } public static Faction ReadReference( GenericReader reader ) { @@ -1239,7 +1240,7 @@ namespace Server.Factions public static Faction Parse( string name ) { - FactionCollection factions = Factions; + List factions = Factions; for ( int i = 0; i < factions.Count; ++i ) { diff --git a/Scripts/Engines/Factions/Core/FactionState.cs b/Scripts/Engines/Factions/Core/FactionState.cs index 9c6f38933..47b4da614 100644 --- a/Scripts/Engines/Factions/Core/FactionState.cs +++ b/Scripts/Engines/Factions/Core/FactionState.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Server.Factions { @@ -8,10 +9,10 @@ namespace Server.Factions private Mobile m_Commander; private int m_Tithe; private int m_Silver; - private PlayerStateCollection m_Members; + private List m_Members; private Election m_Election; - private FactionItemCollection m_FactionItems; - private FactionTrapCollection m_FactionTraps; + private List m_FactionItems; + private List m_FactionTraps; private const int BroadcastsPerPeriod = 2; private static readonly TimeSpan BroadcastPeriod = TimeSpan.FromHours( 1.0 ); @@ -44,13 +45,13 @@ namespace Server.Factions } } - public FactionItemCollection FactionItems + public List FactionItems { get{ return m_FactionItems; } set{ m_FactionItems = value; } } - public FactionTrapCollection Traps + public List Traps { get{ return m_FactionTraps; } set{ m_FactionTraps = value; } @@ -101,7 +102,7 @@ namespace Server.Factions set{ m_Silver = value; } } - public PlayerStateCollection Members + public List Members { get{ return m_Members; } set{ m_Members = value; } @@ -111,10 +112,10 @@ namespace Server.Factions { m_Faction = faction; m_Tithe = 50; - m_Members = new PlayerStateCollection(); + m_Members = new List(); m_Election = new Election( faction ); - m_FactionItems = new FactionItemCollection(); - m_FactionTraps = new FactionTrapCollection(); + m_FactionItems = new List(); + m_FactionTraps = new List(); } public FactionState( GenericReader reader ) @@ -164,7 +165,7 @@ namespace Server.Factions int memberCount = reader.ReadEncodedInt(); - m_Members = new PlayerStateCollection(); + m_Members = new List(); for ( int i = 0; i < memberCount; ++i ) { @@ -177,7 +178,7 @@ namespace Server.Factions m_Faction.State = this; m_Faction.UpdateRanks(); - m_FactionItems = new FactionItemCollection(); + m_FactionItems = new List(); if ( version >= 2 ) { @@ -194,7 +195,7 @@ namespace Server.Factions } } - m_FactionTraps = new FactionTrapCollection(); + m_FactionTraps = new List(); if ( version >= 3 ) { diff --git a/Scripts/Engines/Factions/Core/Generator.cs b/Scripts/Engines/Factions/Core/Generator.cs index f1b2b48af..5f9e66c1c 100644 --- a/Scripts/Engines/Factions/Core/Generator.cs +++ b/Scripts/Engines/Factions/Core/Generator.cs @@ -1,5 +1,6 @@ using System; using Server.Commands; +using System.Collections.Generic; namespace Server.Factions { @@ -14,12 +15,12 @@ namespace Server.Factions { new FactionPersistance(); - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; foreach ( Faction faction in factions ) Generate( faction ); - TownCollection towns = Town.Towns; + List towns = Town.Towns; foreach ( Town town in towns ) Generate( town ); @@ -46,7 +47,7 @@ namespace Server.Factions { Map facet = Faction.Facet; - TownCollection towns = Town.Towns; + List towns = Town.Towns; StrongholdDefinition stronghold = faction.Definition.Stronghold; diff --git a/Scripts/Engines/Factions/Core/GuardList.cs b/Scripts/Engines/Factions/Core/GuardList.cs index 3f63532eb..4beec468b 100644 --- a/Scripts/Engines/Factions/Core/GuardList.cs +++ b/Scripts/Engines/Factions/Core/GuardList.cs @@ -1,15 +1,16 @@ using System; using Server; +using System.Collections.Generic; namespace Server.Factions { public class GuardList { private GuardDefinition m_Definition; - private FactionGuardCollection m_Guards; + private List m_Guards; public GuardDefinition Definition{ get{ return m_Definition; } } - public FactionGuardCollection Guards{ get{ return m_Guards; } } + public List Guards{ get{ return m_Guards; } } public BaseFactionGuard Construct() { @@ -20,7 +21,7 @@ namespace Server.Factions public GuardList( GuardDefinition definition ) { m_Definition = definition; - m_Guards = new FactionGuardCollection(); + m_Guards = new List(); } } } \ No newline at end of file diff --git a/Scripts/Engines/Factions/Core/Persistance.cs b/Scripts/Engines/Factions/Core/Persistance.cs index ab6880a27..0dfc27bdc 100644 --- a/Scripts/Engines/Factions/Core/Persistance.cs +++ b/Scripts/Engines/Factions/Core/Persistance.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Server.Factions { @@ -41,7 +42,7 @@ namespace Server.Factions writer.Write( (int) 0 ); // version - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { @@ -49,7 +50,7 @@ namespace Server.Factions factions[i].State.Serialize( writer ); } - TownCollection towns = Town.Towns; + List towns = Town.Towns; for ( int i = 0; i < towns.Count; ++i ) { diff --git a/Scripts/Engines/Factions/Core/PlayerState.cs b/Scripts/Engines/Factions/Core/PlayerState.cs index 8059398ab..c00546d51 100644 --- a/Scripts/Engines/Factions/Core/PlayerState.cs +++ b/Scripts/Engines/Factions/Core/PlayerState.cs @@ -1,6 +1,7 @@ using System; using Server; using Server.Mobiles; +using System.Collections.Generic; namespace Server.Factions { @@ -8,25 +9,25 @@ namespace Server.Factions { private Mobile m_Mobile; private Faction m_Faction; - private PlayerStateCollection m_Owner; + private List m_Owner; private int m_KillPoints; private DateTime m_Leaving; private MerchantTitle m_MerchantTitle; private RankDefinition m_Rank; - private SilverGivenCollection m_SilverGiven; + private List m_SilverGiven; private Town m_Sheriff; private Town m_Finance; public Mobile Mobile{ get{ return m_Mobile; } } public Faction Faction{ get{ return m_Faction; } } - public PlayerStateCollection Owner{ get{ return m_Owner; } } + public List Owner { get { return m_Owner; } } public int KillPoints{ get{ return m_KillPoints; } set{ m_KillPoints = value; } } public MerchantTitle MerchantTitle{ get{ return m_MerchantTitle; } set{ m_MerchantTitle = value; Invalidate(); } } public RankDefinition Rank{ get{ return m_Rank; } set{ m_Rank = value; Invalidate(); } } public Town Sheriff{ get{ return m_Sheriff; } set{ m_Sheriff = value; Invalidate(); } } public Town Finance{ get{ return m_Finance; } set{ m_Finance = value; Invalidate(); } } - public SilverGivenCollection SilverGiven{ get{ return m_SilverGiven; } } + public List SilverGiven { get { return m_SilverGiven; } } public DateTime Leaving{ get{ return m_Leaving; } set{ m_Leaving = value; } } public bool IsLeaving{ get{ return ( m_Leaving > DateTime.MinValue ); } } @@ -52,7 +53,7 @@ namespace Server.Factions public void OnGivenSilverTo( Mobile mob ) { if ( m_SilverGiven == null ) - m_SilverGiven = new SilverGivenCollection(); + m_SilverGiven = new List(); m_SilverGiven.Add( new SilverGivenEntry( mob ) ); } @@ -69,7 +70,7 @@ namespace Server.Factions ((PlayerMobile)m_Mobile).FactionPlayerState = this; } - public PlayerState( Mobile mob, Faction faction, PlayerStateCollection owner ) + public PlayerState( Mobile mob, Faction faction, List owner ) { m_Mobile = mob; m_Faction = faction; @@ -81,7 +82,7 @@ namespace Server.Factions Invalidate(); } - public PlayerState( GenericReader reader, Faction faction, PlayerStateCollection owner ) + public PlayerState( GenericReader reader, Faction faction, List owner ) { m_Faction = faction; m_Owner = owner; diff --git a/Scripts/Engines/Factions/Core/Reflector.cs b/Scripts/Engines/Factions/Core/Reflector.cs index 7dbf63c42..68246c871 100644 --- a/Scripts/Engines/Factions/Core/Reflector.cs +++ b/Scripts/Engines/Factions/Core/Reflector.cs @@ -2,16 +2,17 @@ using System; using System.Reflection; using System.Collections; using Server; +using System.Collections.Generic; namespace Server.Factions { public class Reflector { - private static ArrayList m_Types = new ArrayList(); + private static List m_Types = new List(); - private static TownCollection m_Towns; + private static List m_Towns; - public static TownCollection Towns + public static List Towns { get { @@ -22,9 +23,9 @@ namespace Server.Factions } } - private static FactionCollection m_Factions; + private static List m_Factions; - public static FactionCollection Factions + public static List Factions { get { @@ -71,11 +72,11 @@ namespace Server.Factions else m_Types.Add( ScriptCompiler.FindTypeByFullName( typeName, false ) ); - return (Type) m_Types[m_Types.Count - 1]; + return m_Types[m_Types.Count - 1]; } else { - return (Type)m_Types[index - 1]; + return m_Types[index - 1]; } } @@ -87,8 +88,8 @@ namespace Server.Factions private static void ProcessTypes() { - m_Factions = new FactionCollection(); - m_Towns = new TownCollection(); + m_Factions = new List(); + m_Towns = new List(); Assembly[] asms = ScriptCompiler.Assemblies; diff --git a/Scripts/Engines/Factions/Core/Town.cs b/Scripts/Engines/Factions/Core/Town.cs index 4df12f4ef..99f7b12c4 100644 --- a/Scripts/Engines/Factions/Core/Town.cs +++ b/Scripts/Engines/Factions/Core/Town.cs @@ -4,6 +4,7 @@ using Server; using Server.Targeting; using Server.Mobiles; using Server.Commands; +using System.Collections.Generic; namespace Server.Factions { @@ -74,7 +75,7 @@ namespace Server.Factions if ( reg.Map != Faction.Facet ) return null; - TownCollection towns = Towns; + List towns = Towns; for ( int i = 0; i < towns.Count; ++i ) { @@ -91,7 +92,7 @@ namespace Server.Factions { get { - VendorListCollection vendorLists = VendorLists; + List vendorLists = VendorLists; int upkeep = 0; for ( int i = 0; i < vendorLists.Count; ++i ) @@ -105,7 +106,7 @@ namespace Server.Factions { get { - GuardListCollection guardLists = GuardLists; + List guardLists = GuardLists; int upkeep = 0; for ( int i = 0; i < guardLists.Count; ++i ) @@ -129,7 +130,7 @@ namespace Server.Factions { get { - MonolithCollection monoliths = BaseMonolith.Monoliths; + List monoliths = BaseMonolith.Monoliths; foreach ( BaseMonolith monolith in monoliths ) { @@ -258,12 +259,12 @@ namespace Server.Factions { ArrayList list = new ArrayList(); - VendorListCollection vendorLists = VendorLists; + List vendorLists = VendorLists; for ( int i = 0; i < vendorLists.Count; ++i ) list.AddRange( vendorLists[i].Vendors ); - GuardListCollection guardLists = GuardLists; + List guardLists = GuardLists; for ( int i = 0; i < guardLists.Count; ++i ) list.AddRange( guardLists[i].Guards ); @@ -271,16 +272,16 @@ namespace Server.Factions return list; } - private VendorListCollection m_VendorLists; - private GuardListCollection m_GuardLists; + private List m_VendorLists; + private List m_GuardLists; - public VendorListCollection VendorLists + public List VendorLists { get{ return m_VendorLists; } set{ m_VendorLists = value; } } - public GuardListCollection GuardLists + public List GuardLists { get{ return m_GuardLists; } set{ m_GuardLists = value; } @@ -290,7 +291,7 @@ namespace Server.Factions { GuardDefinition[] defs = ( Owner == null ? new GuardDefinition[0] : Owner.Definition.Guards ); - m_GuardLists = new GuardListCollection(); + m_GuardLists = new List(); for ( int i = 0; i < defs.Length; ++i ) m_GuardLists.Add( new GuardList( defs[i] ) ); @@ -298,7 +299,7 @@ namespace Server.Factions public GuardList FindGuardList( Type type ) { - GuardListCollection guardLists = GuardLists; + List guardLists = GuardLists; for ( int i = 0; i < guardLists.Count; ++i ) { @@ -315,7 +316,7 @@ namespace Server.Factions { VendorDefinition[] defs = VendorDefinition.Definitions; - m_VendorLists = new VendorListCollection(); + m_VendorLists = new List(); for ( int i = 0; i < defs.Length; ++i ) m_VendorLists.Add( new VendorList( defs[i] ) ); @@ -323,7 +324,7 @@ namespace Server.Factions public VendorList FindVendorList( Type type ) { - VendorListCollection vendorLists = VendorLists; + List vendorLists = VendorLists; for ( int i = 0; i < vendorLists.Count; ++i ) { @@ -400,7 +401,7 @@ namespace Server.Factions public static void Initialize() { - TownCollection towns = Towns; + List towns = Towns; for ( int i = 0; i < towns.Count; ++i ) { @@ -435,7 +436,7 @@ namespace Server.Factions return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance ); } - public static TownCollection Towns{ get{ return Reflector.Towns; } } + public static List Towns { get { return Reflector.Towns; } } public const int SilverCaptureBonus = 10000; @@ -468,23 +469,23 @@ namespace Server.Factions if ( monolith != null ) monolith.Faction = f; - VendorListCollection vendorLists = VendorLists; + List vendorLists = VendorLists; for ( int i = 0; i < vendorLists.Count; ++i ) { VendorList vendorList = vendorLists[i]; - FactionVendorCollection vendors = vendorList.Vendors; + List vendors = vendorList.Vendors; for ( int j = vendors.Count - 1; j >= 0; --j ) vendors[j].Delete(); } - GuardListCollection guardLists = GuardLists; + List guardLists = GuardLists; for ( int i = 0; i < guardLists.Count; ++i ) { GuardList guardList = guardLists[i]; - FactionGuardCollection guards = guardList.Guards; + List guards = guardList.Guards; for ( int j = guards.Count - 1; j >= 0; --j ) guards[j].Delete(); @@ -522,7 +523,7 @@ namespace Server.Factions public static Town Parse( string name ) { - TownCollection towns = Towns; + List towns = Towns; for ( int i = 0; i < towns.Count; ++i ) { diff --git a/Scripts/Engines/Factions/Core/VendorList.cs b/Scripts/Engines/Factions/Core/VendorList.cs index ddd77695b..b30b41f1d 100644 --- a/Scripts/Engines/Factions/Core/VendorList.cs +++ b/Scripts/Engines/Factions/Core/VendorList.cs @@ -1,15 +1,16 @@ using System; using Server; +using System.Collections.Generic; namespace Server.Factions { public class VendorList { private VendorDefinition m_Definition; - private FactionVendorCollection m_Vendors; + private List m_Vendors; public VendorDefinition Definition{ get{ return m_Definition; } } - public FactionVendorCollection Vendors{ get{ return m_Vendors; } } + public List Vendors { get { return m_Vendors; } } public BaseFactionVendor Construct( Town town, Faction faction ) { @@ -20,7 +21,7 @@ namespace Server.Factions public VendorList( VendorDefinition definition ) { m_Definition = definition; - m_Vendors = new FactionVendorCollection(); + m_Vendors = new List(); } } } \ No newline at end of file diff --git a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs index 2eaaccff0..4216f48d4 100644 --- a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs +++ b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs @@ -3,6 +3,7 @@ using Server; using Server.Gumps; using Server.Mobiles; using Server.Network; +using System.Collections.Generic; namespace Server.Factions { @@ -87,7 +88,7 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 250, 20, 1011430, false, false ); // CITY STATUS - TownCollection towns = Town.Towns; + List towns = Town.Towns; for ( int i = 0; i < towns.Count; ++i ) { @@ -309,7 +310,7 @@ namespace Server.Factions if ( !m_Faction.IsCommander( m_From ) ) return; - TownCollection towns = Town.Towns; + List towns = Town.Towns; if ( index >= 0 && index < towns.Count ) { diff --git a/Scripts/Engines/Factions/Gumps/FinanceGump.cs b/Scripts/Engines/Factions/Gumps/FinanceGump.cs index b078da292..5c6d85626 100644 --- a/Scripts/Engines/Factions/Gumps/FinanceGump.cs +++ b/Scripts/Engines/Factions/Gumps/FinanceGump.cs @@ -4,6 +4,7 @@ using Server.Gumps; using Server.Mobiles; using Server.Network; using Server.Targeting; +using System.Collections.Generic; namespace Server.Factions { @@ -87,7 +88,7 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS - VendorListCollection vendorLists = town.VendorLists; + List vendorLists = town.VendorLists; for ( int i = 0; i < vendorLists.Count; ++i ) { @@ -238,7 +239,7 @@ namespace Server.Factions } case 1: // make vendor { - VendorListCollection vendorLists = m_Town.VendorLists; + List vendorLists = m_Town.VendorLists; if ( index >= 0 && index < vendorLists.Count ) { diff --git a/Scripts/Engines/Factions/Gumps/SheriffGump.cs b/Scripts/Engines/Factions/Gumps/SheriffGump.cs index d81145288..13a5846a7 100644 --- a/Scripts/Engines/Factions/Gumps/SheriffGump.cs +++ b/Scripts/Engines/Factions/Gumps/SheriffGump.cs @@ -4,6 +4,7 @@ using Server.Gumps; using Server.Mobiles; using Server.Network; using Server.Targeting; +using System.Collections.Generic; namespace Server.Factions { @@ -80,7 +81,7 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 300, 25, 1011494, false, false ); // HIRE GUARDS - GuardListCollection guardLists = town.GuardLists; + List guardLists = town.GuardLists; for ( int i = 0; i < guardLists.Count; ++i ) { diff --git a/Scripts/Engines/Factions/Items/BaseMonolith.cs b/Scripts/Engines/Factions/Items/BaseMonolith.cs index 38ced2235..f6217a634 100644 --- a/Scripts/Engines/Factions/Items/BaseMonolith.cs +++ b/Scripts/Engines/Factions/Items/BaseMonolith.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Server.Factions { @@ -124,9 +125,9 @@ namespace Server.Factions } } - private static MonolithCollection m_Monoliths = new MonolithCollection(); + private static List m_Monoliths = new List(); - public static MonolithCollection Monoliths + public static List Monoliths { get{ return m_Monoliths; } set{ m_Monoliths = value; } diff --git a/Scripts/Engines/Factions/Items/Sigil.cs b/Scripts/Engines/Factions/Items/Sigil.cs index c52d3a11f..fe858af0c 100644 --- a/Scripts/Engines/Factions/Items/Sigil.cs +++ b/Scripts/Engines/Factions/Items/Sigil.cs @@ -3,6 +3,7 @@ using Server; using Server.Items; using Server.Mobiles; using Server.Network; +using System.Collections.Generic; namespace Server.Factions { @@ -463,8 +464,8 @@ namespace Server.Factions base.Delete(); } - private static SigilCollection m_Sigils = new SigilCollection(); + private static List m_Sigils = new List(); - public static SigilCollection Sigils{ get{ return m_Sigils; } } + public static List Sigils{ get{ return m_Sigils; } } } } \ No newline at end of file diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index 398ad76ca..288793c68 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -216,7 +216,7 @@ namespace Server.Factions understood = true; } - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Orders.cs b/Scripts/Engines/Factions/Mobiles/Guards/Orders.cs index d3b95b3bc..1acdd7771 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Orders.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Orders.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; namespace Server.Factions.AI { @@ -60,7 +61,7 @@ namespace Server.Factions.AI { private BaseFactionGuard m_Guard; - private ArrayList m_Reactions; + private List m_Reactions; private MovementType m_Movement; private Mobile m_Follow; @@ -75,7 +76,7 @@ namespace Server.Factions.AI for ( int i = 0; i < m_Reactions.Count; ++i ) { - reaction = (Reaction) m_Reactions[i]; + reaction = m_Reactions[i]; if ( reaction.Faction == faction ) return reaction; @@ -97,7 +98,7 @@ namespace Server.Factions.AI public Orders( BaseFactionGuard guard ) { m_Guard = guard; - m_Reactions = new ArrayList(); + m_Reactions = new List(); m_Movement = MovementType.Patrol; } @@ -117,7 +118,7 @@ namespace Server.Factions.AI case 0: { int count = reader.ReadEncodedInt(); - m_Reactions = new ArrayList( count ); + m_Reactions = new List( count ); for ( int i = 0; i < count; ++i ) m_Reactions.Add( new Reaction( reader ) ); @@ -138,7 +139,7 @@ namespace Server.Factions.AI writer.WriteEncodedInt( (int) m_Reactions.Count ); for ( int i = 0; i < m_Reactions.Count; ++i ) - ((Reaction)m_Reactions[i]).Serialize( writer ); + m_Reactions[i].Serialize( writer ); writer.WriteEncodedInt( (int) m_Movement ); } diff --git a/Scripts/Engines/Reports/Reports.cs b/Scripts/Engines/Reports/Reports.cs index 7f9824f1e..69fe66f79 100644 --- a/Scripts/Engines/Reports/Reports.cs +++ b/Scripts/Engines/Reports/Reports.cs @@ -7,6 +7,7 @@ using Server.Mobiles; using Server.Network; using Server.Factions; using Server.Accounting; +using System.Collections.Generic; namespace Server.Engines.Reports { @@ -233,7 +234,7 @@ namespace Server.Engines.Reports { PieChart chart = new PieChart( "Faction Membership", "graphs_faction_membership", true ); - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) chart.Items.Add( factions[i].Definition.FriendlyName, factions[i].Members.Count ); @@ -252,7 +253,7 @@ namespace Server.Engines.Reports ArrayList list = new ArrayList(); - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { @@ -303,12 +304,12 @@ namespace Server.Engines.Reports report.Columns.Add( "15%", "center", "Kill Points" ); report.Columns.Add( "15%", "center", "Silver" ); - FactionCollection factions = Faction.Factions; + List factions = Faction.Factions; for ( int i = 0; i < factions.Count; ++i ) { Faction faction = factions[i]; - PlayerStateCollection members = faction.Members; + List members = faction.Members; int totalKillPoints = 0; int totalMerchants = 0; @@ -344,7 +345,7 @@ namespace Server.Engines.Reports report.Columns.Add( "35%", "center", "Controller" ); report.Columns.Add( "30%", "center", "Capturable" ); - SigilCollection sigils = Sigil.Sigils; + List sigils = Sigil.Sigils; for ( int i = 0; i < sigils.Count; ++i ) { @@ -389,7 +390,7 @@ namespace Server.Engines.Reports report.Columns.Add( "13%", "center", "Silver" ); report.Columns.Add( "13%", "center", "Prices" ); - TownCollection towns = Town.Towns; + List towns = Town.Towns; for ( int i = 0; i < towns.Count; ++i ) {