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

64
Projects/Scripts/Items/Armor/BaseArmor.cs
View file

@ -436,8 +436,9 @@ namespace Server.Items
BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + m_EnergyBonus;
[CommandProperty(AccessLevel.GameMaster)]
public ArmorBodyType BodyPosition =>
Layer switch
public ArmorBodyType BodyPosition
{
get
{
return Layer switch
{
@ -1143,7 +1144,8 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
SkillBonuses = new AosSkillBonuses(this, reader);
PlayerConstructed |= GetSaveFlag(flags, SaveFlag.PlayerConstructed);
if (GetSaveFlag(flags, SaveFlag.PlayerConstructed))
PlayerConstructed = true;
break;
}
@ -1269,7 +1271,8 @@ namespace Server.Items
}
}
SkillBonuses ??= new AosSkillBonuses(this);
if (SkillBonuses == null)
SkillBonuses = new AosSkillBonuses(this);
Mobile m = Parent as Mobile;
@ -1296,11 +1299,17 @@ namespace Server.Items
m?.CheckStatTimers();
PlayerConstructed |= version < 7; // we don't know, so, assume it's crafted
if (version < 7)
PlayerConstructed = true; // we don't know, so, assume it's crafted
}
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted) =>
Ethic.CheckTrade(@from, to, newOwner, this) && base.AllowSecureTrade(@from, to, newOwner, accepted);
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted)
{
if (!Ethic.CheckTrade(from, to, newOwner, this))
return false;
return base.AllowSecureTrade(from, to, newOwner, accepted);
}
public override bool CanEquip(Mobile from)
{
@ -1365,10 +1374,19 @@ namespace Server.Items
return base.CanEquip(from);
}
public override bool CheckPropertyConfliction(Mobile m) =>
base.CheckPropertyConfliction(m) || (Layer == Layer.Pants
? m.FindItemOnLayer(Layer.InnerLegs) != null
: Layer == Layer.Shirt && m.FindItemOnLayer(Layer.InnerTorso) != null);
public override bool CheckPropertyConfliction(Mobile m)
{
if (base.CheckPropertyConfliction(m))
return true;
if (Layer == Layer.Pants)
return m.FindItemOnLayer(Layer.InnerLegs) != null;
if (Layer == Layer.Shirt)
return m.FindItemOnLayer(Layer.InnerTorso) != null;
return false;
}
public override bool OnEquip(Mobile from)
{
@ -1459,9 +1477,25 @@ namespace Server.Items
}
}
public override bool AllowEquippedCast(Mobile from) => base.AllowEquippedCast(@from) || Attributes.SpellChanneling != 0;
public override bool AllowEquippedCast(Mobile from)
{
if (base.AllowEquippedCast(from))
return true;
public virtual int GetLuckBonus() => CraftResources.GetInfo(m_Resource)?.AttributeInfo?.ArmorLuck ?? 0;
return Attributes.SpellChanneling != 0;
}
public virtual int GetLuckBonus()
{
CraftResourceInfo resInfo = CraftResources.GetInfo(m_Resource);
CraftAttributeInfo attrInfo = resInfo?.AttributeInfo;
if (attrInfo == null)
return 0;
return attrInfo.ArmorLuck;
}
public override void GetProperties(ObjectPropertyList list)
{
@ -1631,7 +1665,9 @@ namespace Server.Items
if (attrs.Count == 0 && Crafter == null && Name != null)
return;
EquipmentPackets.SendDisplayEquipmentInfo(from.NetState, this, number, m_Crafter, false, attrs);
EquipmentInfo eqInfo = new EquipmentInfo(number, m_Crafter, false, attrs.ToArray());
from.Send(new DisplayEquipmentInfo(this, eqInfo));
}
[Flags]