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

46
Scripts/Items/Talismans/Items/EnchantedSwitch.cs
View file

@ -1,31 +1,31 @@
namespace Server.Items
{
public class EnchantedSwitch : Item
{
public override int LabelNumber => 1072893; // enchanted switch
public class EnchantedSwitch : Item
{
[Constructible]
public EnchantedSwitch() : base(0x2F5C)
{
Weight = 1.0;
}
[Constructible]
public EnchantedSwitch() : base( 0x2F5C )
{
Weight = 1.0;
}
public EnchantedSwitch(Serial serial) : base(serial)
{
}
public EnchantedSwitch( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072893; // enchanted switch
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();
}
}
}

47
Scripts/Items/Talismans/Items/HollowPrism.cs
View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class HollowPrism : Item
{
public override int LabelNumber => 1072895; // hollow prism
public class HollowPrism : Item
{
[Constructible]
public HollowPrism() : base(0x2F5D)
{
Weight = 1.0;
}
[Constructible]
public HollowPrism() : base( 0x2F5D )
{
Weight = 1.0;
}
public HollowPrism(Serial serial) : base(serial)
{
}
public HollowPrism( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072895; // hollow prism
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

47
Scripts/Items/Talismans/Items/JeweledFiligree.cs
View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class JeweledFiligree : Item
{
public override int LabelNumber => 1072894; // jeweled filigree
public class JeweledFiligree : Item
{
[Constructible]
public JeweledFiligree() : base(0x2F5E)
{
Weight = 1.0;
}
[Constructible]
public JeweledFiligree() : base( 0x2F5E )
{
Weight = 1.0;
}
public JeweledFiligree(Serial serial) : base(serial)
{
}
public JeweledFiligree( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072894; // jeweled filigree
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

47
Scripts/Items/Talismans/Items/RunedPrism.cs
View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class RunedPrism : Item
{
public override int LabelNumber => 1073465; // runed prism
public class RunedPrism : Item
{
[Constructible]
public RunedPrism() : base(0x2F57)
{
Weight = 1.0;
}
[Constructible]
public RunedPrism() : base( 0x2F57 )
{
Weight = 1.0;
}
public RunedPrism(Serial serial) : base(serial)
{
}
public RunedPrism( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1073465; // runed prism
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

126
Scripts/Items/Talismans/Items/RunedSwitch.cs
View file

@ -2,74 +2,80 @@ using Server.Targeting;
namespace Server.Items
{
public class RunedSwitch : Item
{
public override int LabelNumber => 1072896; // runed switch
public class RunedSwitch : Item
{
[Constructible]
public RunedSwitch() : base(0x2F61)
{
Weight = 1.0;
}
[Constructible]
public RunedSwitch() : base( 0x2F61 )
{
Weight = 1.0;
}
public RunedSwitch(Serial serial) : base(serial)
{
}
public RunedSwitch( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072896; // runed switch
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1075101 ); // Please select an item to recharge.
from.Target = new InternalTarget( this );
}
else
from.SendLocalizedMessage( 1060640 ); // The item must be in your backpack to use it.
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1075101); // Please select an item to recharge.
from.Target = new InternalTarget(this);
}
else
{
from.SendLocalizedMessage(1060640); // The item must be in your backpack to use it.
}
}
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();
}
private class InternalTarget : Target
{
private RunedSwitch m_Item;
private class InternalTarget : Target
{
private RunedSwitch m_Item;
public InternalTarget( RunedSwitch item ) : base( 0, false, TargetFlags.None )
{
m_Item = item;
}
public InternalTarget(RunedSwitch item) : base(0, false, TargetFlags.None)
{
m_Item = item;
}
protected override void OnTarget( Mobile from, object o )
{
if ( m_Item == null || m_Item.Deleted )
return;
if ( o is BaseTalisman talisman )
{
if ( talisman.Charges == 0 )
{
talisman.Charges = talisman.MaxCharges;
m_Item.Delete();
from.SendLocalizedMessage( 1075100 ); // The item has been recharged.
}
else
from.SendLocalizedMessage( 1075099 ); // You cannot recharge that item until all of its current charges have been used.
}
else
from.SendLocalizedMessage( 1046439 ); // That is not a valid target.
}
}
}
}
protected override void OnTarget(Mobile from, object o)
{
if (m_Item == null || m_Item.Deleted)
return;
if (o is BaseTalisman talisman)
{
if (talisman.Charges == 0)
{
talisman.Charges = talisman.MaxCharges;
m_Item.Delete();
from.SendLocalizedMessage(1075100); // The item has been recharged.
}
else
{
from.SendLocalizedMessage(
1075099); // You cannot recharge that item until all of its current charges have been used.
}
}
else
{
from.SendLocalizedMessage(1046439); // That is not a valid target.
}
}
}
}
}