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

58
Scripts/SpecialSystems/Items/Stones/AlchemyStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class AlchemyStone : Item
{
public override string DefaultName => "an Alchemist Supply Stone";
public class AlchemyStone : Item
{
[Constructible]
public AlchemyStone() : base(0xED4)
{
Movable = false;
Hue = 0x250;
}
[Constructible]
public AlchemyStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x250;
}
public AlchemyStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
AlchemyBag alcBag = new AlchemyBag();
public override string DefaultName => "an Alchemist Supply Stone";
if ( !from.AddToBackpack( alcBag ) )
alcBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
AlchemyBag alcBag = new AlchemyBag();
public AlchemyStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(alcBag))
alcBag.Delete();
}
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();
}
}
}

202
Scripts/SpecialSystems/Items/Stones/GamblingStone.cs
View file

@ -1,126 +1,126 @@
namespace Server.Items
{
public class GamblingStone : Item
{
private int m_GamblePot = 2500;
public class GamblingStone : Item
{
private int m_GamblePot = 2500;
[CommandProperty( AccessLevel.GameMaster )]
public int GamblePot
{
get => m_GamblePot;
set
{
m_GamblePot = value;
InvalidateProperties();
}
}
[Constructible]
public GamblingStone()
: base(0xED4)
{
Movable = false;
Hue = 0x56;
}
public override string DefaultName => "a gambling stone";
public GamblingStone(Serial serial)
: base(serial)
{
}
[Constructible]
public GamblingStone()
: base( 0xED4 )
{
Movable = false;
Hue = 0x56;
}
[CommandProperty(AccessLevel.GameMaster)]
public int GamblePot
{
get => m_GamblePot;
set
{
m_GamblePot = value;
InvalidateProperties();
}
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override string DefaultName => "a gambling stone";
list.Add( "Jackpot: {0}gp", m_GamblePot );
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
LabelTo( from, "Jackpot: {0}gp", m_GamblePot );
}
list.Add("Jackpot: {0}gp", m_GamblePot);
}
public override void OnDoubleClick( Mobile from )
{
Container pack = from.Backpack;
public override void OnSingleClick(Mobile from)
{
base.OnSingleClick(from);
LabelTo(from, "Jackpot: {0}gp", m_GamblePot);
}
if ( pack != null && pack.ConsumeTotal( typeof( Gold ), 250 ) )
{
m_GamblePot += 150;
InvalidateProperties();
public override void OnDoubleClick(Mobile from)
{
Container pack = from.Backpack;
int roll = Utility.Random( 1200 );
if (pack != null && pack.ConsumeTotal(typeof(Gold), 250))
{
m_GamblePot += 150;
InvalidateProperties();
if ( roll == 0 ) // Jackpot
{
int maxCheck = 1000000;
int roll = Utility.Random(1200);
from.SendMessage( 0x35, "You win the {0}gp jackpot!", m_GamblePot );
if (roll == 0) // Jackpot
{
int maxCheck = 1000000;
while( m_GamblePot > maxCheck )
{
from.AddToBackpack( new BankCheck( maxCheck ) );
from.SendMessage(0x35, "You win the {0}gp jackpot!", m_GamblePot);
m_GamblePot -= maxCheck;
}
while (m_GamblePot > maxCheck)
{
from.AddToBackpack(new BankCheck(maxCheck));
from.AddToBackpack( new BankCheck( m_GamblePot ) );
m_GamblePot -= maxCheck;
}
m_GamblePot = 2500;
}
else if ( roll <= 20 ) // Chance for a regbag
{
from.SendMessage( 0x35, "You win a bag of reagents!" );
from.AddToBackpack( new BagOfReagents( 50 ) );
}
else if ( roll <= 40 ) // Chance for gold
{
from.SendMessage( 0x35, "You win 1500gp!" );
from.AddToBackpack( new BankCheck( 1500 ) );
}
else if ( roll <= 100 ) // Another chance for gold
{
from.SendMessage( 0x35, "You win 1000gp!" );
from.AddToBackpack( new BankCheck( 1000 ) );
}
else // Loser!
{
from.SendMessage( 0x22, "You lose!" );
}
}
else
{
from.SendMessage( 0x22, "You need at least 250gp in your backpack to use this." );
}
}
from.AddToBackpack(new BankCheck(m_GamblePot));
public GamblingStone( Serial serial )
: base( serial )
{
}
m_GamblePot = 2500;
}
else if (roll <= 20) // Chance for a regbag
{
from.SendMessage(0x35, "You win a bag of reagents!");
from.AddToBackpack(new BagOfReagents(50));
}
else if (roll <= 40) // Chance for gold
{
from.SendMessage(0x35, "You win 1500gp!");
from.AddToBackpack(new BankCheck(1500));
}
else if (roll <= 100) // Another chance for gold
{
from.SendMessage(0x35, "You win 1000gp!");
from.AddToBackpack(new BankCheck(1000));
}
else // Loser!
{
from.SendMessage(0x22, "You lose!");
}
}
else
{
from.SendMessage(0x22, "You need at least 250gp in your backpack to use this.");
}
}
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
writer.Write( (int)m_GamblePot );
}
writer.Write(m_GamblePot);
}
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 0:
{
m_GamblePot = reader.ReadInt();
switch (version)
{
case 0:
{
m_GamblePot = reader.ReadInt();
break;
}
}
}
}
}
break;
}
}
}
}
}

