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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

90
Projects/Scripts/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -125,13 +125,13 @@ namespace Server.Items
{
int mana = BaseMana;
double skillTotal = GetSkill(from, SkillName.Swords) + GetSkill(from, SkillName.Macing) +
GetSkill(from, SkillName.Fencing) +
double skillTotal = GetSkill(from, SkillName.Swords) + GetSkill(from, SkillName.Macing)
+ GetSkill(from, SkillName.Fencing) +
GetSkill(from, SkillName.Archery) +
GetSkill(from, SkillName.Parry) +
GetSkill(from, SkillName.Lumberjacking) +
GetSkill(from, SkillName.Stealth) +
GetSkill(from, SkillName.Poisoning) +
GetSkill(from, SkillName.Parry)
+ GetSkill(from, SkillName.Lumberjacking) +
GetSkill(from, SkillName.Stealth)
+ GetSkill(from, SkillName.Poisoning) +
GetSkill(from, SkillName.Bushido) +
GetSkill(from, SkillName.Ninjitsu);
@ -256,33 +256,55 @@ namespace Server.Items
#region Dueling
string option = this switch
{
ArmorIgnore _ => "Armor Ignore",
BleedAttack _ => "Bleed Attack",
ConcussionBlow _ => "Concussion Blow",
CrushingBlow _ => "Crushing Blow",
Disarm _ => "Disarm",
Dismount _ => "Dismount",
DoubleStrike _ => "Double Strike",
InfectiousStrike _ => "Infectious Strike",
MortalStrike _ => "Mortal Strike",
MovingShot _ => "Moving Shot",
ParalyzingBlow _ => "Paralyzing Blow",
ShadowStrike _ => "Shadow Strike",
WhirlwindAttack _ => "Whirlwind Attack",
RidingSwipe _ => "Riding Swipe",
FrenziedWhirlwind _ => "Frenzied Whirlwind",
Block _ => "Block",
DefenseMastery _ => "Defense Mastery",
NerveStrike _ => "Nerve Strike",
TalonStrike _ => "Talon Strike",
Feint _ => "Feint",
DualWield _ => "Dual Wield",
DoubleShot _ => "Double Shot",
ArmorPierce _ => "Armor Pierce",
_ => null
};
string option = null;
if (this is ArmorIgnore)
option = "Armor Ignore";
else if (this is BleedAttack)
option = "Bleed Attack";
else if (this is ConcussionBlow)
option = "Concussion Blow";
else if (this is CrushingBlow)
option = "Crushing Blow";
else if (this is Disarm)
option = "Disarm";
else if (this is Dismount)
option = "Dismount";
else if (this is DoubleStrike)
option = "Double Strike";
else if (this is InfectiousStrike)
option = "Infectious Strike";
else if (this is MortalStrike)
option = "Mortal Strike";
else if (this is MovingShot)
option = "Moving Shot";
else if (this is ParalyzingBlow)
option = "Paralyzing Blow";
else if (this is ShadowStrike)
option = "Shadow Strike";
else if (this is WhirlwindAttack)
option = "Whirlwind Attack";
else if (this is RidingSwipe)
option = "Riding Swipe";
else if (this is FrenziedWhirlwind)
option = "Frenzied Whirlwind";
else if (this is Block)
option = "Block";
else if (this is DefenseMastery)
option = "Defense Mastery";
else if (this is NerveStrike)
option = "Nerve Strike";
else if (this is TalonStrike)
option = "Talon Strike";
else if (this is Feint)
option = "Feint";
else if (this is DualWield)
option = "Dual Wield";
else if (this is DoubleShot)
option = "Double Shot";
else if (this is ArmorPierce)
option = "Armor Pierce";
if (option != null && !DuelContext.AllowSpecialAbility(from, option, true))
return false;
@ -359,7 +381,7 @@ namespace Server.Items
Table.Remove(m);
if (Core.AOS && m.NetState != null)
Packets.SendClearWeaponAbility(m.NetState);
m.Send(ClearWeaponAbility.Instance);
}
public static void Initialize()