Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -3,182 +3,186 @@ using System.Collections;
|
|||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class ProtectionSpell : MagerySpell
|
||||
{
|
||||
public static Hashtable Registry { get; } = new Hashtable();
|
||||
public class ProtectionSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Protection", "Uus Sanct",
|
||||
236,
|
||||
9011,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Protection", "Uus Sanct",
|
||||
236,
|
||||
9011,
|
||||
Reagent.Garlic,
|
||||
Reagent.Ginseng,
|
||||
Reagent.SulfurousAsh
|
||||
);
|
||||
private static Hashtable m_Table = new Hashtable();
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
public ProtectionSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public ProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public static Hashtable Registry{ get; } = new Hashtable();
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( Core.AOS )
|
||||
return true;
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
if ( Registry.ContainsKey( Caster ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
return true;
|
||||
|
||||
if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
return false;
|
||||
}
|
||||
if (Registry.ContainsKey(Caster))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
if (!Caster.CanBeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
return false;
|
||||
}
|
||||
|
||||
private static Hashtable m_Table = new Hashtable();
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void Toggle( Mobile caster, Mobile target )
|
||||
{
|
||||
/* Players under the protection spell effect can no longer have their spells "disrupted" when hit.
|
||||
* Players under the protection spell have decreased physical resistance stat value (-15 + (Inscription/20),
|
||||
* a decreased "resisting spells" skill value by -35 + (Inscription/20),
|
||||
* and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points.
|
||||
* The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
|
||||
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out,
|
||||
* even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
|
||||
*/
|
||||
public static void Toggle(Mobile caster, Mobile target)
|
||||
{
|
||||
/* Players under the protection spell effect can no longer have their spells "disrupted" when hit.
|
||||
* Players under the protection spell have decreased physical resistance stat value (-15 + (Inscription/20),
|
||||
* a decreased "resisting spells" skill value by -35 + (Inscription/20),
|
||||
* and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points.
|
||||
* The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
|
||||
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out,
|
||||
* even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
|
||||
*/
|
||||
|
||||
object[] mods = (object[])m_Table[target];
|
||||
object[] mods = (object[])m_Table[target];
|
||||
|
||||
if ( mods == null )
|
||||
{
|
||||
target.PlaySound( 0x1E9 );
|
||||
target.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
if (mods == null)
|
||||
{
|
||||
target.PlaySound(0x1E9);
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
||||
mods = new object[2]
|
||||
{
|
||||
new ResistanceMod( ResistanceType.Physical, -15 + Math.Min( (int)(caster.Skills[SkillName.Inscribe].Value / 20), 15 ) ),
|
||||
new DefaultSkillMod( SkillName.MagicResist, true, -35 + Math.Min( (int)(caster.Skills[SkillName.Inscribe].Value / 20), 35 ) )
|
||||
};
|
||||
mods = new object[2]
|
||||
{
|
||||
new ResistanceMod(ResistanceType.Physical,
|
||||
-15 + Math.Min((int)(caster.Skills[SkillName.Inscribe].Value / 20), 15)),
|
||||
new DefaultSkillMod(SkillName.MagicResist, true,
|
||||
-35 + Math.Min((int)(caster.Skills[SkillName.Inscribe].Value / 20), 35))
|
||||
};
|
||||
|
||||
m_Table[target] = mods;
|
||||
Registry[target] = 100.0;
|
||||
m_Table[target] = mods;
|
||||
Registry[target] = 100.0;
|
||||
|
||||
target.AddResistanceMod( (ResistanceMod)mods[0] );
|
||||
target.AddSkillMod( (SkillMod)mods[1] );
|
||||
target.AddResistanceMod((ResistanceMod)mods[0]);
|
||||
target.AddSkillMod((SkillMod)mods[1]);
|
||||
|
||||
int physloss = -15 + (int) (caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
int resistloss = -35 + (int) (caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
string args = $"{physloss}\t{resistloss}";
|
||||
BuffInfo.AddBuff(target, new BuffInfo(BuffIcon.Protection, 1075814, 1075815, args.ToString()));
|
||||
}
|
||||
else
|
||||
{
|
||||
target.PlaySound( 0x1ED );
|
||||
target.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
int physloss = -15 + (int)(caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
int resistloss = -35 + (int)(caster.Skills[SkillName.Inscribe].Value / 20);
|
||||
string args = $"{physloss}\t{resistloss}";
|
||||
BuffInfo.AddBuff(target, new BuffInfo(BuffIcon.Protection, 1075814, 1075815, args));
|
||||
}
|
||||
else
|
||||
{
|
||||
target.PlaySound(0x1ED);
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
||||
m_Table.Remove( target );
|
||||
Registry.Remove( target );
|
||||
m_Table.Remove(target);
|
||||
Registry.Remove(target);
|
||||
|
||||
target.RemoveResistanceMod( (ResistanceMod)mods[0] );
|
||||
target.RemoveSkillMod( (SkillMod)mods[1] );
|
||||
target.RemoveResistanceMod((ResistanceMod)mods[0]);
|
||||
target.RemoveSkillMod((SkillMod)mods[1]);
|
||||
|
||||
BuffInfo.RemoveBuff(target, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
BuffInfo.RemoveBuff(target, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
|
||||
public static void EndProtection( Mobile m )
|
||||
{
|
||||
if ( m_Table.Contains( m ) )
|
||||
{
|
||||
object[] mods = (object[]) m_Table[ m ];
|
||||
public static void EndProtection(Mobile m)
|
||||
{
|
||||
if (m_Table.Contains(m))
|
||||
{
|
||||
object[] mods = (object[])m_Table[m];
|
||||
|
||||
m_Table.Remove( m );
|
||||
Registry.Remove( m );
|
||||
m_Table.Remove(m);
|
||||
Registry.Remove(m);
|
||||
|
||||
m.RemoveResistanceMod( (ResistanceMod) mods[ 0 ] );
|
||||
m.RemoveSkillMod( (SkillMod) mods[ 1 ] );
|
||||
m.RemoveResistanceMod((ResistanceMod)mods[0]);
|
||||
m.RemoveSkillMod((SkillMod)mods[1]);
|
||||
|
||||
BuffInfo.RemoveBuff( m, BuffIcon.Protection );
|
||||
}
|
||||
}
|
||||
BuffInfo.RemoveBuff(m, BuffIcon.Protection);
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
if ( Core.AOS )
|
||||
{
|
||||
if ( CheckSequence() )
|
||||
Toggle( Caster, Caster );
|
||||
public override void OnCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
{
|
||||
if (CheckSequence())
|
||||
Toggle(Caster, Caster);
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( Registry.ContainsKey( Caster ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
|
||||
}
|
||||
else if ( !Caster.CanBeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
}
|
||||
else if ( CheckSequence() )
|
||||
{
|
||||
if ( Caster.BeginAction( typeof( DefensiveSpell ) ) )
|
||||
{
|
||||
double value = (int)(Caster.Skills[SkillName.EvalInt].Value + Caster.Skills[SkillName.Meditation].Value + Caster.Skills[SkillName.Inscribe].Value);
|
||||
value /= 4;
|
||||
FinishSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Registry.ContainsKey(Caster))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
}
|
||||
else if (!Caster.CanBeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
if (Caster.BeginAction(typeof(DefensiveSpell)))
|
||||
{
|
||||
double value = (int)(Caster.Skills[SkillName.EvalInt].Value +
|
||||
Caster.Skills[SkillName.Meditation].Value +
|
||||
Caster.Skills[SkillName.Inscribe].Value);
|
||||
value /= 4;
|
||||
|
||||
if ( value < 0 )
|
||||
value = 0;
|
||||
else if ( value > 75 )
|
||||
value = 75.0;
|
||||
if (value < 0)
|
||||
value = 0;
|
||||
else if (value > 75)
|
||||
value = 75.0;
|
||||
|
||||
Registry.Add( Caster, value );
|
||||
new InternalTimer( Caster ).Start();
|
||||
Registry.Add(Caster, value);
|
||||
new InternalTimer(Caster).Start();
|
||||
|
||||
Caster.FixedParticles( 0x375A, 9, 20, 5016, EffectLayer.Waist );
|
||||
Caster.PlaySound( 0x1ED );
|
||||
}
|
||||
else
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1005385 ); // The spell will not adhere to you at this time.
|
||||
}
|
||||
}
|
||||
Caster.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
Caster.PlaySound(0x1ED);
|
||||
}
|
||||
else
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
}
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
}
|
||||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private Mobile m_Caster;
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private Mobile m_Caster;
|
||||
|
||||
public InternalTimer( Mobile caster ) : base( TimeSpan.FromSeconds( 0 ) )
|
||||
{
|
||||
double val = caster.Skills[SkillName.Magery].Value * 2.0;
|
||||
if ( val < 15 )
|
||||
val = 15;
|
||||
else if ( val > 240 )
|
||||
val = 240;
|
||||
public InternalTimer(Mobile caster) : base(TimeSpan.FromSeconds(0))
|
||||
{
|
||||
double val = caster.Skills[SkillName.Magery].Value * 2.0;
|
||||
if (val < 15)
|
||||
val = 15;
|
||||
else if (val > 240)
|
||||
val = 240;
|
||||
|
||||
m_Caster = caster;
|
||||
Delay = TimeSpan.FromSeconds( val );
|
||||
Priority = TimerPriority.OneSecond;
|
||||
}
|
||||
m_Caster = caster;
|
||||
Delay = TimeSpan.FromSeconds(val);
|
||||
Priority = TimerPriority.OneSecond;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
Registry.Remove( m_Caster );
|
||||
DefensiveSpell.Nullify( m_Caster );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
Registry.Remove(m_Caster);
|
||||
DefensiveSpell.Nullify(m_Caster);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue