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

60
Scripts/Items/Body Parts/BonePile.cs
View file

@ -1,41 +1,41 @@
namespace Server.Items
{
[FlippableAttribute( 0x1B09, 0x1B10 )]
public class BonePile : Item, IScissorable
{
[Constructible]
public BonePile( ) : base( 0x1B09 + Utility.Random( 8 ) )
{
Stackable = false;
Weight = 10.0;
}
[Flippable(0x1B09, 0x1B10)]
public class BonePile : Item, IScissorable
{
[Constructible]
public BonePile() : base(0x1B09 + Utility.Random(8))
{
Stackable = false;
Weight = 10.0;
}
public BonePile( Serial serial ) : base( serial )
{
}
public BonePile(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
return false;
writer.Write( (int) 0 ); // version
}
base.ScissorHelper(from, new Bone(), Utility.RandomMinMax(10, 15));
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
return true;
}
int version = reader.ReadInt();
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public bool Scissor( Mobile from, Scissors scissors )
{
if ( Deleted || !from.CanSee( this ) )
return false;
writer.Write(0); // version
}
base.ScissorHelper( from, new Bone(), Utility.RandomMinMax( 10, 15 ) );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
return true;
}
}
int version = reader.ReadInt();
}
}
}

182
Scripts/Items/Body Parts/Head.cs
View file

@ -1,116 +1,114 @@
using System;
namespace Server.Items
{
public enum HeadType
{
Regular,
Duel,
Tournament
}
public enum HeadType
{
Regular,
Duel,
Tournament
}
public class Head : Item
{
[CommandProperty( AccessLevel.GameMaster )]
public string PlayerName { get; set; }
public class Head : Item
{
[Constructible]
public Head()
: this(null)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public HeadType HeadType { get; set; }
[Constructible]
public Head(string playerName)
: this(HeadType.Regular, playerName)
{
}
public override string DefaultName
{
get
{
if ( PlayerName == null )
return base.DefaultName;
[Constructible]
public Head(HeadType headType, string playerName)
: base(0x1DA0)
{
HeadType = headType;
PlayerName = playerName;
}
switch ( HeadType )
{
default:
return $"the head of {PlayerName}";
public Head(Serial serial)
: base(serial)
{
}
case HeadType.Duel:
return $"the head of {PlayerName}, taken in a duel";
[CommandProperty(AccessLevel.GameMaster)]
public string PlayerName{ get; set; }
case HeadType.Tournament:
return $"the head of {PlayerName}, taken in a tournament";
}
}
}
[CommandProperty(AccessLevel.GameMaster)]
public HeadType HeadType{ get; set; }
[Constructible]
public Head()
: this( null )
{
}
public override string DefaultName
{
get
{
if (PlayerName == null)
return base.DefaultName;
[Constructible]
public Head( string playerName )
: this( HeadType.Regular, playerName )
{
}
switch (HeadType)
{
default:
return $"the head of {PlayerName}";
[Constructible]
public Head( HeadType headType, string playerName )
: base( 0x1DA0 )
{
HeadType = headType;
PlayerName = playerName;
}
case HeadType.Duel:
return $"the head of {PlayerName}, taken in a duel";
public Head( Serial serial )
: base( serial )
{
}
case HeadType.Tournament:
return $"the head of {PlayerName}, taken in a tournament";
}
}
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
writer.Write(1); // version
writer.Write( (string) PlayerName );
writer.WriteEncodedInt( (int) HeadType );
}
writer.Write(PlayerName);
writer.WriteEncodedInt((int)HeadType);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
switch ( version )
{
case 1:
PlayerName = reader.ReadString();
HeadType = (HeadType) reader.ReadEncodedInt();
break;
switch (version)
{
case 1:
PlayerName = reader.ReadString();
HeadType = (HeadType)reader.ReadEncodedInt();
break;
case 0:
string format = Name;
case 0:
string format = Name;
if ( format != null )
{
if ( format.StartsWith( "the head of " ) )
format = format.Substring( "the head of ".Length );
if (format != null)
{
if (format.StartsWith("the head of "))
format = format.Substring("the head of ".Length);
if ( format.EndsWith( ", taken in a duel" ) )
{
format = format.Substring( 0, format.Length - ", taken in a duel".Length );
HeadType = HeadType.Duel;
}
else if ( format.EndsWith( ", taken in a tournament" ) )
{
format = format.Substring( 0, format.Length - ", taken in a tournament".Length );
HeadType = HeadType.Tournament;
}
}
if (format.EndsWith(", taken in a duel"))
{
format = format.Substring(0, format.Length - ", taken in a duel".Length);
HeadType = HeadType.Duel;
}
else if (format.EndsWith(", taken in a tournament"))
{
format = format.Substring(0, format.Length - ", taken in a tournament".Length);
HeadType = HeadType.Tournament;
}
}
PlayerName = format;
Name = null;
PlayerName = format;
Name = null;
break;
}
}
}
break;
}
}
}
}

