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

126
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs
View file

@ -1,80 +1,84 @@
using System;
using Server.Engines.ConPVP;
using Server.Network;
namespace Server.Items
{
public abstract class BaseHealPotion : BasePotion
{
public abstract int MinHeal { get; }
public abstract int MaxHeal { get; }
public abstract double Delay { get; }
public abstract class BaseHealPotion : BasePotion
{
public BaseHealPotion(PotionEffect effect) : base(0xF0C, effect)
{
}
public BaseHealPotion( PotionEffect effect ) : base( 0xF0C, effect )
{
}
public BaseHealPotion(Serial serial) : base(serial)
{
}
public BaseHealPotion( Serial serial ) : base( serial )
{
}
public abstract int MinHeal{ get; }
public abstract int MaxHeal{ get; }
public abstract double Delay{ 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 DoHeal( Mobile from )
{
int min = Scale( from, MinHeal );
int max = Scale( from, MaxHeal );
public void DoHeal(Mobile from)
{
int min = Scale(from, MinHeal);
int max = Scale(from, MaxHeal);
from.Heal( Utility.RandomMinMax( min, max ) );
}
from.Heal(Utility.RandomMinMax(min, max));
}
public override void Drink( Mobile from )
{
if ( from.Hits < from.HitsMax )
{
if ( from.Poisoned || MortalStrike.IsWounded( from ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x22, 1005000 ); // You can not heal yourself in your current state.
}
else
{
if ( from.BeginAction( typeof( BaseHealPotion ) ) )
{
DoHeal( from );
public override void Drink(Mobile from)
{
if (from.Hits < from.HitsMax)
{
if (from.Poisoned || MortalStrike.IsWounded(from))
{
from.LocalOverheadMessage(MessageType.Regular, 0x22,
1005000); // You can not heal yourself in your current state.
}
else
{
if (from.BeginAction(typeof(BaseHealPotion)))
{
DoHeal(from);
PlayDrinkEffect( from );
PlayDrinkEffect(from);
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
Consume();
if (!DuelContext.IsFreeConsume(from))
Consume();
Timer.DelayCall( TimeSpan.FromSeconds( Delay ), new TimerStateCallback( ReleaseHealLock ), from );
}
else
{
from.LocalOverheadMessage( MessageType.Regular, 0x22, 500235 ); // You must wait 10 seconds before using another healing potion.
}
}
}
else
{
from.SendLocalizedMessage( 1049547 ); // You decide against drinking this potion, as you are already at full health.
}
}
Timer.DelayCall(TimeSpan.FromSeconds(Delay), new TimerStateCallback(ReleaseHealLock), from);
}
else
{
from.LocalOverheadMessage(MessageType.Regular, 0x22,
500235); // You must wait 10 seconds before using another healing potion.
}
}
}
else
{
from.SendLocalizedMessage(
1049547); // You decide against drinking this potion, as you are already at full health.
}
}
private static void ReleaseHealLock( object state )
{
((Mobile)state).EndAction( typeof( BaseHealPotion ) );
}
}
private static void ReleaseHealLock(object state)
{
((Mobile)state).EndAction(typeof(BaseHealPotion));
}
}
}

48
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items
{
public class GreaterHealPotion : BaseHealPotion
{
public override int MinHeal => (Core.AOS ? 20 : 9);
public override int MaxHeal => (Core.AOS ? 25 : 30);
public override double Delay => 10.0;
public class GreaterHealPotion : BaseHealPotion
{
[Constructible]
public GreaterHealPotion() : base(PotionEffect.HealGreater)
{
}
[Constructible]
public GreaterHealPotion() : base( PotionEffect.HealGreater )
{
}
public GreaterHealPotion(Serial serial) : base(serial)
{
}
public GreaterHealPotion( Serial serial ) : base( serial )
{
}
public override int MinHeal => Core.AOS ? 20 : 9;
public override int MaxHeal => Core.AOS ? 25 : 30;
public override double Delay => 10.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/Heal Potions/HealPotion.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items
{
public class HealPotion : BaseHealPotion
{
public override int MinHeal => (Core.AOS ? 13 : 6);
public override int MaxHeal => (Core.AOS ? 16 : 20);
public override double Delay => (Core.AOS ? 8.0 : 10.0);
public class HealPotion : BaseHealPotion
{
[Constructible]
public HealPotion() : base(PotionEffect.Heal)
{
}
[Constructible]
public HealPotion() : base( PotionEffect.Heal )
{
}
public HealPotion(Serial serial) : base(serial)
{
}
public HealPotion( Serial serial ) : base( serial )
{
}
public override int MinHeal => Core.AOS ? 13 : 6;
public override int MaxHeal => Core.AOS ? 16 : 20;
public override double Delay => Core.AOS ? 8.0 : 10.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/Heal Potions/LesserHealPotion.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items
{
public class LesserHealPotion : BaseHealPotion
{
public override int MinHeal => (Core.AOS ? 6 : 3);
public override int MaxHeal => (Core.AOS ? 8 : 10);
public override double Delay => (Core.AOS ? 3.0 : 10.0);
public class LesserHealPotion : BaseHealPotion
{
[Constructible]
public LesserHealPotion() : base(PotionEffect.HealLesser)
{
}
[Constructible]
public LesserHealPotion() : base( PotionEffect.HealLesser )
{
}
public LesserHealPotion(Serial serial) : base(serial)
{
}
public LesserHealPotion( Serial serial ) : base( serial )
{
}
public override int MinHeal => Core.AOS ? 6 : 3;
public override int MaxHeal => Core.AOS ? 8 : 10;
public override double Delay => Core.AOS ? 3.0 : 10.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();
}
}
}