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

37
Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -1,5 +1,5 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Network;
using Server.Targeting;
@ -153,13 +153,13 @@ public partial class Obsidian : Item
}
}
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 (from.Alive && _quantity is >= Partial and < Completed && IsChildOf(from.Backpack))
{
list.Add(new DisassembleEntry(this));
list.Add(new DisassembleEntry());
}
}
@ -187,23 +187,24 @@ public partial class Obsidian : Item
private class DisassembleEntry : ContextMenuEntry
{
private readonly Obsidian _obsidian;
public DisassembleEntry(Obsidian obsidian) : base(6142) => _obsidian = obsidian;
public override void OnClick()
public DisassembleEntry() : base(6142)
{
var from = Owner.From;
if (!_obsidian.Deleted && _obsidian.Quantity >= Partial && _obsidian.Quantity < Completed &&
_obsidian.IsChildOf(from.Backpack) && from.CheckAlive())
{
for (var i = 0; i < _obsidian.Quantity - 1; i++)
{
from.AddToBackpack(new Obsidian());
}
}
_obsidian.Quantity = 1;
public override void OnClick(Mobile from, IEntity target)
{
if (!from.CheckAlive() || target is not Obsidian obsidian || obsidian.Deleted || obsidian.Quantity < Partial ||
obsidian.Quantity >= Completed || !obsidian.IsChildOf(from.Backpack))
{
return;
}
for (var i = 0; i < obsidian.Quantity - 1; i++)
{
from.AddToBackpack(new Obsidian());
}
obsidian.Quantity = 1;
}
}

21
Projects/UOContent/Engines/Quests/Core/BaseQuester.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Items;
using Server.Mobiles;
@ -8,17 +9,15 @@ namespace Server.Engines.Quests;
public class TalkEntry : ContextMenuEntry
{
private readonly BaseQuester _quester;
public TalkEntry(BaseQuester quester) : base(quester.TalkNumber) => _quester = quester;
public override void OnClick()
public TalkEntry(int talkNumber) : base(talkNumber)
{
var from = Owner.From;
}
if (from.CheckAlive() && from is PlayerMobile mobile && _quester.CanTalkTo(mobile))
public override void OnClick(Mobile from, IEntity target)
{
if (from.CheckAlive() && from is PlayerMobile mobile && target is BaseQuester quester && quester.CanTalkTo(mobile))
{
_quester.OnTalk(mobile, true);
quester.OnTalk(mobile, true);
}
}
}
@ -60,13 +59,13 @@ public abstract partial class BaseQuester : BaseVendor
return item;
}
public override void AddCustomContextEntries(Mobile from, List<ContextMenuEntry> list)
public override void AddCustomContextEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
{
base.AddCustomContextEntries(from, list);
base.AddCustomContextEntries(from, ref list);
if (from.Alive && from is PlayerMobile mobile && TalkNumber > 0 && CanTalkTo(mobile))
{
list.Add(new TalkEntry(this));
list.Add(new TalkEntry(TalkNumber));
}
}

2
Projects/UOContent/Engines/Quests/Core/QuestCallbackEntry.cs
View file

@ -13,7 +13,7 @@ namespace Server.Engines.Quests
public QuestCallbackEntry(int number, int range, QuestCallback callback) : base(number, range) =>
m_Callback = callback;
public override void OnClick()
public override void OnClick(Mobile from, IEntity target)
{
m_Callback?.Invoke();
}

3
Projects/UOContent/Engines/Quests/Core/QuestSystem.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Server.Collections;
using Server.ContextMenus;
using Server.Engines.Quests.Ambitious;
using Server.Engines.Quests.Collector;
@ -246,7 +247,7 @@ namespace Server.Engines.Quests
From.SendGump(new QuestOfferGump(this));
}
public virtual void GetContextMenuEntries(List<ContextMenuEntry> list)
public virtual void GetContextMenuEntries(ref PooledRefList<ContextMenuEntry> list)
{
if (Objectives.Count > 0)
{

29
Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Horus.cs
View file

@ -1,9 +1,8 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Items;
using Server.Mobiles;
using Server.Network;
namespace Server.Engines.Quests.Necro;
@ -115,9 +114,9 @@ public partial class Horus : BaseQuester
}
}
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 (!from.Alive || from is not PlayerMobile pm)
{
@ -131,7 +130,7 @@ public partial class Horus : BaseQuester
var obj = qs.FindObjective<SpeakCavePasswordObjective>();
var enabled = obj?.Completed == false;
list.Add(new SpeakPasswordEntry(this, pm, enabled));
list.Add(new SpeakPasswordEntry(enabled));
}
}
@ -150,25 +149,13 @@ public partial class Horus : BaseQuester
private class SpeakPasswordEntry : ContextMenuEntry
{
private readonly PlayerMobile _from;
private readonly Horus _horus;
public SpeakPasswordEntry(bool enabled) : base(6193, 3) => Enabled = enabled;
public SpeakPasswordEntry(Horus horus, PlayerMobile from, bool enabled) : base(6193, 3)
public override void OnClick(Mobile from, IEntity target)
{
_horus = horus;
_from = from;
if (!enabled)
if (from.Alive && from is PlayerMobile pm && target is Horus horus)
{
Flags |= CMEFlags.Disabled;
}
}
public override void OnClick()
{
if (_from.Alive)
{
_horus.OnPasswordSpoken(_from);
horus.OnPasswordSpoken(pm);
}
}
}

21
Projects/UOContent/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs
View file

@ -1,5 +1,5 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Engines.Plants;
using Server.Items;
@ -141,14 +141,14 @@ public abstract partial class BaseSolenMatriarch : BaseQuester
return true;
}
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 (from.Alive && from is PlayerMobile pm && pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen &&
qs.IsObjectiveInProgress(typeof(ProcessFungiObjective)))
{
list.Add(new ProcessZoogiFungusEntry(this, pm));
list.Add(new ProcessZoogiFungusEntry());
}
}
@ -197,20 +197,15 @@ public abstract partial class BaseSolenMatriarch : BaseQuester
private class ProcessZoogiFungusEntry : ContextMenuEntry
{
private readonly PlayerMobile _from;
private readonly BaseSolenMatriarch _matriarch;
public ProcessZoogiFungusEntry(BaseSolenMatriarch matriarch, PlayerMobile from) : base(6184)
public ProcessZoogiFungusEntry() : base(6184)
{
_matriarch = matriarch;
_from = from;
}
public override void OnClick()
public override void OnClick(Mobile from, IEntity target)
{
if (_from.Alive)
if (from.Alive && from is PlayerMobile pm && target is BaseSolenMatriarch matriarch)
{
_from.Target = new ProcessFungiTarget(_matriarch, _from);
from.Target = new ProcessFungiTarget(matriarch, pm);
}
}
}