58
Scripts/SpecialSystems/Items/Stones/IngotStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class IngotStone : Item
{
public override string DefaultName => "an Ingot stone";
public class IngotStone : Item
{
[Constructible]
public IngotStone() : base(0xED4)
{
Movable = false;
Hue = 0x480;
}
[Constructible]
public IngotStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x480;
}
public IngotStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
BagOfingots ingotBag = new BagOfingots( 5000 );
public override string DefaultName => "an Ingot stone";
if ( !from.AddToBackpack( ingotBag ) )
ingotBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
BagOfingots ingotBag = new BagOfingots(5000);
public IngotStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(ingotBag))
ingotBag.Delete();
}
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();
}
}
}

58
Scripts/SpecialSystems/Items/Stones/RegStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class RegStone : Item
{
public override string DefaultName => "a reagent stone";
public class RegStone : Item
{
[Constructible]
public RegStone() : base(0xED4)
{
Movable = false;
Hue = 0x2D1;
}
[Constructible]
public RegStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x2D1;
}
public RegStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
BagOfReagents regBag = new BagOfReagents( 50 );
public override string DefaultName => "a reagent stone";
if ( !from.AddToBackpack( regBag ) )
regBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
BagOfReagents regBag = new BagOfReagents(50);
public RegStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(regBag))
regBag.Delete();
}
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();
}
}
}

58
Scripts/SpecialSystems/Items/Stones/ScribeStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class ScribeStone : Item
{
public override string DefaultName => "a Scribe Supply Stone";
public class ScribeStone : Item
{
[Constructible]
public ScribeStone() : base(0xED4)
{
Movable = false;
Hue = 0x105;
}
[Constructible]
public ScribeStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x105;
}
public ScribeStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
ScribeBag scribeBag = new ScribeBag();
public override string DefaultName => "a Scribe Supply Stone";
if ( !from.AddToBackpack( scribeBag ) )
scribeBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
ScribeBag scribeBag = new ScribeBag();
public ScribeStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(scribeBag))
scribeBag.Delete();
}
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();
}
}
}

58
Scripts/SpecialSystems/Items/Stones/SmithStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class SmithStone : Item
{
public override string DefaultName => "a Blacksmith Supply Stone";
public class SmithStone : Item
{
[Constructible]
public SmithStone() : base(0xED4)
{
Movable = false;
Hue = 0x476;
}
[Constructible]
public SmithStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x476;
}
public SmithStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
SmithBag SmithBag = new SmithBag( 5000 );
public override string DefaultName => "a Blacksmith Supply Stone";
if ( !from.AddToBackpack( SmithBag ) )
SmithBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
SmithBag SmithBag = new SmithBag(5000);
public SmithStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(SmithBag))
SmithBag.Delete();
}
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();
}
}
}

58
Scripts/SpecialSystems/Items/Stones/TailorStone.cs
View file

@ -1,40 +1,40 @@
namespace Server.Items
{
public class TailorStone : Item
{
public override string DefaultName => "a Tailor Supply Stone";
public class TailorStone : Item
{
[Constructible]
public TailorStone() : base(0xED4)
{
Movable = false;
Hue = 0x315;
}
[Constructible]
public TailorStone() : base( 0xED4 )
{
Movable = false;
Hue = 0x315;
}
public TailorStone(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
TailorBag tailorBag = new TailorBag();
public override string DefaultName => "a Tailor Supply Stone";
if ( !from.AddToBackpack( tailorBag ) )
tailorBag.Delete();
}
public override void OnDoubleClick(Mobile from)
{
TailorBag tailorBag = new TailorBag();
public TailorStone( Serial serial ) : base( serial )
{
}
if (!from.AddToBackpack(tailorBag))
tailorBag.Delete();
}
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();
}
}
}