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

Rearrange

Browse source
This commit is contained in:
Kamron Batman 2026-06-26 00:41:25 -07:00
parent 9813e0668a
commit b764c329e0
4 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -1323,7 +1323,7 @@ namespace Server.Items
list.Add(1061078, prop); // artifact rarity ~1_val~
}
ArmorAttributes.GetProperties(list, lowerStatReq: GetLowerStatReq());
ArmorAttributes.GetProperties(list);
Attributes.GetProperties(list, luckBonus: GetLuckBonus());
@ -1334,6 +1334,12 @@ namespace Server.Items
list.Add(1060410, prop); // durability ~1_val~%
}
var lowerStatReq = GetLowerStatReq();
if (lowerStatReq != 0)
{
list.Add(1060435, lowerStatReq); // lower requirements ~1_val~%
}
if ((prop = ComputeStatReq(StatType.Str)) > 0)
{
list.Add(1061170, prop); // strength requirement ~1_val~

8
Projects/UOContent/Items/Clothing/BaseClothing.cs
View file

@ -754,7 +754,7 @@ namespace Server.Items
list.Add(1061078, prop); // artifact rarity ~1_val~
}
ClothingAttributes.GetProperties(list, lowerStatReq: ClothingAttributes.LowerStatReq);
ClothingAttributes.GetProperties(list);
Attributes.GetProperties(list);
@ -765,6 +765,12 @@ namespace Server.Items
list.Add(1060410, prop); // durability ~1_val~%
}
var lowerStatReq = ClothingAttributes.LowerStatReq;
if (lowerStatReq != 0)
{
list.Add(1060435, lowerStatReq); // lower requirements ~1_val~%
}
if ((prop = ComputeStatReq(StatType.Str)) > 0)
{
list.Add(1061170, prop); // strength requirement ~1_val~

23
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -2998,7 +2998,7 @@ public abstract partial class BaseWeapon
list.Add(1072792); // Balanced
}
WeaponAttributes.GetProperties(list, lowerStatReq: GetLowerStatReq());
WeaponAttributes.GetProperties(list);
if (ImmolatingWeaponSpell.IsImmolating(this))
{
@ -3017,6 +3017,12 @@ public abstract partial class BaseWeapon
luckBonus: GetLuckBonus()
);
var lowerStatReq = GetLowerStatReq();
if (lowerStatReq != 0)
{
list.Add(1060435, lowerStatReq); // lower requirements ~1_val~%
}
GetDamageTypes(
null,
out var phys,
@ -3033,16 +3039,16 @@ public abstract partial class BaseWeapon
list.Add(1060403, phys); // physical damage ~1_val~%
}
if (fire != 0)
{
list.Add(1060405, fire); // fire damage ~1_val~%
}
if (cold != 0)
{
list.Add(1060404, cold); // cold damage ~1_val~%
}
if (fire != 0)
{
list.Add(1060405, fire); // fire damage ~1_val~%
}
if (pois != 0)
{
list.Add(1060406, pois); // poison damage ~1_val~%
@ -3119,6 +3125,11 @@ public abstract partial class BaseWeapon
list.Add(1061175); // skill required: archery
break;
}
case SkillName.Throwing:
{
list.Add(1112075); // skill required: throwing
break;
}
}
}

14
Projects/UOContent/Misc/AOS.cs
View file

@ -1012,7 +1012,7 @@ namespace Server
// lowerStatReq is passed in because the weapon folds the resource's lower-requirements into
// GetLowerStatReq(); emitted in cliloc order (1060435) between the Hit* block and MageWeapon.
public void GetProperties(IPropertyList list, int lowerStatReq = 0)
public void GetProperties(IPropertyList list)
{
int prop;
@ -1096,11 +1096,6 @@ namespace Server
list.Add(1060430, prop); // hit stamina leech ~1_val~%
}
if (lowerStatReq != 0)
{
list.Add(1060435, lowerStatReq); // lower requirements ~1_val~%
}
if ((prop = MageWeapon) != 0)
{
list.Add(1060438, 30 - prop); // mage weapon -~1_val~ skill
@ -1208,15 +1203,10 @@ namespace Server
// lowerStatReq is passed in because consumers compute it differently: armor folds in the
// resource's ArmorLowerRequirements via GetLowerStatReq(), clothing reads it raw. Emitted in
// cliloc order (1060435) ahead of MageArmor/SelfRepair.
public void GetProperties(IPropertyList list, int lowerStatReq = 0)
public void GetProperties(IPropertyList list)
{
int prop;
if (lowerStatReq != 0)
{
list.Add(1060435, lowerStatReq); // lower requirements ~1_val~%
}
if (MageArmor != 0)
{
list.Add(1060437); // mage armor