Fixes code according to modern code style. Fixes a few expression bugs.

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

View file

@ -1,224 +1,225 @@
using System;
using System.Collections.Generic;
using Server.Network;
using Server.Targeting;
using Server.Spells;
using Server.Targeting;
namespace Server.Items
{
public class FireHorn : Item
{
public override int LabelNumber => 1060456; // fire horn
public class FireHorn : Item
{
[Constructible]
public FireHorn() : base(0xFC7)
{
Hue = 0x466;
Weight = 1.0;
}
[Constructible]
public FireHorn() : base( 0xFC7 )
{
Hue = 0x466;
Weight = 1.0;
}
public FireHorn(Serial serial) : base(serial)
{
}
public FireHorn( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1060456; // fire horn
private bool CheckUse( Mobile from )
{
if ( !IsAccessibleTo( from ) )
return false;
private bool CheckUse(Mobile from)
{
if (!IsAccessibleTo(from))
return false;
if ( from.Map != Map || !from.InRange( GetWorldLocation(), 2 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
return false;
}
if (from.Map != Map || !from.InRange(GetWorldLocation(), 2))
{
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
return false;
}
if ( !from.CanBeginAction( typeof( FireHorn ) ) )
{
from.SendLocalizedMessage( 1049615 ); // You must take a moment to catch your breath.
return false;
}
if (!from.CanBeginAction(typeof(FireHorn)))
{
from.SendLocalizedMessage(1049615); // You must take a moment to catch your breath.
return false;
}
int sulfAsh = Core.AOS ? 4 : 15;
if ( from.Backpack == null || from.Backpack.GetAmount( typeof( SulfurousAsh ) ) < sulfAsh )
{
from.SendLocalizedMessage( 1049617 ); // You do not have enough sulfurous ash.
return false;
}
int sulfAsh = Core.AOS ? 4 : 15;
if (from.Backpack == null || from.Backpack.GetAmount(typeof(SulfurousAsh)) < sulfAsh)
{
from.SendLocalizedMessage(1049617); // You do not have enough sulfurous ash.
return false;
}
return true;
}
return true;
}
public override void OnDoubleClick( Mobile from )
{
if ( CheckUse( from ) )
{
from.SendLocalizedMessage( 1049620 ); // Select an area to incinerate.
from.Target = new InternalTarget( this );
}
}
public override void OnDoubleClick(Mobile from)
{
if (CheckUse(from))
{
from.SendLocalizedMessage(1049620); // Select an area to incinerate.
from.Target = new InternalTarget(this);
}
}
public void Use( Mobile from, IPoint3D loc )
{
if ( !CheckUse( from ) )
return;
public void Use(Mobile from, IPoint3D loc)
{
if (!CheckUse(from))
return;
from.BeginAction( typeof( FireHorn ) );
Timer.DelayCall( Core.AOS ? TimeSpan.FromSeconds( 6.0 ) : TimeSpan.FromSeconds( 12.0 ), new TimerStateCallback( EndAction ), from );
from.BeginAction(typeof(FireHorn));
Timer.DelayCall(Core.AOS ? TimeSpan.FromSeconds(6.0) : TimeSpan.FromSeconds(12.0),
new TimerStateCallback(EndAction), from);
int music = from.Skills[SkillName.Musicianship].Fixed;
int music = from.Skills[SkillName.Musicianship].Fixed;
int sucChance = 500 + ( music - 775 ) * 2;
double dSucChance = ((double)sucChance) / 1000.0;
int sucChance = 500 + (music - 775) * 2;
double dSucChance = sucChance / 1000.0;
if ( !from.CheckSkill( SkillName.Musicianship, dSucChance ) )
{
from.SendLocalizedMessage( 1049618 ); // The horn emits a pathetic squeak.
from.PlaySound( 0x18A );
return;
}
if (!from.CheckSkill(SkillName.Musicianship, dSucChance))
{
from.SendLocalizedMessage(1049618); // The horn emits a pathetic squeak.
from.PlaySound(0x18A);
return;
}
int sulfAsh = Core.AOS ? 4 : 15;
from.Backpack.ConsumeUpTo( typeof( SulfurousAsh ), sulfAsh );
int sulfAsh = Core.AOS ? 4 : 15;
from.Backpack.ConsumeUpTo(typeof(SulfurousAsh), sulfAsh);
from.PlaySound( 0x15F );
Effects.SendPacket( from, from.Map, new HuedEffect( EffectType.Moving, from.Serial, Serial.Zero, 0x36D4, from.Location, loc, 5, 0, false, true, 0, 0 ) );
from.PlaySound(0x15F);
Effects.SendPacket(from, from.Map,
new HuedEffect(EffectType.Moving, from.Serial, Serial.Zero, 0x36D4, from.Location, loc, 5, 0, false, true, 0,
0));
List<Mobile> targets = new List<Mobile>();
bool playerVsPlayer = false;
List<Mobile> targets = new List<Mobile>();
bool playerVsPlayer = false;
IPooledEnumerable<Mobile> eable = from.Map.GetMobilesInRange( new Point3D( loc ), 2 );
IPooledEnumerable<Mobile> eable = from.Map.GetMobilesInRange(new Point3D(loc), 2);
foreach ( Mobile m in eable )
{
if ( from != m && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
if ( Core.AOS && !from.InLOS( m ) )
continue;
foreach (Mobile m in eable)
if (from != m && SpellHelper.ValidIndirectTarget(from, m) && from.CanBeHarmful(m, false))
{
if (Core.AOS && !from.InLOS(m))
continue;
targets.Add( m );
targets.Add(m);
if ( m.Player )
playerVsPlayer = true;
}
}
if (m.Player)
playerVsPlayer = true;
}
eable.Free();
eable.Free();
if ( targets.Count > 0 )
{
int prov = from.Skills[SkillName.Provocation].Fixed;
int disc = from.Skills[SkillName.Discordance].Fixed;
int peace = from.Skills[SkillName.Peacemaking].Fixed;
if (targets.Count > 0)
{
int prov = from.Skills[SkillName.Provocation].Fixed;
int disc = from.Skills[SkillName.Discordance].Fixed;
int peace = from.Skills[SkillName.Peacemaking].Fixed;
int minDamage, maxDamage;
int minDamage, maxDamage;
if ( Core.AOS )
{
int musicScaled = music + Math.Max( 0, music - 900 ) * 2;
int provScaled = prov + Math.Max( 0, prov - 900 ) * 2;
int discScaled = disc + Math.Max( 0, disc - 900 ) * 2;
int peaceScaled = peace + Math.Max( 0, peace - 900 ) * 2;
if (Core.AOS)
{
int musicScaled = music + Math.Max(0, music - 900) * 2;
int provScaled = prov + Math.Max(0, prov - 900) * 2;
int discScaled = disc + Math.Max(0, disc - 900) * 2;
int peaceScaled = peace + Math.Max(0, peace - 900) * 2;
int weightAvg = ( musicScaled + provScaled * 3 + discScaled * 3 + peaceScaled ) / 80;
int weightAvg = (musicScaled + provScaled * 3 + discScaled * 3 + peaceScaled) / 80;
int avgDamage;
if ( playerVsPlayer )
avgDamage = weightAvg / 3;
else
avgDamage = weightAvg / 2;
int avgDamage;
if (playerVsPlayer)
avgDamage = weightAvg / 3;
else
avgDamage = weightAvg / 2;
minDamage = ( avgDamage * 9 ) / 10;
maxDamage = ( avgDamage * 10 ) / 9;
}
else
{
int total = prov + disc / 5 + peace / 5;
minDamage = avgDamage * 9 / 10;
maxDamage = avgDamage * 10 / 9;
}
else
{
int total = prov + disc / 5 + peace / 5;
if ( playerVsPlayer )
total /= 3;
if (playerVsPlayer)
total /= 3;
maxDamage = ( total * 2 ) / 30;
minDamage = ( maxDamage * 7 ) / 10;
}
maxDamage = total * 2 / 30;
minDamage = maxDamage * 7 / 10;
}
double damage = Utility.RandomMinMax( minDamage, maxDamage );
double damage = Utility.RandomMinMax(minDamage, maxDamage);
if ( Core.AOS && targets.Count > 1 )
damage = (damage * 2) / targets.Count;
else if ( !Core.AOS )
damage /= targets.Count;
if (Core.AOS && targets.Count > 1)
damage = damage * 2 / targets.Count;
else if (!Core.AOS)
damage /= targets.Count;
for ( int i = 0; i < targets.Count; ++i )
{
Mobile m = (Mobile)targets[i];
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
double toDeal = damage;
double toDeal = damage;
if ( !Core.AOS && m.CheckSkill( SkillName.MagicResist, 0.0, 120.0 ) )
{
toDeal *= 0.5;
m.SendLocalizedMessage( 501783 ); // You feel yourself resisting magical energy.
}
if (!Core.AOS && m.CheckSkill(SkillName.MagicResist, 0.0, 120.0))
{
toDeal *= 0.5;
m.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
}
from.DoHarmful( m );
SpellHelper.Damage( TimeSpan.Zero, m, from, toDeal, 0, 100, 0, 0, 0 );
from.DoHarmful(m);
SpellHelper.Damage(TimeSpan.Zero, m, from, toDeal, 0, 100, 0, 0, 0);
Effects.SendTargetEffect( m, 0x3709, 10, 30 );
}
}
Effects.SendTargetEffect(m, 0x3709, 10, 30);
}
}
double breakChance = Core.AOS ? 0.01 : 0.16;
if ( Utility.RandomDouble() < breakChance )
{
from.SendLocalizedMessage( 1049619 ); // The fire horn crumbles in your hands.
Delete();
}
}
double breakChance = Core.AOS ? 0.01 : 0.16;
if (Utility.RandomDouble() < breakChance)
{
from.SendLocalizedMessage(1049619); // The fire horn crumbles in your hands.
Delete();
}
}
private static void EndAction( object state )
{
Mobile m = (Mobile) state;
private static void EndAction(object state)
{
Mobile m = (Mobile)state;
m.EndAction( typeof( FireHorn ) );
m.SendLocalizedMessage( 1049621 ); // You catch your breath.
}
m.EndAction(typeof(FireHorn));
m.SendLocalizedMessage(1049621); // You catch your breath.
}
private class InternalTarget : Target
{
private FireHorn m_Horn;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public InternalTarget( FireHorn horn ) : base( Core.AOS ? 3 : 2, true, TargetFlags.Harmful )
{
m_Horn = horn;
}
writer.WriteEncodedInt(0); // version
}
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_Horn.Deleted )
return;
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
IPoint3D loc;
if ( targeted is Item item )
loc = item.GetWorldLocation();
else
loc = targeted as IPoint3D;
int version = reader.ReadEncodedInt();
}
m_Horn.Use( from, loc );
}
}
private class InternalTarget : Target
{
private FireHorn m_Horn;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public InternalTarget(FireHorn horn) : base(Core.AOS ? 3 : 2, true, TargetFlags.Harmful)
{
m_Horn = horn;
}
writer.WriteEncodedInt( 0 ); // version
}
protected override void OnTarget(Mobile from, object targeted)
{
if (m_Horn.Deleted)
return;
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
IPoint3D loc;
if (targeted is Item item)
loc = item.GetWorldLocation();
else
loc = targeted as IPoint3D;
int version = reader.ReadEncodedInt();
}
}
}
m_Horn.Use(from, loc);
}
}
}
}