fix: More spell variable cleanup (#850)

This commit is contained in:
Kamron Batman 2021-11-14 18:48:44 -08:00 • committed by GitHub
parent 5df7bf6a75
commit 15b2d08ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 162 additions and 162 deletions

View file

@ -12,7 +12,7 @@ namespace Server.Spells.Bushido
9002
);
private static readonly Dictionary<Mobile, TimerExecutionToken> m_Table = new();
private static readonly Dictionary<Mobile, TimerExecutionToken> _table = new();
private static readonly Dictionary<Mobile, TimerExecutionToken> m_RegenTable = new();
public Confidence(Mobile caster, Item scroll) : base(caster, scroll, _info)
@ -49,7 +49,7 @@ namespace Server.Spells.Bushido
FinishSequence();
}
public static bool IsConfident(Mobile m) => m_Table.ContainsKey(m);
public static bool IsConfident(Mobile m) => _table.ContainsKey(m);
public static void BeginConfidence(Mobile m)
{
@ -64,12 +64,12 @@ namespace Server.Spells.Bushido
out var timerToken
);
m_Table[m] = timerToken;
_table[m] = timerToken;
}
private static bool StopConfidenceTimer(Mobile m)
{
if (m_Table.Remove(m, out var timerToken))
if (_table.Remove(m, out var timerToken))
{
timerToken.Cancel();
return true;

View file

@ -13,7 +13,7 @@ namespace Server.Spells.Bushido
9002
);
private static readonly Dictionary<Mobile, TimerExecutionToken> m_Table = new();
private static readonly Dictionary<Mobile, TimerExecutionToken> _table = new();
public CounterAttack(Mobile caster, Item scroll) : base(caster, scroll, _info)
{
@ -71,11 +71,11 @@ namespace Server.Spells.Bushido
FinishSequence();
}
public static bool IsCountering(Mobile m) => m_Table.ContainsKey(m);
public static bool IsCountering(Mobile m) => _table.ContainsKey(m);
private static bool StopCounterTimer(Mobile m)
{
if (m_Table.Remove(m, out var timerToken))
if (_table.Remove(m, out var timerToken))
{
timerToken.Cancel();
return true;
@ -97,7 +97,7 @@ namespace Server.Spells.Bushido
out var timerToken
);
m_Table[m] = timerToken;
_table[m] = timerToken;
}
public static void StopCountering(Mobile m)

View file

@ -13,7 +13,7 @@ namespace Server.Spells.Bushido
9002
);
private static readonly Dictionary<Mobile, TimerExecutionToken> m_Table = new();
private static readonly Dictionary<Mobile, TimerExecutionToken> _table = new();
public Evasion(Mobile caster, Item scroll) : base(caster, scroll, _info)
{
@ -138,7 +138,7 @@ namespace Server.Spells.Bushido
FinishSequence();
}
public static bool IsEvading(Mobile m) => m_Table.ContainsKey(m);
public static bool IsEvading(Mobile m) => _table.ContainsKey(m);
public static TimeSpan GetEvadeDuration(Mobile m)
{
@ -216,12 +216,12 @@ namespace Server.Spells.Bushido
out var timerToken
);
m_Table[m] = timerToken;
_table[m] = timerToken;
}
private static bool StopEvasionTimer(Mobile m)
{
if (m_Table.Remove(m, out var timer))
if (_table.Remove(m, out var timer))
{
timer.Cancel();
return true;

View file

@ -5,7 +5,7 @@ namespace Server.Spells.Bushido
{
public class HonorableExecution : SamuraiMove
{
private static readonly Dictionary<Mobile, HonorableExecutionTimer> m_Table = new();
private static readonly Dictionary<Mobile, HonorableExecutionTimer> _table = new();
public override int BaseMana => 0;
public override double RequiredSkill => 25.0;
@ -63,20 +63,20 @@ namespace Server.Spells.Bushido
timer = new HonorableExecutionTimer(attacker, mods);
}
m_Table[attacker] = timer;
_table[attacker] = timer;
timer.Start();
attacker.Delta(MobileDelta.WeaponDamage);
CheckGain(attacker);
}
public static int GetSwingBonus(Mobile target) => m_Table.TryGetValue(target, out var info) ? info.m_SwingBonus : 0;
public static int GetSwingBonus(Mobile target) => _table.TryGetValue(target, out var info) ? info.m_SwingBonus : 0;
public static bool IsUnderPenalty(Mobile target) => m_Table.TryGetValue(target, out var info) && info.m_Penalty;
public static bool IsUnderPenalty(Mobile target) => _table.TryGetValue(target, out var info) && info.m_Penalty;
public static void RemovePenalty(Mobile target)
{
if (m_Table.Remove(target, out var timer))
if (_table.Remove(target, out var timer))
{
timer.Clear();
}