Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,510 +1,514 @@
using System;
using System.Collections;
using Server.Targeting;
using Server.Commands;
using System.Collections.Generic;
using Server.Commands;
using Server.Targeting;
namespace Server.Factions
{
[CustomEnum( new[]{ "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" } )]
public abstract class Town : IComparable
{
private TownState m_State;
public TownDefinition Definition { get; set; }
public TownState State
{
get => m_State;
set{ m_State = value; ConstructGuardLists(); }
}
public int Silver
{
get => m_State.Silver;
set => m_State.Silver = value;
}
public Faction Owner
{
get => m_State.Owner;
set => Capture( value );
}
public Mobile Sheriff
{
get => m_State.Sheriff;
set => m_State.Sheriff = value;
}
public Mobile Finance
{
get => m_State.Finance;
set => m_State.Finance = value;
}
public int Tax
{
get => m_State.Tax;
set => m_State.Tax = value;
}
public DateTime LastTaxChange
{
get => m_State.LastTaxChange;
set => m_State.LastTaxChange = value;
}
public static readonly TimeSpan TaxChangePeriod = TimeSpan.FromHours( 12.0 );
public static readonly TimeSpan IncomePeriod = TimeSpan.FromDays( 1.0 );
public bool TaxChangeReady => ( m_State.LastTaxChange + TaxChangePeriod ) < DateTime.UtcNow;
public static Town FromRegion( Region reg )
{
if ( reg.Map != Faction.Facet )
return null;
List<Town> towns = Towns;
for ( int i = 0; i < towns.Count; ++i )
{
Town town = towns[i];
if ( reg.IsPartOf( town.Definition.Region ) )
return town;
}
return null;
}
public int FinanceUpkeep
{
get
{
List<VendorList> vendorLists = VendorLists;
int upkeep = 0;
for ( int i = 0; i < vendorLists.Count; ++i )
upkeep += vendorLists[i].Vendors.Count * vendorLists[i].Definition.Upkeep;
return upkeep;
}
}
public int SheriffUpkeep
{
get
{
List<GuardList> guardLists = GuardLists;
int upkeep = 0;
for ( int i = 0; i < guardLists.Count; ++i )
upkeep += guardLists[i].Guards.Count * guardLists[i].Definition.Upkeep;
return upkeep;
}
}
public int DailyIncome => (10000 * (100 + m_State.Tax)) / 100;
public int NetCashFlow => DailyIncome - FinanceUpkeep - SheriffUpkeep;
public TownMonolith Monolith
{
get
{
List<BaseMonolith> monoliths = BaseMonolith.Monoliths;
foreach ( BaseMonolith monolith in monoliths )
{
if ( monolith is TownMonolith townMonolith && townMonolith.Town == this )
return townMonolith;
}
return null;
}
}
public DateTime LastIncome
{
get => m_State.LastIncome;
set => m_State.LastIncome = value;
}
public void BeginOrderFiring( Mobile from )
{
bool isFinance = IsFinance( from );
bool isSheriff = IsSheriff( from );
string type = null;
// NOTE: Messages not OSI-accurate, intentional
if ( isFinance && isSheriff ) // GM only
type = "vendor or guard";
else if ( isFinance )
type = "vendor";
else if ( isSheriff )
type = "guard";
from.SendMessage( "Target the {0} you wish to dismiss.", type );
from.BeginTarget( 12, false, TargetFlags.None, EndOrderFiring );
}
[CustomEnum(new[] { "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" })]
public abstract class Town : IComparable
{
public const int SilverCaptureBonus = 10000;
public static readonly TimeSpan TaxChangePeriod = TimeSpan.FromHours(12.0);
public static readonly TimeSpan IncomePeriod = TimeSpan.FromDays(1.0);
private Timer m_IncomeTimer;
private TownState m_State;
public Town()
{
m_State = new TownState(this);
ConstructVendorLists();
ConstructGuardLists();
StartIncomeTimer();
}
public TownDefinition Definition{ get; set; }
public TownState State
{
get => m_State;
set
{
m_State = value;
ConstructGuardLists();
}
}
public int Silver
{
get => m_State.Silver;
set => m_State.Silver = value;
}
public Faction Owner
{
get => m_State.Owner;
set => Capture(value);
}
public Mobile Sheriff
{
get => m_State.Sheriff;
set => m_State.Sheriff = value;
}
public Mobile Finance
{
get => m_State.Finance;
set => m_State.Finance = value;
}
public int Tax
{
get => m_State.Tax;
set => m_State.Tax = value;
}
public DateTime LastTaxChange
{
get => m_State.LastTaxChange;
set => m_State.LastTaxChange = value;
}
public bool TaxChangeReady => m_State.LastTaxChange + TaxChangePeriod < DateTime.UtcNow;
public int FinanceUpkeep
{
get
{
List<VendorList> vendorLists = VendorLists;
int upkeep = 0;
for (int i = 0; i < vendorLists.Count; ++i)
upkeep += vendorLists[i].Vendors.Count * vendorLists[i].Definition.Upkeep;
return upkeep;
}
}
public int SheriffUpkeep
{
get
{
List<GuardList> guardLists = GuardLists;
int upkeep = 0;
for (int i = 0; i < guardLists.Count; ++i)
upkeep += guardLists[i].Guards.Count * guardLists[i].Definition.Upkeep;
return upkeep;
}
}
public int DailyIncome => 10000 * (100 + m_State.Tax) / 100;
public int NetCashFlow => DailyIncome - FinanceUpkeep - SheriffUpkeep;
public TownMonolith Monolith
{
get
{
List<BaseMonolith> monoliths = BaseMonolith.Monoliths;
foreach (BaseMonolith monolith in monoliths)
if (monolith is TownMonolith townMonolith && townMonolith.Town == this)
return townMonolith;
return null;
}
}
public DateTime LastIncome
{
get => m_State.LastIncome;
set => m_State.LastIncome = value;
}
public List<VendorList> VendorLists{ get; set; }
public List<GuardList> GuardLists{ get; set; }
public static List<Town> Towns => Reflector.Towns;
public int CompareTo(object obj)
{
return Definition.Sort - ((Town)obj).Definition.Sort;
}
public static Town FromRegion(Region reg)
{
if (reg.Map != Faction.Facet)
return null;
List<Town> towns = Towns;
for (int i = 0; i < towns.Count; ++i)
{
Town town = towns[i];
if (reg.IsPartOf(town.Definition.Region))
return town;
}
return null;
}
public void BeginOrderFiring(Mobile from)
{
bool isFinance = IsFinance(from);
bool isSheriff = IsSheriff(from);
string type = null;
// NOTE: Messages not OSI-accurate, intentional
if (isFinance && isSheriff) // GM only
type = "vendor or guard";
else if (isFinance)
type = "vendor";
else if (isSheriff)
type = "guard";
public void EndOrderFiring( Mobile from, object obj )
{
bool isFinance = IsFinance( from );
bool isSheriff = IsSheriff( from );
string type = null;
from.SendMessage("Target the {0} you wish to dismiss.", type);
from.BeginTarget(12, false, TargetFlags.None, EndOrderFiring);
}
if ( isFinance && isSheriff ) // GM only
type = "vendor or guard";
else if ( isFinance )
type = "vendor";
else if ( isSheriff )
type = "guard";
public void EndOrderFiring(Mobile from, object obj)
{
bool isFinance = IsFinance(from);
bool isSheriff = IsSheriff(from);
string type = null;
if ( obj is BaseFactionVendor vendor && vendor.Town == this && isFinance )
vendor.Delete();
else if ( obj is BaseFactionGuard guard && guard.Town == this && isSheriff )
guard.Delete();
else
{
from.SendMessage( "That is not a {0}!", type );
}
}
if (isFinance && isSheriff) // GM only
type = "vendor or guard";
else if (isFinance)
type = "vendor";
else if (isSheriff)
type = "guard";
private Timer m_IncomeTimer;
if (obj is BaseFactionVendor vendor && vendor.Town == this && isFinance)
vendor.Delete();
else if (obj is BaseFactionGuard guard && guard.Town == this && isSheriff)
guard.Delete();
else
from.SendMessage("That is not a {0}!", type);
}
public void StartIncomeTimer()
{
m_IncomeTimer?.Stop();
public void StartIncomeTimer()
{
m_IncomeTimer?.Stop();
m_IncomeTimer = Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), CheckIncome );
}
m_IncomeTimer = Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), CheckIncome);
}
public void StopIncomeTimer()
{
m_IncomeTimer?.Stop();
public void StopIncomeTimer()
{
m_IncomeTimer?.Stop();
m_IncomeTimer = null;
}
m_IncomeTimer = null;
}
public void CheckIncome()
{
if ( (LastIncome + IncomePeriod) > DateTime.UtcNow || Owner == null )
return;
public void CheckIncome()
{
if (LastIncome + IncomePeriod > DateTime.UtcNow || Owner == null)
return;
ProcessIncome();
}
ProcessIncome();
}
public void ProcessIncome()
{
LastIncome = DateTime.UtcNow;
public void ProcessIncome()
{
LastIncome = DateTime.UtcNow;
int flow = NetCashFlow;
int flow = NetCashFlow;
if ( (Silver + flow) < 0 )
{
ArrayList toDelete = BuildFinanceList();
if (Silver + flow < 0)
{
ArrayList toDelete = BuildFinanceList();
while ( (Silver + flow) < 0 && toDelete.Count > 0 )
{
int index = Utility.Random( toDelete.Count );
Mobile mob = (Mobile)toDelete[index];
while (Silver + flow < 0 && toDelete.Count > 0)
{
int index = Utility.Random(toDelete.Count);
Mobile mob = (Mobile)toDelete[index];
mob.Delete();
mob.Delete();
toDelete.RemoveAt( index );
flow = NetCashFlow;
}
}
toDelete.RemoveAt(index);
flow = NetCashFlow;
}
}
Silver += flow;
}
Silver += flow;
}
public ArrayList BuildFinanceList()
{
ArrayList list = new ArrayList();
public ArrayList BuildFinanceList()
{
ArrayList list = new ArrayList();
List<VendorList> vendorLists = VendorLists;
List<VendorList> vendorLists = VendorLists;
for ( int i = 0; i < vendorLists.Count; ++i )
list.AddRange( vendorLists[i].Vendors );
for (int i = 0; i < vendorLists.Count; ++i)
list.AddRange(vendorLists[i].Vendors);
List<GuardList> guardLists = GuardLists;
List<GuardList> guardLists = GuardLists;
for ( int i = 0; i < guardLists.Count; ++i )
list.AddRange( guardLists[i].Guards );
for (int i = 0; i < guardLists.Count; ++i)
list.AddRange(guardLists[i].Guards);
return list;
}
return list;
}
public List<VendorList> VendorLists { get; set; }
public void ConstructGuardLists()
{
GuardDefinition[] defs = Owner == null ? new GuardDefinition[0] : Owner.Definition.Guards;
public List<GuardList> GuardLists { get; set; }
GuardLists = new List<GuardList>();
public void ConstructGuardLists()
{
GuardDefinition[] defs = ( Owner == null ? new GuardDefinition[0] : Owner.Definition.Guards );
for (int i = 0; i < defs.Length; ++i)
GuardLists.Add(new GuardList(defs[i]));
}
GuardLists = new List<GuardList>();
public GuardList FindGuardList(Type type)
{
List<GuardList> guardLists = GuardLists;
for ( int i = 0; i < defs.Length; ++i )
GuardLists.Add( new GuardList( defs[i] ) );
}
for (int i = 0; i < guardLists.Count; ++i)
{
GuardList guardList = guardLists[i];
public GuardList FindGuardList( Type type )
{
List<GuardList> guardLists = GuardLists;
if (guardList.Definition.Type == type)
return guardList;
}
for ( int i = 0; i < guardLists.Count; ++i )
{
GuardList guardList = guardLists[i];
return null;
}
if ( guardList.Definition.Type == type )
return guardList;
}
public void ConstructVendorLists()
{
VendorDefinition[] defs = VendorDefinition.Definitions;
return null;
}
VendorLists = new List<VendorList>();
public void ConstructVendorLists()
{
VendorDefinition[] defs = VendorDefinition.Definitions;
for (int i = 0; i < defs.Length; ++i)
VendorLists.Add(new VendorList(defs[i]));
}
VendorLists = new List<VendorList>();
public VendorList FindVendorList(Type type)
{
List<VendorList> vendorLists = VendorLists;
for ( int i = 0; i < defs.Length; ++i )
VendorLists.Add( new VendorList( defs[i] ) );
}
for (int i = 0; i < vendorLists.Count; ++i)
{
VendorList vendorList = vendorLists[i];
public VendorList FindVendorList( Type type )
{
List<VendorList> vendorLists = VendorLists;
if (vendorList.Definition.Type == type)
return vendorList;
}
for ( int i = 0; i < vendorLists.Count; ++i )
{
VendorList vendorList = vendorLists[i];
return null;
}
if ( vendorList.Definition.Type == type )
return vendorList;
}
public bool RegisterGuard(BaseFactionGuard guard)
{
if (guard == null)
return false;
return null;
}
GuardList guardList = FindGuardList(guard.GetType());
public bool RegisterGuard( BaseFactionGuard guard )
{
if ( guard == null )
return false;
if (guardList == null)
return false;
GuardList guardList = FindGuardList( guard.GetType() );
guardList.Guards.Add(guard);
return true;
}
if ( guardList == null )
return false;
public bool UnregisterGuard(BaseFactionGuard guard)
{
if (guard == null)
return false;
guardList.Guards.Add( guard );
return true;
}
GuardList guardList = FindGuardList(guard.GetType());
public bool UnregisterGuard( BaseFactionGuard guard )
{
if ( guard == null )
return false;
if (guardList == null)
return false;
GuardList guardList = FindGuardList( guard.GetType() );
if (!guardList.Guards.Contains(guard))
return false;
if ( guardList == null )
return false;
guardList.Guards.Remove(guard);
return true;
}
if ( !guardList.Guards.Contains( guard ) )
return false;
public bool RegisterVendor(BaseFactionVendor vendor)
{
if (vendor == null)
return false;
guardList.Guards.Remove( guard );
return true;
}
VendorList vendorList = FindVendorList(vendor.GetType());
public bool RegisterVendor( BaseFactionVendor vendor )
{
if ( vendor == null )
return false;
if (vendorList == null)
return false;
VendorList vendorList = FindVendorList( vendor.GetType() );
vendorList.Vendors.Add(vendor);
return true;
}
if ( vendorList == null )
return false;
public bool UnregisterVendor(BaseFactionVendor vendor)
{
if (vendor == null)
return false;
vendorList.Vendors.Add( vendor );
return true;
}
VendorList vendorList = FindVendorList(vendor.GetType());
public bool UnregisterVendor( BaseFactionVendor vendor )
{
if ( vendor == null )
return false;
if (vendorList == null)
return false;
VendorList vendorList = FindVendorList( vendor.GetType() );
if (!vendorList.Vendors.Contains(vendor))
return false;
if ( vendorList == null )
return false;
vendorList.Vendors.Remove(vendor);
return true;
}
if ( !vendorList.Vendors.Contains( vendor ) )
return false;
public static void Initialize()
{
List<Town> towns = Towns;
vendorList.Vendors.Remove( vendor );
return true;
}
for (int i = 0; i < towns.Count; ++i)
{
towns[i].Sheriff = towns[i].Sheriff;
towns[i].Finance = towns[i].Finance;
}
public static void Initialize()
{
List<Town> towns = Towns;
CommandSystem.Register("GrantTownSilver", AccessLevel.Administrator, GrantTownSilver_OnCommand);
}
for ( int i = 0; i < towns.Count; ++i )
{
towns[i].Sheriff = towns[i].Sheriff;
towns[i].Finance = towns[i].Finance;
}
public bool IsSheriff(Mobile mob)
{
if (mob == null || mob.Deleted)
return false;
CommandSystem.Register( "GrantTownSilver", AccessLevel.Administrator, GrantTownSilver_OnCommand );
}
return mob.AccessLevel >= AccessLevel.GameMaster || mob == Sheriff;
}
public Town()
{
m_State = new TownState( this );
ConstructVendorLists();
ConstructGuardLists();
StartIncomeTimer();
}
public bool IsFinance(Mobile mob)
{
if (mob == null || mob.Deleted)
return false;
public bool IsSheriff( Mobile mob )
{
if ( mob == null || mob.Deleted )
return false;
return mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance;
}
return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Sheriff );
}
public void Capture(Faction f)
{
if (m_State.Owner == f)
return;
public bool IsFinance( Mobile mob )
{
if ( mob == null || mob.Deleted )
return false;
return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance );
}
public static List<Town> Towns => Reflector.Towns;
public const int SilverCaptureBonus = 10000;
public void Capture( Faction f )
{
if ( m_State.Owner == f )
return;
if ( m_State.Owner == null ) // going from unowned to owned
{
LastIncome = DateTime.UtcNow;
f.Silver += SilverCaptureBonus;
}
else if ( f == null ) // going from owned to unowned
{
LastIncome = DateTime.MinValue;
}
else // otherwise changing hands, income timer doesn't change
{
f.Silver += SilverCaptureBonus;
}
m_State.Owner = f;
Sheriff = null;
Finance = null;
TownMonolith monolith = Monolith;
if ( monolith != null )
monolith.Faction = f;
List<VendorList> vendorLists = VendorLists;
for ( int i = 0; i < vendorLists.Count; ++i )
{
VendorList vendorList = vendorLists[i];
List<BaseFactionVendor> vendors = vendorList.Vendors;
for ( int j = vendors.Count - 1; j >= 0; --j )
vendors[j].Delete();
}
List<GuardList> guardLists = GuardLists;
for ( int i = 0; i < guardLists.Count; ++i )
{
GuardList guardList = guardLists[i];
List<BaseFactionGuard> guards = guardList.Guards;
for ( int j = guards.Count - 1; j >= 0; --j )
guards[j].Delete();
}
ConstructGuardLists();
}
public int CompareTo( object obj )
{
return Definition.Sort - ((Town)obj).Definition.Sort;
}
public override string ToString()
{
return Definition.FriendlyName;
}
public static void WriteReference( GenericWriter writer, Town town )
{
int idx = Towns.IndexOf( town );
writer.WriteEncodedInt( (int) (idx + 1) );
}
public static Town ReadReference( GenericReader reader )
{
int idx = reader.ReadEncodedInt() - 1;
if ( idx >= 0 && idx < Towns.Count )
return Towns[idx];
return null;
}
public static Town Parse( string name )
{
List<Town> towns = Towns;
for ( int i = 0; i < towns.Count; ++i )
{
Town town = towns[i];
if ( Insensitive.Equals( town.Definition.FriendlyName, name ) )
return town;
}
return null;
}
public static void GrantTownSilver_OnCommand( CommandEventArgs e )
{
Town town = FromRegion( e.Mobile.Region );
if ( town == null )
e.Mobile.SendMessage( "You are not in a faction town." );
else if ( e.Length == 0 )
e.Mobile.SendMessage( "Format: GrantTownSilver <amount>" );
else
{
town.Silver += e.GetInt32( 0 );
e.Mobile.SendMessage( "You have granted {0:N0} silver to the town. It now has {1:N0} silver.", e.GetInt32( 0 ), town.Silver );
}
}
}
}
if (m_State.Owner == null) // going from unowned to owned
{
LastIncome = DateTime.UtcNow;
f.Silver += SilverCaptureBonus;
}
else if (f == null) // going from owned to unowned
{
LastIncome = DateTime.MinValue;
}
else // otherwise changing hands, income timer doesn't change
{
f.Silver += SilverCaptureBonus;
}
m_State.Owner = f;
Sheriff = null;
Finance = null;
TownMonolith monolith = Monolith;
if (monolith != null)
monolith.Faction = f;
List<VendorList> vendorLists = VendorLists;
for (int i = 0; i < vendorLists.Count; ++i)
{
VendorList vendorList = vendorLists[i];
List<BaseFactionVendor> vendors = vendorList.Vendors;
for (int j = vendors.Count - 1; j >= 0; --j)
vendors[j].Delete();
}
List<GuardList> guardLists = GuardLists;
for (int i = 0; i < guardLists.Count; ++i)
{
GuardList guardList = guardLists[i];
List<BaseFactionGuard> guards = guardList.Guards;
for (int j = guards.Count - 1; j >= 0; --j)
guards[j].Delete();
}
ConstructGuardLists();
}
public override string ToString()
{
return Definition.FriendlyName;
}
public static void WriteReference(GenericWriter writer, Town town)
{
int idx = Towns.IndexOf(town);
writer.WriteEncodedInt(idx + 1);
}
public static Town ReadReference(GenericReader reader)
{
int idx = reader.ReadEncodedInt() - 1;
if (idx >= 0 && idx < Towns.Count)
return Towns[idx];
return null;
}
public static Town Parse(string name)
{
List<Town> towns = Towns;
for (int i = 0; i < towns.Count; ++i)
{
Town town = towns[i];
if (Insensitive.Equals(town.Definition.FriendlyName, name))
return town;
}
return null;
}
public static void GrantTownSilver_OnCommand(CommandEventArgs e)
{
Town town = FromRegion(e.Mobile.Region);
if (town == null)
{
e.Mobile.SendMessage("You are not in a faction town.");
}
else if (e.Length == 0)
{
e.Mobile.SendMessage("Format: GrantTownSilver <amount>");
}
else
{
town.Silver += e.GetInt32(0);
e.Mobile.SendMessage("You have granted {0:N0} silver to the town. It now has {1:N0} silver.", e.GetInt32(0),
town.Silver);
}
}
}
}