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

Fixes weapon ability and spell registry (#229)

Browse source 
- [X] Fixes NPE from weapon ability
- [X] Updates [cast so it is not case sensitive, and you don't need the word "Spell" at the end.

Bumps release
This commit is contained in:
Kamron Batman 2020-09-06 12:41:17 -07:00 • committed by GitHub
parent 8b5c7c807f
commit c37c9991f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -12,6 +12,42 @@ namespace Server.Items
{
public abstract class WeaponAbility
{
public static WeaponAbility[] Abilities { get; } =
{
null,
new ArmorIgnore(),
new BleedAttack(),
new ConcussionBlow(),
new CrushingBlow(),
new Disarm(),
new Dismount(),
new DoubleStrike(),
new InfectiousStrike(),
new MortalStrike(),
new MovingShot(),
new ParalyzingBlow(),
new ShadowStrike(),
new WhirlwindAttack(),
new RidingSwipe(),
new FrenziedWhirlwind(),
new Block(),
new DefenseMastery(),
new NerveStrike(),
new TalonStrike(),
new Feint(),
new DualWield(),
new DoubleShot(),
new ArmorPierce(),
null,
null,
null,
null,
null,
null,
new Disrobe()
};
public static readonly WeaponAbility ArmorIgnore = Abilities[1];
public static readonly WeaponAbility BleedAttack = Abilities[2];
public static readonly WeaponAbility ConcussionBlow = Abilities[3];
@ -49,42 +85,6 @@ namespace Server.Items
private static readonly Dictionary<Mobile, WeaponAbilityContext> m_PlayersTable =
new Dictionary<Mobile, WeaponAbilityContext>();
public static WeaponAbility[] Abilities { get; } =
{
null,
new ArmorIgnore(),
new BleedAttack(),
new ConcussionBlow(),
new CrushingBlow(),
new Disarm(),
new Dismount(),
new DoubleStrike(),
new InfectiousStrike(),
new MortalStrike(),
new MovingShot(),
new ParalyzingBlow(),
new ShadowStrike(),
new WhirlwindAttack(),
new RidingSwipe(),
new FrenziedWhirlwind(),
new Block(),
new DefenseMastery(),
new NerveStrike(),
new TalonStrike(),
new Feint(),
new DualWield(),
new DoubleShot(),
new ArmorPierce(),
null,
null,
null,
null,
null,
null,
new Disrobe()
};
public virtual int BaseMana => 0;
public virtual int AccuracyBonus => 0;

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

@ -126,7 +126,7 @@ namespace Server.Spells
{
return (Spell)ActivatorUtil.CreateInstance(t, m_Params);
}
catch
catch (Exception e)
{
// ignored
}
@ -137,9 +137,13 @@ namespace Server.Spells
public static Spell NewSpell(string name, Mobile caster, Item scroll)
{
name = name.Replace(" ", "");
for (var i = 0; i < m_CircleNames.Length; ++i)
{
var t = AssemblyHandler.FindFirstTypeForName($"Server.Spells.{m_CircleNames[i]}.{name}");
var t =
AssemblyHandler.FindFirstTypeForName($"Server.Spells.{m_CircleNames[i]}.{name}", true) ??
AssemblyHandler.FindFirstTypeForName($"Server.Spells.{m_CircleNames[i]}.{name}Spell", true);
if (t?.IsSubclassOf(typeof(SpecialMove)) == false)
{