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

fix: Converts ResurrectGump to Static/Dynamic Gumps (#1904)

Browse source
This commit is contained in:
Guyute 2024-08-06 22:17:33 -04:00 • committed by GitHub
parent 808e721e3d
commit 9014f3d4dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 294 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
View file

@ -35,7 +35,7 @@ public sealed partial class UrnOfAscension : PowerFactionItem
{
Faction.ClearSkillLoss(mob);
mob.SendGump(new ResurrectGump(mob, from));
mob.SendGump(new ResurrectGump(from));
used = true;
}
}

2
Projects/UOContent/Engines/Virtues/Sacrifice.cs
View file

@ -75,7 +75,7 @@ public static class SacrificeVirtue
* Sacrifice and cancel to have items in their backpack for free.
*/
from.CloseGump<ResurrectGump>();
from.SendGump(new ResurrectGump(from, true));
from.SendGump(new ResurrectGump(from, fromSacrifice: true));
}
else
{

144
Projects/UOContent/Gumps/PricedResurrectGump.cs Normal file
View file

@ -0,0 +1,144 @@
using Server.Engines.Virtues;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
namespace Server.Gumps;
public class PricedResurrectGump : StaticGump<PricedResurrectGump>
{
private readonly Mobile _healer;
private readonly int _price;
public PricedResurrectGump(Mobile healer, int price) : base(150, 50)
{
_healer = healer;
_price = price;
}
protected override void BuildLayout(ref StaticGumpBuilder builder)
{
builder.SetNoClose();
builder.AddPage();
builder.AddImage(0, 0, 3600);
builder.AddImageTiled(0, 14, 15, 200, 3603);
builder.AddImageTiled(380, 14, 14, 200, 3605);
builder.AddImage(0, 201, 3606);
builder.AddImageTiled(15, 201, 370, 16, 3607);
builder.AddImageTiled(15, 0, 370, 16, 3601);
builder.AddImage(380, 0, 3602);
builder.AddImage(380, 201, 3608);
builder.AddImageTiled(15, 15, 365, 190, 2624);
builder.AddRadio(30, 140, 9727, 9730, true, 1);
builder.AddHtmlLocalized(65, 145, 300, 25, 1060015, 0x7FFF); // Grudgingly pay the money
builder.AddRadio(30, 175, 9727, 9730, false, 0);
builder.AddHtmlLocalized(65, 178, 300, 25, 1060016, 0x7FFF); // I'd rather stay dead, you scoundrel!!!
// Wishing to rejoin the living, are you? I can restore your body... for a price of course...
builder.AddHtmlLocalized(30, 20, 360, 35, 1060017, 0x7FFF);
// Do you accept the fee, which will be withdrawn from your bank?
builder.AddHtmlLocalized(30, 105, 345, 40, 1060018, 0x5B2D);
builder.AddImage(65, 72, 5605);
builder.AddImageTiled(80, 90, 200, 1, 9107);
builder.AddImageTiled(95, 92, 200, 1, 9157);
builder.AddLabelPlaceholder(90, 70, 1645, "resurrectionPrice");
builder.AddHtmlLocalized(140, 70, 100, 25, 1023823, 0x7FFF); // gold coins
builder.AddButton(290, 175, 247, 248, 2);
builder.AddImageTiled(15, 14, 365, 1, 9107);
builder.AddImageTiled(380, 14, 1, 190, 9105);
builder.AddImageTiled(15, 205, 365, 1, 9107);
builder.AddImageTiled(15, 14, 1, 190, 9105);
builder.AddImageTiled(0, 0, 395, 1, 9157);
builder.AddImageTiled(394, 0, 1, 217, 9155);
builder.AddImageTiled(0, 216, 395, 1, 9157);
builder.AddImageTiled(0, 0, 1, 217, 9155);
}
protected override void BuildStrings(ref GumpStringsBuilder builder)
{
builder.SetStringSlot("resurrectionPrice", $"{_price}");
}
public override void OnResponse(NetState state, in RelayInfo info)
{
if (info.ButtonID is not 1 and not 2)
{
return;
}
var from = state.Mobile;
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
{
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
return;
}
if (!info.IsSwitched(1))
{
from.SendLocalizedMessage(1060019); // You decide against paying the healer, and thus remain dead.
return;
}
if (Banker.Withdraw(from, _price))
{
// ~1_AMOUNT~ gold has been withdrawn from your bank box.
from.SendLocalizedMessage(1060398, _price.ToString());
// You have ~1_AMOUNT~ gold in cash remaining in your bank box.
from.SendLocalizedMessage(1060022, Banker.GetBalance(from).ToString());
}
else
{
// Unfortunately, you do not have enough cash in your bank to cover the cost of the healing.
from.SendLocalizedMessage(1060020);
return;
}
from.PlaySound(0x214);
from.FixedEffect(0x376A, 10, 16);
from.Resurrect();
if (_healer != null && from != _healer)
{
var level = VirtueSystem.GetLevel(_healer, VirtueName.Compassion);
from.Hits = level switch
{
VirtueLevel.Seeker => AOS.Scale(from.HitsMax, 20),
VirtueLevel.Follower => AOS.Scale(from.HitsMax, 40),
VirtueLevel.Knight => AOS.Scale(from.HitsMax, 80),
_ => from.Hits
};
}
if (from.Fame > 0)
{
var amount = from.Fame / 10;
Titles.AwardFame(from, -amount, true);
}
if (from is PlayerMobile player)
{
ResurrectGump.TryGiveStatLoss(player);
}
}
}

343
Projects/UOContent/Gumps/ResurrectGump.cs
View file

@ -1,191 +1,139 @@
using System.Collections.Generic;
using System;
using Server.Engines.Virtues;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
namespace Server.Gumps
namespace Server.Gumps;
public enum ResurrectMessage
{
public enum ResurrectMessage
ChaosShrine = 0,
VirtueShrine = 1,
Healer = 2,
Generic = 3
}
public class ResurrectGump : DynamicGump
{
public const int ShortMurdersForStatLoss = 5;
private readonly bool _fromSacrifice;
private readonly Mobile _healer;
private readonly double _hitsScalar;
private readonly ResurrectMessage _resurrectMessage;
public static void TryGiveStatLoss(PlayerMobile player)
{
ChaosShrine = 0,
VirtueShrine = 1,
Healer = 2,
Generic = 3
if (Core.AOS || player.ShortTermMurders < ShortMurdersForStatLoss)
{
return;
}
var loss = Math.Clamp((100.0 - (4.0 + player.ShortTermMurders / (double)ShortMurdersForStatLoss)) / 100.0, 0.85, 0.95); // 5 to 15% loss
var lossStr = (int)(player.RawStr * loss);
var lossInt = (int)(player.RawInt * loss);
var lossDex = (int)(player.RawDex * loss);
if (lossStr >= 10)
{
player.RawStr = lossStr;
}
if (lossInt >= 10)
{
player.RawInt = lossInt;
}
if (lossDex >= 10)
{
player.RawDex = lossDex;
}
for (var s = 0; s < player.Skills.Length; s++)
{
var skill = player.Skills[s];
var skillLoss = (int)(skill.BaseFixedPoint * loss);
if (skillLoss >= 350)
{
skill.BaseFixedPoint = skillLoss;
}
}
}
public class ResurrectGump : Gump
public ResurrectGump(Mobile healer, double hitsScalar)
: this(healer, ResurrectMessage.Generic, false, hitsScalar)
{
private readonly bool m_FromSacrifice;
private readonly Mobile m_Healer;
private readonly double m_HitsScalar;
private readonly int m_Price;
}
public ResurrectGump(Mobile owner, double hitsScalar)
: this(owner, owner, ResurrectMessage.Generic, false, hitsScalar)
public ResurrectGump(
Mobile healer, ResurrectMessage msg = ResurrectMessage.Generic,
bool fromSacrifice = false, double hitsScalar = 0.0
) : base(100, 0)
{
_healer = healer;
_fromSacrifice = fromSacrifice;
_hitsScalar = hitsScalar;
_resurrectMessage = msg;
}
protected override void BuildLayout(ref DynamicGumpBuilder builder)
{
builder.AddPage();
builder.AddBackground(0, 0, 400, 350, 2600);
builder.AddHtmlLocalized(0, 20, 400, 35, 1011022); // <center>Resurrection</center>
/* It is possible for you to be resurrected here by this healer. Do you wish to try?<br>
* CONTINUE - You chose to try to come back to life now.<br>
* CANCEL - You prefer to remain a ghost for now.
*/
builder.AddHtmlLocalized(50, 55, 300, 140, 1011023 + (int)_resurrectMessage, true, true);
builder.AddButton(200, 227, 4005, 4007, 0);
builder.AddHtmlLocalized(235, 230, 110, 35, 1011012); // CANCEL
builder.AddButton(65, 227, 4005, 4007, 1);
builder.AddHtmlLocalized(100, 230, 110, 35, 1011011); // CONTINUE
}
public override void OnResponse(NetState state, in RelayInfo info)
{
if (info.ButtonID is not 1 and not 2)
{
return;
}
public ResurrectGump(Mobile owner, ResurrectMessage msg) : this(owner, owner, msg)
var from = state.Mobile;
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
{
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
return;
}
public ResurrectGump(Mobile owner, bool fromSacrifice = false)
: this(owner, owner, ResurrectMessage.Generic, fromSacrifice)
from.PlaySound(0x214);
from.FixedEffect(0x376A, 10, 16);
from.Resurrect();
if (_healer != null && from != _healer)
{
}
var level = VirtueSystem.GetLevel(_healer, VirtueName.Compassion);
public ResurrectGump(
Mobile owner, Mobile healer, ResurrectMessage msg = ResurrectMessage.Generic,
bool fromSacrifice = false, double hitsScalar = 0.0
)
: base(100, 0)
{
m_Healer = healer;
m_FromSacrifice = fromSacrifice;
m_HitsScalar = hitsScalar;
AddPage(0);
AddBackground(0, 0, 400, 350, 2600);
AddHtmlLocalized(0, 20, 400, 35, 1011022); // <center>Resurrection</center>
/* It is possible for you to be resurrected here by this healer. Do you wish to try?<br>
* CONTINUE - You chose to try to come back to life now.<br>
* CANCEL - You prefer to remain a ghost for now.
*/
AddHtmlLocalized(50, 55, 300, 140, 1011023 + (int)msg, true, true);
AddButton(200, 227, 4005, 4007, 0);
AddHtmlLocalized(235, 230, 110, 35, 1011012); // CANCEL
AddButton(65, 227, 4005, 4007, 1);
AddHtmlLocalized(100, 230, 110, 35, 1011011); // CONTINUE
}
public ResurrectGump(Mobile owner, Mobile healer, int price)
: base(150, 50)
{
m_Healer = healer;
m_Price = price;
Closable = false;
AddPage(0);
AddImage(0, 0, 3600);
AddImageTiled(0, 14, 15, 200, 3603);
AddImageTiled(380, 14, 14, 200, 3605);
AddImage(0, 201, 3606);
AddImageTiled(15, 201, 370, 16, 3607);
AddImageTiled(15, 0, 370, 16, 3601);
AddImage(380, 0, 3602);
AddImage(380, 201, 3608);
AddImageTiled(15, 15, 365, 190, 2624);
AddRadio(30, 140, 9727, 9730, true, 1);
AddHtmlLocalized(65, 145, 300, 25, 1060015, 0x7FFF); // Grudgingly pay the money
AddRadio(30, 175, 9727, 9730, false, 0);
AddHtmlLocalized(65, 178, 300, 25, 1060016, 0x7FFF); // I'd rather stay dead, you scoundrel!!!
// Wishing to rejoin the living, are you? I can restore your body... for a price of course...
AddHtmlLocalized(30, 20, 360, 35, 1060017, 0x7FFF);
// Do you accept the fee, which will be withdrawn from your bank?
AddHtmlLocalized(30, 105, 345, 40, 1060018, 0x5B2D);
AddImage(65, 72, 5605);
AddImageTiled(80, 90, 200, 1, 9107);
AddImageTiled(95, 92, 200, 1, 9157);
AddLabel(90, 70, 1645, price.ToString());
AddHtmlLocalized(140, 70, 100, 25, 1023823, 0x7FFF); // gold coins
AddButton(290, 175, 247, 248, 2);
AddImageTiled(15, 14, 365, 1, 9107);
AddImageTiled(380, 14, 1, 190, 9105);
AddImageTiled(15, 205, 365, 1, 9107);
AddImageTiled(15, 14, 1, 190, 9105);
AddImageTiled(0, 0, 395, 1, 9157);
AddImageTiled(394, 0, 1, 217, 9155);
AddImageTiled(0, 216, 395, 1, 9157);
AddImageTiled(0, 0, 1, 217, 9155);
}
public override void OnResponse(NetState state, in RelayInfo info)
{
var from = state.Mobile;
from.CloseGump<ResurrectGump>();
if (info.ButtonID != 1 && info.ButtonID != 2)
from.Hits = level switch
{
return;
}
VirtueLevel.Seeker => AOS.Scale(from.HitsMax, 20),
VirtueLevel.Follower => AOS.Scale(from.HitsMax, 40),
VirtueLevel.Knight => AOS.Scale(from.HitsMax, 80),
_ => from.Hits
};
}
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
{
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
return;
}
if (m_Price > 0)
{
if (info.IsSwitched(1))
{
if (Banker.Withdraw(from, m_Price))
{
// ~1_AMOUNT~ gold has been withdrawn from your bank box.
from.SendLocalizedMessage(1060398, m_Price.ToString());
// You have ~1_AMOUNT~ gold in cash remaining in your bank box.
from.SendLocalizedMessage(1060022, Banker.GetBalance(from).ToString());
}
else
{
// Unfortunately, you do not have enough cash in your bank to cover the cost of the healing.
from.SendLocalizedMessage(1060020);
return;
}
}
else
{
from.SendLocalizedMessage(1060019); // You decide against paying the healer, and thus remain dead.
return;
}
}
from.PlaySound(0x214);
from.FixedEffect(0x376A, 10, 16);
from.Resurrect();
if (m_Healer != null && from != m_Healer)
{
var level = VirtueSystem.GetLevel(m_Healer, VirtueName.Compassion);
from.Hits = level switch
{
VirtueLevel.Seeker => AOS.Scale(from.HitsMax, 20),
VirtueLevel.Follower => AOS.Scale(from.HitsMax, 40),
VirtueLevel.Knight => AOS.Scale(from.HitsMax, 80),
_ => from.Hits
};
}
var player = from as PlayerMobile;
if (m_FromSacrifice && player != null)
if (from is PlayerMobile player)
{
if (_fromSacrifice)
{
player.Virtues.AvailableResurrects -= 1;
@ -194,11 +142,9 @@ namespace Server.Gumps
if (pack != null && corpse != null)
{
var items = new List<Item>(corpse.Items);
for (var i = 0; i < items.Count; ++i)
for (var i = corpse.Items.Count - 1; i >= 0; --i)
{
var item = items[i];
var item = corpse.Items[i];
if (item.Layer != Layer.Hair && item.Layer != Layer.FacialHair && item.Movable)
{
@ -208,54 +154,19 @@ namespace Server.Gumps
}
}
if (from.Fame > 0)
{
var amount = from.Fame / 10;
TryGiveStatLoss(player);
}
Titles.AwardFame(from, -amount, true);
}
if (from.Fame > 0)
{
var amount = from.Fame / 10;
if (!Core.AOS && player?.ShortTermMurders >= 5)
{
var loss = (100.0 - (4.0 + player.ShortTermMurders / 5.0)) / 100.0; // 5 to 15% loss
Titles.AwardFame(from, -amount, true);
}
if (loss < 0.85)
{
loss = 0.85;
}
else if (loss > 0.95)
{
loss = 0.95;
}
if (from.RawStr * loss > 10)
{
from.RawStr = (int)(from.RawStr * loss);
}
if (from.RawInt * loss > 10)
{
from.RawInt = (int)(from.RawInt * loss);
}
if (from.RawDex * loss > 10)
{
from.RawDex = (int)(from.RawDex * loss);
}
for (var s = 0; s < from.Skills.Length; s++)
{
if (from.Skills[s].Base * loss > 35)
{
from.Skills[s].Base *= loss;
}
}
}
if (from.Alive && m_HitsScalar > 0)
{
from.Hits = (int)(from.HitsMax * m_HitsScalar);
}
if (from.Alive && _hitsScalar > 0)
{
from.Hits = (int)(from.HitsMax * _hitsScalar);
}
}
}

2
Projects/UOContent/Items/Skill Items/Misc/Bandage.cs
View file

@ -311,7 +311,7 @@ public class BandageContext : Timer
else
{
Patient.CloseGump<ResurrectGump>();
Patient.SendGump(new ResurrectGump(Patient, Healer));
Patient.SendGump(new ResurrectGump(Healer));
}
}
else if (Patient.Poisoned)

30
Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs
View file

@ -83,29 +83,31 @@ public partial class AnkhOfSacrificeComponent : AddonComponent
private class AnkhResurrectGump : ResurrectGump
{
public AnkhResurrectGump(Mobile owner, ResurrectMessage msg) : base(owner, owner, msg)
public AnkhResurrectGump(Mobile owner, ResurrectMessage msg) : base(owner, msg)
{
}
public override void OnResponse(NetState state, in RelayInfo info)
{
if (info.ButtonID is not 1 and not 2)
{
return;
}
var from = state.Mobile;
if (info.ButtonID is 1 or 2)
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
{
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
{
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
return;
}
if (from is PlayerMobile mobile)
{
mobile.AnkhNextUse = Core.Now + TimeSpan.FromHours(1);
}
base.OnResponse(state, info);
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
return;
}
if (from is PlayerMobile mobile)
{
mobile.AnkhNextUse = Core.Now + TimeSpan.FromHours(1);
}
base.OnResponse(state, info);
}
}
}

4
Projects/UOContent/Mobiles/Healers/PricedHealer.cs
View file

@ -36,8 +36,8 @@ public partial class PricedHealer : BaseHealer
m.PlaySound(0x214);
m.FixedEffect(0x376A, 10, 16);
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, this, Price));
m.CloseGump<PricedResurrectGump>();
m.SendGump(new PricedResurrectGump(this, Price));
}
public override bool CheckResurrect(Mobile m) => true;

2
Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs
View file

@ -75,7 +75,7 @@ namespace Server.Spells.Chivalry
{
m.FixedParticles(0x375A, 1, 15, 5005, 5, 3, EffectLayer.Head);
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, Caster));
m.SendGump(new ResurrectGump(Caster));
sacrifice = true;
}
}

2
Projects/UOContent/Spells/Eighth/Resurrection.cs
View file

@ -62,7 +62,7 @@ namespace Server.Spells.Eighth
m.FixedEffect(0x376A, 10, 16);
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, Caster));
m.SendGump(new ResurrectGump(Caster));
}
}