warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Renames WeightOverloading to StaminaSystem (#1495)

Browse source
This commit is contained in:
Kamron Batman 2023-09-06 18:58:45 -07:00 • committed by GitHub
parent 6820efe0ca
commit 319d82fec9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 143 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Spells/Base/SpellHelper.cs
View file

@ -1009,11 +1009,11 @@ namespace Server.Spells
bcTarget?.AlterSpellDamageFrom(from, ref dmg);
WeightOverloading.DFA = dfa;
StaminaSystem.DFA = dfa;
var damageGiven = AOS.Damage(target, from, dmg, phys, fire, cold, pois, nrgy, chaos);
WeightOverloading.DFA = DFAlgorithm.Standard;
StaminaSystem.DFA = DFAlgorithm.Standard;
bcFrom?.OnDamageSpell(target, damageGiven);
@ -1143,11 +1143,11 @@ namespace Server.Spells
bcTarg?.AlterSpellDamageFrom(m_From, ref m_Damage);
}
WeightOverloading.DFA = m_DFA;
StaminaSystem.DFA = m_DFA;
var damageGiven = AOS.Damage(m_Target, m_From, m_Damage, m_Phys, m_Fire, m_Cold, m_Pois, m_Nrgy, m_Chaos);
WeightOverloading.DFA = DFAlgorithm.Standard;
StaminaSystem.DFA = DFAlgorithm.Standard;
bcFrom?.OnDamageSpell(m_Target, damageGiven);

4
Projects/UOContent/Spells/Chivalry/SacredJourney.cs
View file

@ -72,7 +72,7 @@ namespace Server.Spells.Chivalry
{
Caster.SendLocalizedMessage(1061282); // You cannot use the Sacred Journey ability to flee from combat.
}
else if (WeightOverloading.IsOverloaded(Caster))
else if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
}
@ -150,7 +150,7 @@ namespace Server.Spells.Chivalry
return false;
}
if (WeightOverloading.IsOverloaded(Caster))
if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
return false;

4
Projects/UOContent/Spells/Fourth/Recall.cs
View file

@ -72,7 +72,7 @@ namespace Server.Spells.Fourth
{
Caster.SendLocalizedMessage(1005564, "", 0x22); // Wouldst thou flee during the heat of battle??
}
else if (WeightOverloading.IsOverloaded(Caster))
else if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
}
@ -153,7 +153,7 @@ namespace Server.Spells.Fourth
return false;
}
if (WeightOverloading.IsOverloaded(Caster))
if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
return false;

4
Projects/UOContent/Spells/Necromancy/PainSpike.cs
View file

@ -73,10 +73,10 @@ namespace Server.Spells.Necromancy
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.PainSpike, 1075667, buffTime, m, Convert.ToString((int)damage)));
// TODO: Find a better way to do this
WeightOverloading.DFA = DFAlgorithm.PainSpike;
StaminaSystem.DFA = DFAlgorithm.PainSpike;
m.Damage((int)damage, Caster);
SpellHelper.DoLeech((int)damage, Caster, m);
WeightOverloading.DFA = DFAlgorithm.Standard;
StaminaSystem.DFA = DFAlgorithm.Standard;
// SpellHelper.Damage( this, m, damage, 100, 0, 0, 0, 0, Misc.DFAlgorithm.PainSpike );
HarmfulSpell(m);

2
Projects/UOContent/Spells/Ninjitsu/ShadowJump.cs
View file

@ -47,7 +47,7 @@ namespace Server.Spells.Ninjitsu
{
Caster.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (WeightOverloading.IsOverloaded(Caster))
else if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
}

4
Projects/UOContent/Spells/Third/Teleport.cs
View file

@ -39,7 +39,7 @@ namespace Server.Spells.Third
{
Caster.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (WeightOverloading.IsOverloaded(Caster))
else if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
}
@ -121,7 +121,7 @@ namespace Server.Spells.Third
return false;
}
if (WeightOverloading.IsOverloaded(Caster))
if (StaminaSystem.IsOverloaded(Caster))
{
Caster.SendLocalizedMessage(502359, "", 0x22); // Thou art too encumbered to move.
return false;