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

68
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs
View file

@ -1,47 +1,49 @@
using Server.Engines.ConPVP;
namespace Server.Items
{
public abstract class BasePoisonPotion : BasePotion
{
public abstract Poison Poison{ get; }
public abstract class BasePoisonPotion : BasePotion
{
public BasePoisonPotion(PotionEffect effect) : base(0xF0A, effect)
{
}
public abstract double MinPoisoningSkill{ get; }
public abstract double MaxPoisoningSkill{ get; }
public BasePoisonPotion(Serial serial) : base(serial)
{
}
public BasePoisonPotion( PotionEffect effect ) : base( 0xF0A, effect )
{
}
public abstract Poison Poison{ get; }
public BasePoisonPotion( Serial serial ) : base( serial )
{
}
public abstract double MinPoisoningSkill{ get; }
public abstract double MaxPoisoningSkill{ get; }
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();
}
public void DoPoison( Mobile from )
{
from.ApplyPoison( from, Poison );
}
public void DoPoison(Mobile from)
{
from.ApplyPoison(from, Poison);
}
public override void Drink( Mobile from )
{
DoPoison( from );
public override void Drink(Mobile from)
{
DoPoison(from);
PlayDrinkEffect( from );
PlayDrinkEffect(from);
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
Consume();
}
}
if (!DuelContext.IsFreeConsume(from))
Consume();
}
}
}

48
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs
View file

@ -1,33 +1,33 @@
namespace Server.Items
{
public class DeadlyPoisonPotion : BasePoisonPotion
{
public override Poison Poison => Poison.Deadly;
public class DeadlyPoisonPotion : BasePoisonPotion
{
[Constructible]
public DeadlyPoisonPotion() : base(PotionEffect.PoisonDeadly)
{
}
public override double MinPoisoningSkill => 95.0;
public override double MaxPoisoningSkill => 100.0;
public DeadlyPoisonPotion(Serial serial) : base(serial)
{
}
[Constructible]
public DeadlyPoisonPotion() : base( PotionEffect.PoisonDeadly )
{
}
public override Poison Poison => Poison.Deadly;
public DeadlyPoisonPotion( Serial serial ) : base( serial )
{
}
public override double MinPoisoningSkill => 95.0;
public override double MaxPoisoningSkill => 100.0;
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();
}
}
}

48
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs
View file

@ -1,33 +1,33 @@
namespace Server.Items
{
public class GreaterPoisonPotion : BasePoisonPotion
{
public override Poison Poison => Poison.Greater;
public class GreaterPoisonPotion : BasePoisonPotion
{
[Constructible]
public GreaterPoisonPotion() : base(PotionEffect.PoisonGreater)
{
}
public override double MinPoisoningSkill => 60.0;
public override double MaxPoisoningSkill => 100.0;
public GreaterPoisonPotion(Serial serial) : base(serial)
{
}
[Constructible]
public GreaterPoisonPotion() : base( PotionEffect.PoisonGreater )
{
}
public override Poison Poison => Poison.Greater;
public GreaterPoisonPotion( Serial serial ) : base( serial )
{
}
public override double MinPoisoningSkill => 60.0;
public override double MaxPoisoningSkill => 100.0;
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();
}
}
}

48
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs
View file

@ -1,33 +1,33 @@
namespace Server.Items
{
public class LesserPoisonPotion : BasePoisonPotion
{
public override Poison Poison => Poison.Lesser;
public class LesserPoisonPotion : BasePoisonPotion
{
[Constructible]
public LesserPoisonPotion() : base(PotionEffect.PoisonLesser)
{
}
public override double MinPoisoningSkill => 0.0;
public override double MaxPoisoningSkill => 60.0;
public LesserPoisonPotion(Serial serial) : base(serial)
{
}
[Constructible]
public LesserPoisonPotion() : base( PotionEffect.PoisonLesser )
{
}
public override Poison Poison => Poison.Lesser;
public LesserPoisonPotion( Serial serial ) : base( serial )
{
}
public override double MinPoisoningSkill => 0.0;
public override double MaxPoisoningSkill => 60.0;
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();
}
}
}

48
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs
View file

@ -1,33 +1,33 @@
namespace Server.Items
{
public class PoisonPotion : BasePoisonPotion
{
public override Poison Poison => Poison.Regular;
public class PoisonPotion : BasePoisonPotion
{
[Constructible]
public PoisonPotion() : base(PotionEffect.Poison)
{
}
public override double MinPoisoningSkill => 30.0;
public override double MaxPoisoningSkill => 70.0;
public PoisonPotion(Serial serial) : base(serial)
{
}
[Constructible]
public PoisonPotion() : base( PotionEffect.Poison )
{
}
public override Poison Poison => Poison.Regular;
public PoisonPotion( Serial serial ) : base( serial )
{
}
public override double MinPoisoningSkill => 30.0;
public override double MaxPoisoningSkill => 70.0;
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();
}
}
}