fix: Converts MakersMark gump to static & CraftGumpItem to dynamic (#2095)

This commit is contained in:
Kamron Batman 2025-01-27 11:29:23 -08:00 • committed by GitHub
parent 6d879e1d22
commit b5e3f49d06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 331 additions and 325 deletions

View file

@ -4,9 +4,9 @@ using Server.Items;
using Server.Mobiles; using Server.Mobiles;
using Server.Network; using Server.Network;
namespace Server.Engines.Craft namespace Server.Engines.Craft;
{
public class CraftGumpItem : Gump public class CraftGumpItem : DynamicGump
{ {
private const int LabelHue = 0x480; // 0x384 private const int LabelHue = 0x480; // 0x384
private const int RedLabelHue = 0x20; private const int RedLabelHue = 0x20;
@ -18,85 +18,85 @@ namespace Server.Engines.Craft
private static readonly Type typeofBlankScroll = typeof(BlankScroll); private static readonly Type typeofBlankScroll = typeof(BlankScroll);
private static readonly Type typeofSpellScroll = typeof(SpellScroll); private static readonly Type typeofSpellScroll = typeof(SpellScroll);
private readonly CraftItem m_CraftItem;
private readonly CraftSystem m_CraftSystem;
private readonly Mobile m_From;
private readonly BaseTool m_Tool;
private int m_OtherCount; private readonly Mobile _from;
private readonly CraftItem _craftItem;
private bool m_ShowExceptionalChance; private readonly CraftSystem _craftSystem;
private readonly BaseTool _tool;
public override bool Singleton => true; public override bool Singleton => true;
public CraftGumpItem(Mobile from, CraftSystem craftSystem, CraftItem craftItem, BaseTool tool) : base(40, 40) public CraftGumpItem(Mobile from, CraftSystem craftSystem, CraftItem craftItem, BaseTool tool) : base(40, 40)
{ {
m_From = from; _from = from;
m_CraftSystem = craftSystem; _craftSystem = craftSystem;
m_CraftItem = craftItem; _craftItem = craftItem;
m_Tool = tool; _tool = tool;
}
AddPage(0); protected override void BuildLayout(ref DynamicGumpBuilder builder)
AddBackground(0, 0, 530, 417, 5054);
AddImageTiled(10, 10, 510, 22, 2624);
AddImageTiled(10, 37, 150, 148, 2624);
AddImageTiled(165, 37, 355, 90, 2624);
AddImageTiled(10, 190, 155, 22, 2624);
AddImageTiled(10, 217, 150, 53, 2624);
AddImageTiled(165, 132, 355, 80, 2624);
AddImageTiled(10, 275, 155, 22, 2624);
AddImageTiled(10, 302, 150, 53, 2624);
AddImageTiled(165, 217, 355, 80, 2624);
AddImageTiled(10, 360, 155, 22, 2624);
AddImageTiled(165, 302, 355, 80, 2624);
AddImageTiled(10, 387, 510, 22, 2624);
AddAlphaRegion(10, 10, 510, 399);
AddHtmlLocalized(170, 40, 150, 20, 1044053, LabelColor); // ITEM
AddHtmlLocalized(10, 192, 150, 22, 1044054, LabelColor); // <CENTER>SKILLS</CENTER>
AddHtmlLocalized(10, 277, 150, 22, 1044055, LabelColor); // <CENTER>MATERIALS</CENTER>
AddHtmlLocalized(10, 362, 150, 22, 1044056, LabelColor); // <CENTER>OTHER</CENTER>
if (craftSystem.GumpTitle.Number > 0)
{ {
AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitle.Number, LabelColor); builder.AddPage();
builder.AddBackground(0, 0, 530, 417, 5054);
builder.AddImageTiled(10, 10, 510, 22, 2624);
builder.AddImageTiled(10, 37, 150, 148, 2624);
builder.AddImageTiled(165, 37, 355, 90, 2624);
builder.AddImageTiled(10, 190, 155, 22, 2624);
builder.AddImageTiled(10, 217, 150, 53, 2624);
builder.AddImageTiled(165, 132, 355, 80, 2624);
builder.AddImageTiled(10, 275, 155, 22, 2624);
builder.AddImageTiled(10, 302, 150, 53, 2624);
builder.AddImageTiled(165, 217, 355, 80, 2624);
builder.AddImageTiled(10, 360, 155, 22, 2624);
builder.AddImageTiled(165, 302, 355, 80, 2624);
builder.AddImageTiled(10, 387, 510, 22, 2624);
builder.AddAlphaRegion(10, 10, 510, 399);
builder.AddHtmlLocalized(170, 40, 150, 20, 1044053, LabelColor); // ITEM
builder.AddHtmlLocalized(10, 192, 150, 22, 1044054, LabelColor); // <CENTER>SKILLS</CENTER>
builder.AddHtmlLocalized(10, 277, 150, 22, 1044055, LabelColor); // <CENTER>MATERIALS</CENTER>
builder.AddHtmlLocalized(10, 362, 150, 22, 1044056, LabelColor); // <CENTER>OTHER</CENTER>
if (_craftSystem.GumpTitle.Number > 0)
{
builder.AddHtmlLocalized(10, 12, 510, 20, _craftSystem.GumpTitle.Number, LabelColor);
} }
else else
{ {
AddHtml(10, 12, 510, 20, craftSystem.GumpTitle.String); builder.AddHtml(10, 12, 510, 20, _craftSystem.GumpTitle.String);
} }
AddButton(15, 387, 4014, 4016, 0); builder.AddButton(15, 387, 4014, 4016, 0);
AddHtmlLocalized(50, 390, 150, 18, 1044150, LabelColor); // BACK builder.AddHtmlLocalized(50, 390, 150, 18, 1044150, LabelColor); // BACK
var needsRecipe = craftItem.Recipe != null && from is PlayerMobile mobile && var needsRecipe = _craftItem.Recipe != null && _from is PlayerMobile mobile &&
!mobile.HasRecipe(craftItem.Recipe); !mobile.HasRecipe(_craftItem.Recipe);
if (needsRecipe) if (needsRecipe)
{ {
AddButton(270, 387, 4005, 4007, 0, GumpButtonType.Page); builder.AddButton(270, 387, 4005, 4007, 0, GumpButtonType.Page);
AddHtmlLocalized(305, 390, 150, 18, 1044151, GreyLabelColor); // MAKE NOW builder.AddHtmlLocalized(305, 390, 150, 18, 1044151, GreyLabelColor); // MAKE NOW
} }
else else
{ {
AddButton(270, 387, 4005, 4007, 1); builder.AddButton(270, 387, 4005, 4007, 1);
AddHtmlLocalized(305, 390, 150, 18, 1044151, LabelColor); // MAKE NOW builder.AddHtmlLocalized(305, 390, 150, 18, 1044151, LabelColor); // MAKE NOW
} }
if (craftItem.NameNumber > 0) if (_craftItem.NameNumber > 0)
{ {
AddHtmlLocalized(330, 40, 180, 18, craftItem.NameNumber, LabelColor); builder.AddHtmlLocalized(330, 40, 180, 18, _craftItem.NameNumber, LabelColor);
} }
else else
{ {
AddLabel(330, 40, LabelHue, craftItem.NameString); builder.AddLabel(330, 40, LabelHue, _craftItem.NameString);
} }
if (craftItem.UseAllRes) if (_craftItem.UseAllRes)
{ {
AddHtmlLocalized( builder.AddHtmlLocalized(
170, 170,
302 + m_OtherCount++ * 20, 302,
310, 310,
18, 18,
1048176, // Makes as many as possible at once 1048176, // Makes as many as possible at once
@ -104,17 +104,19 @@ namespace Server.Engines.Craft
); );
} }
DrawItem(); var otherCount = 1;
DrawSkill();
DrawResource();
if (craftItem.RequiredExpansion != Expansion.None) DrawItem(ref builder, ref otherCount, out var showExceptionalChance);
DrawSkill(ref builder, showExceptionalChance);
DrawResource(ref builder, ref otherCount);
if (_craftItem.RequiredExpansion != Expansion.None)
{ {
var supportsEx = from.NetState?.SupportsExpansion(craftItem.RequiredExpansion) == true; var supportsEx = _from.NetState?.SupportsExpansion(_craftItem.RequiredExpansion) == true;
RequiredExpansionMessage(craftItem.RequiredExpansion).AddHtmlText( RequiredExpansionMessage(_craftItem.RequiredExpansion).AddHtmlText(
this, ref builder,
170, 170,
302 + m_OtherCount++ * 20, 302 + otherCount++ * 20,
310, 310,
18, 18,
false, false,
@ -126,9 +128,9 @@ namespace Server.Engines.Craft
if (needsRecipe) if (needsRecipe)
{ {
AddHtmlLocalized( builder.AddHtmlLocalized(
170, 170,
302 + m_OtherCount++ * 20, 302 + otherCount++ * 20,
310, 310,
18, 18,
1073620, // You have not learned this recipe. 1073620, // You have not learned this recipe.
@ -147,88 +149,93 @@ namespace Server.Engines.Craft
}; };
} }
public void DrawItem() public void DrawItem(ref DynamicGumpBuilder builder, ref int otherCount, out bool showExceptionalChance)
{ {
var type = m_CraftItem.ItemType; var type = _craftItem.ItemType;
AddItem(20, 50, m_CraftItem.ItemId, m_CraftItem.ItemHue); builder.AddItem(20, 50, _craftItem.ItemId, _craftItem.ItemHue);
if (m_CraftItem.IsMarkable(type)) if (_craftItem.IsMarkable(type))
{ {
AddHtmlLocalized( builder.AddHtmlLocalized(
170, 170,
302 + m_OtherCount++ * 20, 302 + otherCount++ * 20,
310, 310,
18, 18,
1044059, // This item may hold its maker's mark 1044059, // This item may hold its maker's mark
LabelColor LabelColor
); );
m_ShowExceptionalChance = true;
showExceptionalChance = true;
}
else
{
showExceptionalChance = false;
} }
} }
public void DrawSkill() public void DrawSkill(ref DynamicGumpBuilder builder, bool showExceptionalChance)
{ {
for (var i = 0; i < m_CraftItem.Skills.Count; i++) for (var i = 0; i < _craftItem.Skills.Count; i++)
{ {
var skill = m_CraftItem.Skills[i]; var skill = _craftItem.Skills[i];
var minSkill = Math.Max(skill.MinSkill, 0); var minSkill = Math.Max(skill.MinSkill, 0);
AddHtmlLocalized(170, 132 + i * 20, 200, 18, AosSkillBonuses.GetLabel(skill.SkillToMake), LabelColor); builder.AddHtmlLocalized(170, 132 + i * 20, 200, 18, AosSkillBonuses.GetLabel(skill.SkillToMake), LabelColor);
AddLabel(430, 132 + i * 20, LabelHue, $"{minSkill:F1}"); builder.AddLabel(430, 132 + i * 20, LabelHue, $"{minSkill:F1}");
} }
var res = m_CraftItem.UseSubRes2 ? m_CraftSystem.CraftSubRes2 : m_CraftSystem.CraftSubRes; var res = _craftItem.UseSubRes2 ? _craftSystem.CraftSubRes2 : _craftSystem.CraftSubRes;
var resIndex = -1; var resIndex = -1;
var context = m_CraftSystem.GetContext(m_From); var context = _craftSystem.GetContext(_from);
if (context != null) if (context != null)
{ {
resIndex = m_CraftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex; resIndex = _craftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex;
} }
var chance = m_CraftItem.GetSuccessChance( var chance = _craftItem.GetSuccessChance(
m_From, _from,
resIndex > -1 ? res.GetAt(resIndex).ItemType : null, resIndex > -1 ? res.GetAt(resIndex).ItemType : null,
m_CraftSystem, _craftSystem,
false, false,
out _ out _
); );
AddHtmlLocalized(170, 80, 250, 18, 1044057, LabelColor); // Success Chance: builder.AddHtmlLocalized(170, 80, 250, 18, 1044057, LabelColor); // Success Chance:
AddLabel(430, 80, LabelHue, $"{Math.Clamp(chance, 0, 1) * 100:F1}%"); builder.AddLabel(430, 80, LabelHue, $"{Math.Clamp(chance, 0, 1) * 100:F1}%");
if (m_ShowExceptionalChance) if (showExceptionalChance)
{ {
var exceptChance = Math.Clamp(m_CraftItem.GetExceptionalChance(m_CraftSystem, chance, m_From), 0, 1.0); var exceptChance = Math.Clamp(_craftItem.GetExceptionalChance(_craftSystem, chance, _from), 0, 1.0);
AddHtmlLocalized(170, 100, 250, 18, 1044058, 32767); // Exceptional Chance: builder.AddHtmlLocalized(170, 100, 250, 18, 1044058, 32767); // Exceptional Chance:
AddLabel(430, 100, LabelHue, $"{exceptChance * 100:F1}%"); builder.AddLabel(430, 100, LabelHue, $"{exceptChance * 100:F1}%");
} }
} }
public void DrawResource() public void DrawResource(ref DynamicGumpBuilder builder, ref int otherCount)
{ {
var retainedColor = false; var retainedColor = false;
var context = m_CraftSystem.GetContext(m_From); var context = _craftSystem.GetContext(_from);
var res = m_CraftItem.UseSubRes2 ? m_CraftSystem.CraftSubRes2 : m_CraftSystem.CraftSubRes; var res = _craftItem.UseSubRes2 ? _craftSystem.CraftSubRes2 : _craftSystem.CraftSubRes;
var resIndex = -1; var resIndex = -1;
if (context != null) if (context != null)
{ {
resIndex = m_CraftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex; resIndex = _craftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex;
} }
var cropScroll = m_CraftItem.Resources.Count > 1 var cropScroll = _craftItem.Resources.Count > 1
&& m_CraftItem.Resources[^1].ItemType == typeofBlankScroll && _craftItem.Resources[^1].ItemType == typeofBlankScroll
&& typeofSpellScroll.IsAssignableFrom(m_CraftItem.ItemType); && typeofSpellScroll.IsAssignableFrom(_craftItem.ItemType);
for (var i = 0; i < m_CraftItem.Resources.Count - (cropScroll ? 1 : 0) && i < 4; i++) for (var i = 0; i < _craftItem.Resources.Count - (cropScroll ? 1 : 0) && i < 4; i++)
{ {
var craftResource = m_CraftItem.Resources[i]; var craftResource = _craftItem.Resources[i];
var type = craftResource.ItemType; var type = craftResource.ItemType;
var nameString = craftResource.Name.String; var nameString = craftResource.Name.String;
@ -251,43 +258,43 @@ namespace Server.Engines.Craft
} }
// ****************** // ******************
if (!retainedColor && m_CraftItem.RetainsColorFrom(m_CraftSystem, type)) if (!retainedColor && _craftItem.RetainsColorFrom(_craftSystem, type))
{ {
retainedColor = true; retainedColor = true;
AddHtmlLocalized( builder.AddHtmlLocalized(
170, 170,
302 + m_OtherCount++ * 20, 302 + otherCount++ * 20,
310, 310,
18, 18,
1044152, // * The item retains the color of this material 1044152, // * The item retains the color of this material
LabelColor LabelColor
); );
AddLabel(500, 219 + i * 20, LabelHue, "*"); builder.AddLabel(500, 219 + i * 20, LabelHue, "*");
} }
if (nameNumber > 0) if (nameNumber > 0)
{ {
AddHtmlLocalized(170, 219 + i * 20, 310, 18, nameNumber, LabelColor); builder.AddHtmlLocalized(170, 219 + i * 20, 310, 18, nameNumber, LabelColor);
} }
else else
{ {
AddLabel(170, 219 + i * 20, LabelHue, nameString); builder.AddLabel(170, 219 + i * 20, LabelHue, nameString);
} }
AddLabel(430, 219 + i * 20, LabelHue, craftResource.Amount.ToString()); builder.AddLabel(430, 219 + i * 20, LabelHue, craftResource.Amount.ToString());
} }
if (m_CraftItem.NameNumber == 1041267) // runebook if (_craftItem.NameNumber == 1041267) // runebook
{ {
AddHtmlLocalized(170, 219 + m_CraftItem.Resources.Count * 20, 310, 18, 1044447, LabelColor); builder.AddHtmlLocalized(170, 219 + _craftItem.Resources.Count * 20, 310, 18, 1044447, LabelColor);
AddLabel(430, 219 + m_CraftItem.Resources.Count * 20, LabelHue, "1"); builder.AddLabel(430, 219 + _craftItem.Resources.Count * 20, LabelHue, "1");
} }
if (cropScroll) if (cropScroll)
{ {
AddHtmlLocalized( builder.AddHtmlLocalized(
170, 170,
302 + m_OtherCount++ * 20, 302 + otherCount++ * 20,
360, 360,
18, 18,
1044379, // Inscribing scrolls also requires a blank scroll and mana. 1044379, // Inscribing scrolls also requires a blank scroll and mana.
@ -298,30 +305,32 @@ namespace Server.Engines.Craft
public override void OnResponse(NetState sender, in RelayInfo info) public override void OnResponse(NetState sender, in RelayInfo info)
{ {
var from = sender.Mobile;
// Back Button // Back Button
if (info.ButtonID == 0) if (info.ButtonID == 0)
{ {
var craftGump = new CraftGump(m_From, m_CraftSystem, m_Tool, null); var craftGump = new CraftGump(from, _craftSystem, _tool, null);
m_From.SendGump(craftGump); from.SendGump(craftGump);
} }
else // Make Button else // Make Button
{ {
var num = m_CraftSystem.CanCraft(m_From, m_Tool, m_CraftItem.ItemType); var num = _craftSystem.CanCraft(from, _tool, _craftItem.ItemType);
if (num > 0) if (num > 0)
{ {
m_From.SendGump(new CraftGump(m_From, m_CraftSystem, m_Tool, num)); from.SendGump(new CraftGump(from, _craftSystem, _tool, num));
} }
else else
{ {
Type type = null; Type type = null;
var context = m_CraftSystem.GetContext(m_From); var context = _craftSystem.GetContext(from);
if (context != null) if (context != null)
{ {
var res = m_CraftItem.UseSubRes2 ? m_CraftSystem.CraftSubRes2 : m_CraftSystem.CraftSubRes; var res = _craftItem.UseSubRes2 ? _craftSystem.CraftSubRes2 : _craftSystem.CraftSubRes;
var resIndex = m_CraftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex; var resIndex = _craftItem.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex;
if (resIndex > -1) if (resIndex > -1)
{ {
@ -329,8 +338,7 @@ namespace Server.Engines.Craft
} }
} }
m_CraftSystem.CreateItem(m_From, m_CraftItem.ItemType, type, m_Tool, m_CraftItem); _craftSystem.CreateItem(from, _craftItem.ItemType, type, _tool, _craftItem);
}
} }
} }
} }

View file

@ -1400,7 +1400,6 @@ namespace Server.Engines.Craft
m_From.SendGump( m_From.SendGump(
new QueryMakersMarkGump( new QueryMakersMarkGump(
quality, quality,
m_From,
m_CraftItem, m_CraftItem,
m_CraftSystem, m_CraftSystem,
m_TypeRes, m_TypeRes,

View file

@ -3,59 +3,58 @@ using Server.Gumps;
using Server.Items; using Server.Items;
using Server.Network; using Server.Network;
namespace Server.Engines.Craft namespace Server.Engines.Craft;
public class QueryMakersMarkGump : StaticGump<QueryMakersMarkGump>
{ {
public class QueryMakersMarkGump : Gump private readonly CraftItem _craftItem;
{ private readonly CraftSystem _craftSystem;
private readonly CraftItem m_CraftItem; private readonly int _quality;
private readonly CraftSystem m_CraftSystem; private readonly BaseTool _tool;
private readonly Mobile m_From; private readonly Type _typeRes;
private readonly int m_Quality;
private readonly BaseTool m_Tool;
private readonly Type m_TypeRes;
public override bool Singleton => true; public override bool Singleton => true;
public QueryMakersMarkGump( public QueryMakersMarkGump(int quality, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool)
int quality, Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, : base(100, 200)
BaseTool tool
) : base(100, 200)
{ {
m_Quality = quality; _quality = quality;
m_From = from; _craftItem = craftItem;
m_CraftItem = craftItem; _craftSystem = craftSystem;
m_CraftSystem = craftSystem; _typeRes = typeRes;
m_TypeRes = typeRes; _tool = tool;
m_Tool = tool; }
AddPage(0); protected override void BuildLayout(ref StaticGumpBuilder builder)
{
builder.AddPage();
AddBackground(0, 0, 220, 170, 5054); builder.AddBackground(0, 0, 220, 170, 5054);
AddBackground(10, 10, 200, 150, 3000); builder.AddBackground(10, 10, 200, 150, 3000);
AddHtmlLocalized(20, 20, 180, 80, 1018317); // Do you wish to place your maker's mark on this item? builder.AddHtmlLocalized(20, 20, 180, 80, 1018317); // Do you wish to place your maker's mark on this item?
AddHtmlLocalized(55, 100, 140, 25, 1011011); // CONTINUE builder.AddHtmlLocalized(55, 100, 140, 25, 1011011); // CONTINUE
AddButton(20, 100, 4005, 4007, 1); builder.AddButton(20, 100, 4005, 4007, 1);
AddHtmlLocalized(55, 125, 140, 25, 1011012); // CANCEL builder.AddHtmlLocalized(55, 125, 140, 25, 1011012); // CANCEL
AddButton(20, 125, 4005, 4007, 0); builder.AddButton(20, 125, 4005, 4007, 0);
} }
public override void OnResponse(NetState sender, in RelayInfo info) public override void OnResponse(NetState sender, in RelayInfo info)
{ {
var from = sender.Mobile;
var makersMark = info.ButtonID == 1; var makersMark = info.ButtonID == 1;
if (makersMark) if (makersMark)
{ {
m_From.SendLocalizedMessage(501808); // You mark the item. from.SendLocalizedMessage(501808); // You mark the item.
} }
else else
{ {
m_From.SendLocalizedMessage(501809); // Cancelled mark. from.SendLocalizedMessage(501809); // Cancelled mark.
} }
m_CraftItem.CompleteCraft(m_Quality, makersMark, m_From, m_CraftSystem, m_TypeRes, m_Tool, null); _craftItem.CompleteCraft(_quality, makersMark, from, _craftSystem, _typeRes, _tool, null);
}
} }
} }