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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

218
Server/Poison.cs
View file

@ -23,113 +23,115 @@ using System.Collections.Generic;
namespace Server
{
[Parsable]
public abstract class Poison
[Parsable]
public abstract class Poison
{
/*public abstract TimeSpan Interval{ get; }
public abstract TimeSpan Duration{ get; }*/
public abstract string Name{ get; }
public abstract int Level{ get; }
public static Poison Lesser => GetPoison("Lesser");
public static Poison Regular => GetPoison("Regular");
public static Poison Greater => GetPoison("Greater");
public static Poison Deadly => GetPoison("Deadly");
public static Poison Lethal => GetPoison("Lethal");
public static List<Poison> Poisons{ get; } = new List<Poison>();
public abstract Timer ConstructTimer(Mobile m);
/*public abstract void OnDamage( Mobile m, ref object state );*/
public override string ToString()
{
/*public abstract TimeSpan Interval{ get; }
public abstract TimeSpan Duration{ get; }*/
public abstract string Name { get; }
public abstract int Level { get; }
public abstract Timer ConstructTimer( Mobile m );
/*public abstract void OnDamage( Mobile m, ref object state );*/
public override string ToString()
{
return Name;
}
public static void Register( Poison reg )
{
string regName = reg.Name.ToLower();
for ( int i = 0; i < Poisons.Count; i++ )
{
if ( reg.Level == Poisons[i].Level )
throw new Exception( "A poison with that level already exists." );
if ( regName == Poisons[i].Name.ToLower() )
throw new Exception( "A poison with that name already exists." );
}
Poisons.Add( reg );
}
public static Poison Lesser => GetPoison( "Lesser" );
public static Poison Regular => GetPoison( "Regular" );
public static Poison Greater => GetPoison( "Greater" );
public static Poison Deadly => GetPoison( "Deadly" );
public static Poison Lethal => GetPoison( "Lethal" );
public static List<Poison> Poisons { get; } = new List<Poison>();
public static Poison Parse( string value )
{
Poison p = null;
int plevel;
if ( int.TryParse( value, out plevel ) )
p = GetPoison( plevel );
if ( p == null )
p = GetPoison( value );
return p;
}
public static Poison GetPoison( int level )
{
for ( int i = 0; i < Poisons.Count; ++i )
{
Poison p = Poisons[i];
if ( p.Level == level )
return p;
}
return null;
}
public static Poison GetPoison( string name )
{
for ( int i = 0; i < Poisons.Count; ++i )
{
Poison p = Poisons[i];
if ( Utility.InsensitiveCompare( p.Name, name ) == 0 )
return p;
}
return null;
}
public static void Serialize( Poison p, GenericWriter writer )
{
if ( p == null )
{
writer.Write( (byte)0 );
}
else
{
writer.Write( (byte)1 );
writer.Write( (byte)p.Level );
}
}
public static Poison Deserialize( GenericReader reader )
{
switch ( reader.ReadByte() )
{
case 1: return GetPoison( reader.ReadByte() );
case 2:
//no longer used, safe to remove?
reader.ReadInt();
reader.ReadDouble();
reader.ReadInt();
reader.ReadTimeSpan();
break;
}
return null;
}
return Name;
}
}
public static void Register(Poison reg)
{
string regName = reg.Name.ToLower();
for (int i = 0; i < Poisons.Count; i++)
{
if (reg.Level == Poisons[i].Level)
throw new Exception("A poison with that level already exists.");
if (regName == Poisons[i].Name.ToLower())
throw new Exception("A poison with that name already exists.");
}
Poisons.Add(reg);
}
public static Poison Parse(string value)
{
Poison p = null;
int plevel;
if (int.TryParse(value, out plevel))
p = GetPoison(plevel);
if (p == null)
p = GetPoison(value);
return p;
}
public static Poison GetPoison(int level)
{
for (int i = 0; i < Poisons.Count; ++i)
{
Poison p = Poisons[i];
if (p.Level == level)
return p;
}
return null;
}
public static Poison GetPoison(string name)
{
for (int i = 0; i < Poisons.Count; ++i)
{
Poison p = Poisons[i];
if (Utility.InsensitiveCompare(p.Name, name) == 0)
return p;
}
return null;
}
public static void Serialize(Poison p, GenericWriter writer)
{
if (p == null)
{
writer.Write((byte)0);
}
else
{
writer.Write((byte)1);
writer.Write((byte)p.Level);
}
}
public static Poison Deserialize(GenericReader reader)
{
switch (reader.ReadByte())
{
case 1: return GetPoison(reader.ReadByte());
case 2:
//no longer used, safe to remove?
reader.ReadInt();
reader.ReadDouble();
reader.ReadInt();
reader.ReadTimeSpan();
break;
}
return null;
}
}
}