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

156
Scripts/Items/Weapons/Abilities/Block.cs
View file

@ -3,103 +3,101 @@ using System.Collections;
namespace Server.Items
{
/// <summary>
/// Raises your defenses for a short time. Requires Bushido or Ninjitsu skill.
/// </summary>
public class Block : WeaponAbility
{
public Block()
{
}
/// <summary>
/// Raises your defenses for a short time. Requires Bushido or Ninjitsu skill.
/// </summary>
public class Block : WeaponAbility
{
private static Hashtable m_Table = new Hashtable();
public override int BaseMana => 30;
public override int BaseMana => 30;
public override bool CheckSkills( Mobile from )
{
if ( GetSkill( from, SkillName.Ninjitsu ) < 50.0 && GetSkill( from, SkillName.Bushido ) < 50.0 )
{
from.SendLocalizedMessage( 1063347, "50" ); // You need ~1_SKILL_REQUIREMENT~ Bushido or Ninjitsu skill to perform that attack!
return false;
}
public override bool CheckSkills(Mobile from)
{
if (GetSkill(from, SkillName.Ninjitsu) < 50.0 && GetSkill(from, SkillName.Bushido) < 50.0)
{
from.SendLocalizedMessage(1063347,
"50"); // You need ~1_SKILL_REQUIREMENT~ Bushido or 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 ( !Validate( attacker ) || !CheckMana( attacker, true ) )
return;
public override void OnHit(Mobile attacker, Mobile defender, int damage)
{
if (!Validate(attacker) || !CheckMana(attacker, true))
return;
ClearCurrentAbility( attacker );
ClearCurrentAbility(attacker);
attacker.SendLocalizedMessage( 1063345 ); // You block an attack!
defender.SendLocalizedMessage( 1063346 ); // Your attack was blocked!
attacker.SendLocalizedMessage(1063345); // You block an attack!
defender.SendLocalizedMessage(1063346); // Your attack was blocked!
attacker.FixedParticles( 0x37C4, 1, 16, 0x251D, 0x39D, 0x3, EffectLayer.RightHand );
attacker.FixedParticles(0x37C4, 1, 16, 0x251D, 0x39D, 0x3, EffectLayer.RightHand);
int bonus = (int)(10.0 * ((Math.Max( attacker.Skills[SkillName.Bushido].Value, attacker.Skills[SkillName.Ninjitsu].Value ) - 50.0) / 70.0 + 5));
int bonus = (int)(10.0 * ((Math.Max(attacker.Skills[SkillName.Bushido].Value,
attacker.Skills[SkillName.Ninjitsu].Value) - 50.0) / 70.0 + 5));
BeginBlock( attacker, bonus );
}
BeginBlock(attacker, bonus);
}
private class BlockInfo
{
public Mobile m_Target;
public Timer m_Timer;
public int m_Bonus;
public static bool GetBonus(Mobile targ, ref int bonus)
{
if (!(m_Table[targ] is BlockInfo info))
return false;
public BlockInfo( Mobile target, int bonus )
{
m_Target = target;
m_Bonus = bonus;
}
}
bonus = info.m_Bonus;
return true;
}
private static Hashtable m_Table = new Hashtable();
public static void BeginBlock(Mobile m, int bonus)
{
EndBlock(m);
public static bool GetBonus( Mobile targ, ref int bonus )
{
if ( !(m_Table[targ] is BlockInfo info) )
return false;
BlockInfo info = new BlockInfo(m, bonus);
info.m_Timer = new InternalTimer(m);
bonus = info.m_Bonus;
return true;
}
m_Table[m] = info;
}
public static void BeginBlock( Mobile m, int bonus )
{
EndBlock( m );
public static void EndBlock(Mobile m)
{
if (m_Table[m] is BlockInfo info)
{
info.m_Timer?.Stop();
BlockInfo info = new BlockInfo( m, bonus );
info.m_Timer = new InternalTimer( m );
m_Table.Remove(m);
}
}
m_Table[m] = info;
}
private class BlockInfo
{
public int m_Bonus;
public Mobile m_Target;
public Timer m_Timer;
public static void EndBlock( Mobile m )
{
if ( m_Table[m] is BlockInfo info )
{
info.m_Timer?.Stop();
public BlockInfo(Mobile target, int bonus)
{
m_Target = target;
m_Bonus = bonus;
}
}
m_Table.Remove( m );
}
}
private class InternalTimer : Timer
{
private Mobile m_Mobile;
private class InternalTimer : Timer
{
private Mobile m_Mobile;
public InternalTimer(Mobile m) : base(TimeSpan.FromSeconds(6.0))
{
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
public InternalTimer( Mobile m ) : base( TimeSpan.FromSeconds( 6.0 ) )
{
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()
{
EndBlock( m_Mobile );
}
}
}
}
protected override void OnTick()
{
EndBlock(m_Mobile);
}
}
}
}