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

fix: Moves ContextMenu out of core, streamlines code, fixes bugs (#1873)

Browse source 
## Summary
- Removes allocation of a `List<ContextMenuEntry>` every time a context menu is created.
- Moves packet/context menu creation logic out of the core
- Fixes tame entry

## BREAKING CHANGE
> [!Important]
> **Developer Note**
> ```cs
> public virtual void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
> ```
> and similar functions changed to
> ```cs
> public virtual void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
> ```
This commit is contained in:
Kamron Batman 2024-07-20 21:33:23 -07:00 • committed by GitHub
parent bb24b330e1
commit f58117a877
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
88 changed files with 1206 additions and 1483 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Mobiles;
@ -79,14 +79,14 @@ public partial class Fukiya : Item, INinjaWeapon
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
public override void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
base.GetContextMenuEntries(from, ref list);
if (IsChildOf(from))
{
list.Add(new NinjaWeapon.LoadEntry(this, 6224));
list.Add(new NinjaWeapon.UnloadEntry(this, 6225));
list.Add(new NinjaWeapon.LoadEntry(6224));
list.Add(new NinjaWeapon.UnloadEntry(6225, UsesRemaining > 0));
}
}
}

10
Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Mobiles;
@ -92,14 +92,14 @@ public partial class LeatherNinjaBelt : BaseWaist, INinjaWeapon
NinjaWeapon.AttemptShoot((PlayerMobile)from, this);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
public override void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
base.GetContextMenuEntries(from, ref list);
if (IsChildOf(from))
{
list.Add(new NinjaWeapon.LoadEntry(this, 6222));
list.Add(new NinjaWeapon.UnloadEntry(this, 6223));
list.Add(new NinjaWeapon.LoadEntry(6222));
list.Add(new NinjaWeapon.UnloadEntry(6223, UsesRemaining > 0));
}
}
}

34
Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -329,39 +329,29 @@ public static class NinjaWeapon
public class LoadEntry : ContextMenuEntry
{
private readonly INinjaWeapon weapon;
public LoadEntry(INinjaWeapon wep, int entry)
: base(entry, 0) =>
weapon = wep;
public override void OnClick()
public LoadEntry(int entry) : base(entry, 0)
{
if (WeaponIsValid(weapon, Owner.From))
}
public override void OnClick(Mobile from, IEntity target)
{
if (target is INinjaWeapon weapon && WeaponIsValid(weapon, from))
{
Owner.From.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
from.BeginTarget(10, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
}
public class UnloadEntry : ContextMenuEntry
{
private readonly INinjaWeapon weapon;
public UnloadEntry(int entry, bool enabled) : base(entry, 0) => Enabled = enabled;
public UnloadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
public override void OnClick(Mobile from, IEntity target)
{
weapon = wep;
Enabled = weapon.UsesRemaining > 0;
}
public override void OnClick()
{
if (WeaponIsValid(weapon, Owner.From))
if (target is INinjaWeapon weapon && WeaponIsValid(weapon, from))
{
Unload(Owner.From, weapon);
Unload(from, weapon);
}
}
}
}
}