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

86
Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs
View file

@ -1,57 +1,59 @@
using System;
using Server.Engines.ConPVP;
using Server.Spells;
namespace Server.Items
{
public abstract class BaseStrengthPotion : BasePotion
{
public abstract int StrOffset{ get; }
public abstract TimeSpan Duration{ get; }
public abstract class BaseStrengthPotion : BasePotion
{
public BaseStrengthPotion(PotionEffect effect) : base(0xF09, effect)
{
}
public BaseStrengthPotion( PotionEffect effect ) : base( 0xF09, effect )
{
}
public BaseStrengthPotion(Serial serial) : base(serial)
{
}
public BaseStrengthPotion( Serial serial ) : base( serial )
{
}
public abstract int StrOffset{ get; }
public abstract TimeSpan Duration{ 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 bool DoStrength( Mobile from )
{
// TODO: Verify scaled; is it offset, duration, or both?
if ( Spells.SpellHelper.AddStatOffset( from, StatType.Str, Scale( from, StrOffset ), Duration ) )
{
from.FixedEffect( 0x375A, 10, 15 );
from.PlaySound( 0x1E7 );
return true;
}
public bool DoStrength(Mobile from)
{
// TODO: Verify scaled; is it offset, duration, or both?
if (SpellHelper.AddStatOffset(from, StatType.Str, Scale(from, StrOffset), Duration))
{
from.FixedEffect(0x375A, 10, 15);
from.PlaySound(0x1E7);
return true;
}
from.SendLocalizedMessage( 502173 ); // You are already under a similar effect.
return false;
}
from.SendLocalizedMessage(502173); // You are already under a similar effect.
return false;
}
public override void Drink( Mobile from )
{
if ( DoStrength( from ) )
{
PlayDrinkEffect( from );
public override void Drink(Mobile from)
{
if (DoStrength(from))
{
PlayDrinkEffect(from);
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
Consume();
}
}
}
if (!DuelContext.IsFreeConsume(from))
Consume();
}
}
}
}