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,104 +1,101 @@
using System;
using System.Collections;
namespace Server.Items
{
/// <summary>
/// Attack with increased damage with additional damage over time.
/// </summary>
public class TalonStrike : WeaponAbility
{
public static Hashtable Registry { get; } = new Hashtable();
/// <summary>
/// Attack with increased damage with additional damage over time.
/// </summary>
public class TalonStrike : WeaponAbility
{
public static Hashtable Registry{ get; } = new Hashtable();
public TalonStrike()
{
}
public override int BaseMana => 30;
public override double DamageScalar => 1.2;
public override int BaseMana => 30;
public override double DamageScalar => 1.2;
public override bool CheckSkills(Mobile from)
{
if (GetSkill(from, SkillName.Ninjitsu) < 50.0)
{
from.SendLocalizedMessage(1063352,
"50"); // You need ~1_SKILL_REQUIREMENT~ Ninjitsu skill to perform that attack!
return false;
}
public override bool CheckSkills( Mobile from )
{
if ( GetSkill( from, SkillName.Ninjitsu ) < 50.0 )
{
from.SendLocalizedMessage( 1063352, "50" ); // You need ~1_SKILL_REQUIREMENT~ Ninjitsu skill to perform that attack!
return false;
}
return base.CheckSkills(from);
}
return base.CheckSkills( from );
}
public override void OnHit(Mobile attacker, Mobile defender, int damage)
{
if (Registry.Contains(defender) || !Validate(attacker) || !CheckMana(attacker, true))
return;
public override void OnHit( Mobile attacker, Mobile defender, int damage )
{
if ( Registry.Contains( defender ) || !Validate( attacker ) || !CheckMana( attacker, true ) )
return;
ClearCurrentAbility(attacker);
ClearCurrentAbility( attacker );
attacker.SendLocalizedMessage(1063358); // You deliver a talon strike!
defender.SendLocalizedMessage(1063359); // Your attacker delivers a talon strike!
attacker.SendLocalizedMessage( 1063358 ); // You deliver a talon strike!
defender.SendLocalizedMessage( 1063359 ); // Your attacker delivers a talon strike!
defender.FixedParticles(0x373A, 1, 17, 0x26BC, 0x662, 0, EffectLayer.Waist);
defender.FixedParticles( 0x373A, 1, 17, 0x26BC, 0x662, 0, EffectLayer.Waist );
Timer t = new InternalTimer(defender,
(int)(10.0 * (attacker.Skills[SkillName.Ninjitsu].Value - 50.0) / 70.0 + 5), attacker); //5 - 15 damage
Timer t = new InternalTimer( defender, (int)(10.0 * (attacker.Skills[SkillName.Ninjitsu].Value - 50.0) / 70.0 + 5), attacker ); //5 - 15 damage
t.Start();
t.Start();
Registry.Add(defender, t);
}
Registry.Add( defender, t );
}
private class InternalTimer : Timer
{
private readonly double DamagePerTick;
private Mobile m_Attacker;
private double m_DamageRemaining;
private double m_DamageToDo;
private Mobile m_Defender;
private class InternalTimer : Timer
{
private Mobile m_Defender;
private double m_DamageRemaining;
private double m_DamageToDo;
private Mobile m_Attacker;
public InternalTimer(Mobile defender, int totalDamage, Mobile attacker)
: base(TimeSpan.Zero, TimeSpan.FromSeconds(0.25),
12) // 3 seconds at .25 seconds apart = 12. Confirm delay inbetween of .25 each.
{
m_Defender = defender;
m_DamageRemaining = totalDamage;
Priority = TimerPriority.TwentyFiveMS;
private readonly double DamagePerTick;
m_Attacker = attacker;
public InternalTimer( Mobile defender, int totalDamage, Mobile attacker )
: base( TimeSpan.Zero, TimeSpan.FromSeconds( 0.25 ), 12 ) // 3 seconds at .25 seconds apart = 12. Confirm delay inbetween of .25 each.
{
m_Defender = defender;
m_DamageRemaining = (double)totalDamage;
Priority = TimerPriority.TwentyFiveMS;
DamagePerTick = (double)totalDamage / 12 + .01;
}
m_Attacker = attacker;
protected override void OnTick()
{
if (!m_Defender.Alive || m_DamageRemaining <= 0)
{
Stop();
Registry.Remove(m_Defender);
return;
}
DamagePerTick = (double)totalDamage / 12+.01;
}
m_DamageRemaining -= DamagePerTick;
m_DamageToDo += DamagePerTick;
protected override void OnTick()
{
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Registry.Remove( m_Defender );
return;
}
if (m_DamageRemaining <= 0 && m_DamageToDo < 1)
m_DamageToDo = 1.0; //Confirm this 'round up' at the end
m_DamageRemaining -= DamagePerTick;
m_DamageToDo += DamagePerTick;
int damage = (int)m_DamageToDo;
if ( m_DamageRemaining <= 0 && m_DamageToDo < 1 )
m_DamageToDo = 1.0; //Confirm this 'round up' at the end
if (damage > 0)
{
//m_Defender.Damage( damage, m_Attacker, false );
m_Defender.Hits -= damage; //Don't show damage, don't disrupt
m_DamageToDo -= damage;
}
int damage = (int)m_DamageToDo;
if ( damage > 0 )
{
//m_Defender.Damage( damage, m_Attacker, false );
m_Defender.Hits -= damage; //Don't show damage, don't disrupt
m_DamageToDo -= damage;
}
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Registry.Remove( m_Defender );
}
}
}
}
}
if (!m_Defender.Alive || m_DamageRemaining <= 0)
{
Stop();
Registry.Remove(m_Defender);
}
}
}
}
}