40
Scripts/Items/Body Parts/LeftArm.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class LeftArm : Item
{
[Constructible]
public LeftArm() : base( 0x1DA1 )
{
}
public class LeftArm : Item
{
[Constructible]
public LeftArm() : base(0x1DA1)
{
}
public LeftArm( Serial serial ) : base( serial )
{
}
public LeftArm(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

40
Scripts/Items/Body Parts/LeftLeg.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class LeftLeg : Item
{
[Constructible]
public LeftLeg() : base( 0x1DA3 )
{
}
public class LeftLeg : Item
{
[Constructible]
public LeftLeg() : base(0x1DA3)
{
}
public LeftLeg( Serial serial ) : base( serial )
{
}
public LeftLeg(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

60
Scripts/Items/Body Parts/RibCage.cs
View file

@ -1,41 +1,41 @@
namespace Server.Items
{
[FlippableAttribute( 0x1B17, 0x1B18 )]
public class RibCage : Item, IScissorable
{
[Constructible]
public RibCage() : base( 0x1B17 + Utility.Random( 2 ) )
{
Stackable = false;
Weight = 5.0;
}
[Flippable(0x1B17, 0x1B18)]
public class RibCage : Item, IScissorable
{
[Constructible]
public RibCage() : base(0x1B17 + Utility.Random(2))
{
Stackable = false;
Weight = 5.0;
}
public RibCage( Serial serial ) : base( serial )
{
}
public RibCage(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
return false;
writer.Write( (int) 0 ); // version
}
base.ScissorHelper(from, new Bone(), Utility.RandomMinMax(3, 5));
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
return true;
}
int version = reader.ReadInt();
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public bool Scissor( Mobile from, Scissors scissors )
{
if ( Deleted || !from.CanSee( this ) )
return false;
writer.Write(0); // version
}
base.ScissorHelper( from, new Bone(), Utility.RandomMinMax( 3, 5 ) );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
return true;
}
}
int version = reader.ReadInt();
}
}
}

40
Scripts/Items/Body Parts/RightArm.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class RightArm : Item
{
[Constructible]
public RightArm() : base( 0x1DA2 )
{
}
public class RightArm : Item
{
[Constructible]
public RightArm() : base(0x1DA2)
{
}
public RightArm( Serial serial ) : base( serial )
{
}
public RightArm(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

40
Scripts/Items/Body Parts/RightLeg.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class RightLeg : Item
{
[Constructible]
public RightLeg() : base( 0x1DA4 )
{
}
public class RightLeg : Item
{
[Constructible]
public RightLeg() : base(0x1DA4)
{
}
public RightLeg( Serial serial ) : base( serial )
{
}
public RightLeg(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

42
Scripts/Items/Body Parts/Torso.cs
View file

@ -1,29 +1,29 @@
namespace Server.Items
{
public class Torso : Item
{
[Constructible]
public Torso() : base( 0x1D9F )
{
Weight = 2.0;
}
public class Torso : Item
{
[Constructible]
public Torso() : base(0x1D9F)
{
Weight = 2.0;
}
public Torso( Serial serial ) : base( serial )
{
}
public Torso(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}