8a34903326
## Summary - Creates `PropsLayoutExtensions.cs` with reusable extension methods for both legacy `Gump` and `DynamicGumpBuilder` that encapsulate the repeating PropsConfig-style layout patterns (frame, header navigation, entry rows) - Converts all 12 standardized staff gumps to use the new extensions, reducing ~570 lines of duplicated layout code - Adds Type and Serial display to PropsGump and SkillsGump headers (e.g. `PlayerMobile (0x1)`) ### Extension methods provided | Method | Pattern | |--------|---------| | `AddPropsFrame` | Background + offset region + origin coordinates | | `AddPropsHeader` | 3-column: [Prev] [Title] [Next] | | `AddPropsHeaderWithBack` | 4-column: [Back] [Title] [Prev] [Next] | | `AddPropsEntryButton` | Label + action button | | `AddPropsEntryNameValue` | Name + Value + action button | | `AddPropsEntryTextInput` | Text input + action button | | `AddPropsEntryLabel` | Label only (no button) | | `AddPropsEntryType` | Full-width type label | | `AddPropsEntryBlank` | Separator row | ### Gumps converted PropsGump, GoGump, WhoGump, SkillsGump (frame+header), EditSkillGump, SetGump, SetObjectGump, SetPoint2DGump, SetPoint3DGump, SetTimeSpanGump (frame), SetListOptionGump (frame+header), CategorizedAddGump (frame+header) ## Test plan - [x] Verify `[props` gump displays correctly with type + serial in header - [x] Verify `[skills` gump displays correctly with type + serial in header - [x] Verify `[go` navigation gump works (prev/next/back) - [x] Verify property editing gumps (Set, SetObject, SetPoint2D, SetPoint3D, SetTimeSpan, SetListOption) - [x] Verify `[categorizedadd` gump works - [x] Verify `[who` gump works with pagination
478 lines
16 KiB
C#
478 lines
16 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using Server.Commands;
|
|
using Server.Network;
|
|
|
|
using static Server.Gumps.PropsConfig;
|
|
|
|
namespace Server.Gumps
|
|
{
|
|
public class EditSkillGump : Gump
|
|
{
|
|
private const int EntryWidth = 160;
|
|
|
|
private const int TotalWidth = OffsetSize + EntryWidth + OffsetSize + SetWidth + OffsetSize;
|
|
|
|
private readonly Mobile m_From;
|
|
|
|
private readonly SkillsGumpGroup m_Selected;
|
|
private readonly Skill m_Skill;
|
|
private readonly Mobile m_Target;
|
|
|
|
public EditSkillGump(Mobile from, Mobile target, Skill skill, SkillsGumpGroup selected) : base(
|
|
GumpOffsetX,
|
|
GumpOffsetY
|
|
)
|
|
{
|
|
m_From = from;
|
|
m_Target = target;
|
|
m_Skill = skill;
|
|
m_Selected = selected;
|
|
|
|
var initialText = m_Skill.Base.ToString("F1");
|
|
|
|
AddPage(0);
|
|
|
|
this.AddPropsFrame(TotalWidth, 2, out var x, out var y);
|
|
this.AddPropsEntryLabel(ref x, ref y, EntryWidth, skill.Name);
|
|
PropsLayout.NextRow(ref x, ref y);
|
|
this.AddPropsEntryTextInput(ref x, ref y, EntryWidth, 0, initialText, true, 1);
|
|
}
|
|
|
|
public override void OnResponse(NetState sender, in RelayInfo info)
|
|
{
|
|
if (info.ButtonID == 1)
|
|
{
|
|
try
|
|
{
|
|
if (m_From.AccessLevel >= AccessLevel.GameMaster)
|
|
{
|
|
var text = info.GetTextEntry(0)?.Trim();
|
|
|
|
if (text?.Length > 0)
|
|
{
|
|
m_Skill.Base = Convert.ToDouble(text);
|
|
CommandLogging.LogChangeProperty(m_From, m_Target, $"{m_Skill}.Base", m_Skill.Base.ToString());
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_From.SendMessage("You may not change that.");
|
|
}
|
|
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, m_Selected));
|
|
}
|
|
catch
|
|
{
|
|
m_From.SendMessage("Bad format. ###.# expected.");
|
|
m_From.SendGump(new EditSkillGump(m_From, m_Target, m_Skill, m_Selected));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, m_Selected));
|
|
}
|
|
}
|
|
}
|
|
|
|
public class SkillsGump : Gump
|
|
{
|
|
private const int NameWidth = 107;
|
|
private const int ValueWidth = 128;
|
|
|
|
private const int TotalWidth = OffsetSize + NameWidth + OffsetSize + ValueWidth + OffsetSize + SetWidth + OffsetSize;
|
|
|
|
private static readonly int IndentWidth = 12;
|
|
|
|
private readonly Mobile m_From;
|
|
|
|
private readonly SkillsGumpGroup[] m_Groups;
|
|
private readonly SkillsGumpGroup m_Selected;
|
|
private readonly Mobile m_Target;
|
|
|
|
public SkillsGump(Mobile from, Mobile target, SkillsGumpGroup selected = null) : base(GumpOffsetX, GumpOffsetY)
|
|
{
|
|
m_From = from;
|
|
m_Target = target;
|
|
|
|
m_Groups = SkillsGumpGroup.Groups;
|
|
m_Selected = selected;
|
|
|
|
var count = m_Groups.Length;
|
|
|
|
if (selected != null)
|
|
{
|
|
count += selected.Skills.Length;
|
|
}
|
|
|
|
AddPage(0);
|
|
|
|
this.AddPropsFrame(TotalWidth, count + 1, out var x, out var y);
|
|
this.AddPropsHeader(
|
|
TotalWidth, ref x, ref y,
|
|
$"{target.GetType().Name} ({target.Serial})".Center(0xFAFAFA),
|
|
false, 0, false, 0
|
|
);
|
|
|
|
const int emptyWidth = TotalWidth - PrevWidth - NextWidth - OffsetSize * 4;
|
|
|
|
for (var i = 0; i < m_Groups.Length; ++i)
|
|
{
|
|
x = BorderSize + OffsetSize;
|
|
y += EntryHeight + OffsetSize;
|
|
|
|
var group = m_Groups[i];
|
|
|
|
AddImageTiled(x, y, PrevWidth, EntryHeight, HeaderGumpID);
|
|
|
|
if (group == selected)
|
|
{
|
|
AddButton(x + PrevOffsetX, y + PrevOffsetY, 0x15E2, 0x15E6, GetButtonID(0, i));
|
|
}
|
|
else
|
|
{
|
|
AddButton(x + PrevOffsetX, y + PrevOffsetY, 0x15E1, 0x15E5, GetButtonID(0, i));
|
|
}
|
|
|
|
x += PrevWidth + OffsetSize;
|
|
|
|
AddImageTiled(x, y, emptyWidth, EntryHeight, EntryGumpID);
|
|
AddLabel(x + TextOffsetX, y, TextHue, group?.Name ?? "");
|
|
|
|
x += emptyWidth;
|
|
x += OffsetSize;
|
|
|
|
if (SetGumpID != 0)
|
|
{
|
|
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
|
|
}
|
|
|
|
if (group != selected)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
var indentMaskY = y + EntryHeight + OffsetSize;
|
|
|
|
for (var j = 0; j < group!.Skills.Length; ++j)
|
|
{
|
|
var sk = target.Skills[group.Skills[j]];
|
|
|
|
x = BorderSize + OffsetSize;
|
|
y += EntryHeight + OffsetSize;
|
|
|
|
x += OffsetSize;
|
|
x += IndentWidth;
|
|
|
|
AddImageTiled(x, y, PrevWidth, EntryHeight, HeaderGumpID);
|
|
|
|
AddButton(x + PrevOffsetX, y + PrevOffsetY, 0x15E1, 0x15E5, GetButtonID(1, j));
|
|
|
|
x += PrevWidth + OffsetSize;
|
|
|
|
AddImageTiled(x, y, emptyWidth - OffsetSize - IndentWidth, EntryHeight, EntryGumpID);
|
|
AddLabel(x + TextOffsetX, y, TextHue, sk == null ? "(null)" : sk.Name);
|
|
|
|
x += emptyWidth - OffsetSize - IndentWidth;
|
|
x += OffsetSize;
|
|
|
|
if (SetGumpID != 0)
|
|
{
|
|
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
|
|
}
|
|
|
|
if (sk != null)
|
|
{
|
|
int buttonID1, buttonID2;
|
|
int xOffset, yOffset;
|
|
|
|
switch (sk.Lock)
|
|
{
|
|
default:
|
|
{
|
|
buttonID1 = 0x983;
|
|
buttonID2 = 0x983;
|
|
xOffset = 6;
|
|
yOffset = 4;
|
|
break;
|
|
}
|
|
case SkillLock.Down:
|
|
{
|
|
buttonID1 = 0x985;
|
|
buttonID2 = 0x985;
|
|
xOffset = 6;
|
|
yOffset = 4;
|
|
break;
|
|
}
|
|
case SkillLock.Locked:
|
|
{
|
|
buttonID1 = 0x82C;
|
|
buttonID2 = 0x82C;
|
|
xOffset = 5;
|
|
yOffset = 2;
|
|
break;
|
|
}
|
|
}
|
|
|
|
AddButton(x + xOffset, y + yOffset, buttonID1, buttonID2, GetButtonID(2, j));
|
|
|
|
y += 1;
|
|
x -= OffsetSize;
|
|
x -= 1;
|
|
x -= 50;
|
|
|
|
AddImageTiled(x, y, 50, EntryHeight - 2, OffsetGumpID);
|
|
|
|
x += 1;
|
|
y += 1;
|
|
|
|
AddImageTiled(x, y, 48, EntryHeight - 4, EntryGumpID);
|
|
|
|
AddLabelCropped(
|
|
x + TextOffsetX,
|
|
y - 1,
|
|
48 - TextOffsetX,
|
|
EntryHeight - 3,
|
|
TextHue,
|
|
sk.Base.ToString("F1")
|
|
);
|
|
|
|
y -= 2;
|
|
}
|
|
}
|
|
|
|
AddImageTiled(
|
|
BorderSize,
|
|
indentMaskY,
|
|
IndentWidth + OffsetSize,
|
|
group.Skills.Length * (EntryHeight + OffsetSize) - (i < m_Groups.Length - 1 ? OffsetSize : 0),
|
|
BackGumpID + 4
|
|
);
|
|
}
|
|
}
|
|
|
|
public override void OnResponse(NetState sender, in RelayInfo info)
|
|
{
|
|
var buttonID = info.ButtonID - 1;
|
|
|
|
var index = buttonID / 3;
|
|
var type = buttonID % 3;
|
|
|
|
switch (type)
|
|
{
|
|
case 0:
|
|
{
|
|
if (index >= 0 && index < m_Groups.Length)
|
|
{
|
|
var newSelection = m_Groups[index];
|
|
|
|
if (m_Selected != newSelection)
|
|
{
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, newSelection));
|
|
}
|
|
else
|
|
{
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target));
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
case 1:
|
|
{
|
|
if (m_Selected != null && index >= 0 && index < m_Selected.Skills.Length)
|
|
{
|
|
var sk = m_Target.Skills[m_Selected.Skills[index]];
|
|
|
|
if (sk != null)
|
|
{
|
|
if (m_From.AccessLevel >= AccessLevel.GameMaster)
|
|
{
|
|
m_From.SendGump(new EditSkillGump(m_From, m_Target, sk, m_Selected));
|
|
}
|
|
else
|
|
{
|
|
m_From.SendMessage("You may not change that.");
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, m_Selected));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, m_Selected));
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
case 2:
|
|
{
|
|
if (m_Selected != null && index >= 0 && index < m_Selected.Skills.Length)
|
|
{
|
|
var sk = m_Target.Skills[m_Selected.Skills[index]];
|
|
|
|
if (sk != null)
|
|
{
|
|
if (m_From.AccessLevel >= AccessLevel.GameMaster)
|
|
{
|
|
switch (sk.Lock)
|
|
{
|
|
case SkillLock.Up:
|
|
{
|
|
sk.SetLockNoRelay(SkillLock.Down);
|
|
sk.Update();
|
|
break;
|
|
}
|
|
case SkillLock.Down:
|
|
{
|
|
sk.SetLockNoRelay(SkillLock.Locked);
|
|
sk.Update();
|
|
break;
|
|
}
|
|
case SkillLock.Locked:
|
|
{
|
|
sk.SetLockNoRelay(SkillLock.Up);
|
|
sk.Update();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_From.SendMessage("You may not change that.");
|
|
}
|
|
|
|
m_From.SendGump(new SkillsGump(m_From, m_Target, m_Selected));
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
public int GetButtonID(int type, int index) => 1 + index * 3 + type;
|
|
}
|
|
|
|
public class SkillsGumpGroup
|
|
{
|
|
public SkillsGumpGroup(string name, SkillName[] skills)
|
|
{
|
|
Name = name;
|
|
Skills = skills;
|
|
|
|
Array.Sort(Skills, new SkillNameComparer());
|
|
}
|
|
|
|
public string Name { get; }
|
|
|
|
public SkillName[] Skills { get; }
|
|
|
|
public static SkillsGumpGroup[] Groups { get; } =
|
|
[
|
|
new(
|
|
"Crafting",
|
|
[
|
|
SkillName.Alchemy,
|
|
SkillName.Blacksmith,
|
|
SkillName.Cartography,
|
|
SkillName.Carpentry,
|
|
SkillName.Cooking,
|
|
SkillName.Fletching,
|
|
SkillName.Inscribe,
|
|
SkillName.Tailoring,
|
|
SkillName.Tinkering,
|
|
SkillName.Imbuing
|
|
]
|
|
),
|
|
new(
|
|
"Bardic",
|
|
[
|
|
SkillName.Discordance,
|
|
SkillName.Musicianship,
|
|
SkillName.Peacemaking,
|
|
SkillName.Provocation
|
|
]
|
|
),
|
|
new(
|
|
"Magical",
|
|
[
|
|
SkillName.Chivalry,
|
|
SkillName.EvalInt,
|
|
SkillName.Magery,
|
|
SkillName.MagicResist,
|
|
SkillName.Meditation,
|
|
SkillName.Necromancy,
|
|
SkillName.SpiritSpeak,
|
|
SkillName.Ninjitsu,
|
|
SkillName.Bushido,
|
|
SkillName.Spellweaving,
|
|
SkillName.Mysticism
|
|
]
|
|
),
|
|
new(
|
|
"Miscellaneous",
|
|
[
|
|
SkillName.Camping,
|
|
SkillName.Fishing,
|
|
SkillName.Focus,
|
|
SkillName.Healing,
|
|
SkillName.Herding,
|
|
SkillName.Lockpicking,
|
|
SkillName.Lumberjacking,
|
|
SkillName.Mining,
|
|
SkillName.Snooping,
|
|
SkillName.Veterinary
|
|
]
|
|
),
|
|
new(
|
|
"Combat Ratings",
|
|
[
|
|
SkillName.Archery,
|
|
SkillName.Fencing,
|
|
SkillName.Macing,
|
|
SkillName.Parry,
|
|
SkillName.Swords,
|
|
SkillName.Tactics,
|
|
SkillName.Wrestling,
|
|
SkillName.Throwing
|
|
]
|
|
),
|
|
new(
|
|
"Actions",
|
|
[
|
|
SkillName.AnimalTaming,
|
|
SkillName.Begging,
|
|
SkillName.DetectHidden,
|
|
SkillName.Hiding,
|
|
SkillName.RemoveTrap,
|
|
SkillName.Poisoning,
|
|
SkillName.Stealing,
|
|
SkillName.Stealth,
|
|
SkillName.Tracking
|
|
]
|
|
),
|
|
new(
|
|
"Lore & Knowledge",
|
|
[
|
|
SkillName.Anatomy,
|
|
SkillName.AnimalLore,
|
|
SkillName.ArmsLore,
|
|
SkillName.Forensics,
|
|
SkillName.ItemID,
|
|
SkillName.TasteID
|
|
]
|
|
)
|
|
];
|
|
|
|
private class SkillNameComparer : IComparer<SkillName>
|
|
{
|
|
public int Compare(SkillName a, SkillName b)
|
|
{
|
|
var aName = SkillInfo.Table[(int)a].Name;
|
|
var bName = SkillInfo.Table[(int)b].Name;
|
|
|
|
return string.CompareOrdinal(aName, bName);
|
|
}
|
|
}
|
|
}
|
|
}
|