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

fix: Fixes WeaponAbility GetTactics override (#1778)

Browse source
This commit is contained in:
Kamron Batman 2024-05-18 10:24:29 -07:00 • committed by GitHub
parent 416c96d8cd
commit 173b2d5834
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Items/Weapons/Abilities/ArmorPierce.cs
View file

@ -1,8 +1,8 @@
namespace Server.Items
{
/// <summary>
/// Strike your opponent with great force, partially bypassing their armor and inflicting greater damage. Requires either
/// Bushido or Ninjitsu skill
/// Strike your opponent with great force, partially bypassing their armor and inflicting greater damage.
/// Requires either Bushido or Ninjitsu skill.
/// </summary>
public class ArmorPierce : WeaponAbility
{

4
Projects/UOContent/Items/Weapons/Abilities/Bladeweave.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class Bladeweave : WeaponAbility
{
private class BladeWeaveRedirect
private struct BladeWeaveRedirect
{
public readonly WeaponAbility NewAbility;
public readonly int ClilocEntry;
@ -61,7 +61,7 @@ namespace Server.Items
5 => new BladeWeaveRedirect(MortalStrike, 1028846),
6 => new BladeWeaveRedirect(ParalyzingBlow, 1028848),
7 => new BladeWeaveRedirect(Block, 1028853),
_ => new BladeWeaveRedirect(Feint, 1028857) //8
_ => new BladeWeaveRedirect(Feint, 1028857)
};
public override bool OnBeforeDamage(Mobile attacker, Mobile defender) =>

2
Projects/UOContent/Items/Weapons/Abilities/CrushingBlow.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
public override int BaseMana => 25;
public override double DamageScalar => 1.5;
public virtual double GetRequiredTactics(Mobile from)
public override double GetRequiredTactics(Mobile from)
{
if (from.Weapon is BaseWeapon weapon)
{

4
Projects/UOContent/Items/Weapons/Abilities/Disarm.cs
View file

@ -12,10 +12,10 @@ namespace Server.Items
public override int BaseMana => 20;
// Disarm is special. Doesn't need tactics when wrestling and tactics is lower than fighting skill.
public override bool RequiresTactics(Mobile from) => from.Weapon is not BaseWeapon { Skill: SkillName.Wrestling };
// Disarm is special. Doesnt need tactics when wresling and tactics need is lower than fighting skill.
public virtual double GetRequiredTactics(Mobile from)
public override double GetRequiredTactics(Mobile from)
{
if (from.Weapon is BaseWeapon weapon)
{