## Summary Phase 3 PR B of the message-interpolation cleanup. Handles the multi-line restructure sites flagged in `dev-docs/string-handling-message-interp-audit.md` (Phase 2). Phase 3.1 (PR #2436) handled trivial sweeps; this PR handles sites that needed an `if/else` hoist or switch restructure to eliminate `string.Format` while preserving exact message text. Each site previously allocated an intermediate `string.Format(...)` result before passing to the message handler, despite Phase 1 making the handler accept interpolated string handlers natively. ## Sites fixed - **`Projects/Server/Mobiles/Mobile.cs:7911`** - Title/guild header was using `string.Format` with a conditional template (`"[{1}]{2}"` vs `"[{0}, {1}]{2}"`). Split into `if (title.Length <= 0)` / `else` with direct `$"..."` interpolation. - **`Projects/UOContent/Engines/ConPVP/DuelContext.cs:1337`** - View-ladder rank text used `string.Format(text, from == pm ? "You" : "They")`. Split into `if (from == pm)` / `else` with direct `$"..."` interpolation in each branch. - **`Projects/UOContent/Engines/ConPVP/DuelContext.cs:1463`** - Showladder text reused a single format string for both `LocalOverheadMessage` ("You ... are ...") and `NonlocalOverheadMessage` ("`{pm.Name}` ... is ..."). Each call now uses an inline `$"..."` directly; no shared template. - **`Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs:518`** - The signup confirmation message used a `switch` expression assigning a literal format string to `fmt`, then `string.Format(fmt, from.Female ? "Lady" : "Lord", timeUntil)`. Converted to a `switch` statement where each case calls `_registrar.PrivateOverheadMessage(...)` directly with an inline `$"..."`. Lady/Lord branching is hoisted to a `title` local. ## Exempted - **`Projects/UOContent/Engines/ConPVP/Participant.cs:138`** - The `nonLocalOverhead` format string is a parameter passed in by callers of `Participant.Broadcast`. Investigation found 5 call sites in `DuelContext.cs` (lines 782, 802, 1187, 1196, and three at 1535/1564/1608) that pass distinct literal format strings. Refactoring would require changing all 5 callers and the method signature - out of scope for this PR. Marked with a `// Phase 3 audit:` comment per the audit's exemption convention.
285 lines
7 KiB
C#
285 lines
7 KiB
C#
using System;
|
|
using Server.Mobiles;
|
|
using Server.Text;
|
|
|
|
namespace Server.Engines.ConPVP
|
|
{
|
|
public class Participant
|
|
{
|
|
public Participant(DuelContext context, int count)
|
|
{
|
|
Context = context;
|
|
// m_Stakes = new StakesContainer( context, this );
|
|
Resize(count);
|
|
}
|
|
|
|
public int Count => Players.Length;
|
|
public DuelPlayer[] Players { get; private set; }
|
|
|
|
public DuelContext Context { get; }
|
|
|
|
public TourneyParticipant TourneyPart { get; set; }
|
|
|
|
public int FilledSlots
|
|
{
|
|
get
|
|
{
|
|
var count = 0;
|
|
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i] != null)
|
|
{
|
|
++count;
|
|
}
|
|
}
|
|
|
|
return count;
|
|
}
|
|
}
|
|
|
|
public bool HasOpenSlot
|
|
{
|
|
get
|
|
{
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i] == null)
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public bool Eliminated
|
|
{
|
|
get
|
|
{
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i]?.Eliminated == false)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public string NameList
|
|
{
|
|
get
|
|
{
|
|
using var sb = ValueStringBuilder.Create(256);
|
|
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i] == null)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
var mob = Players[i].Mobile;
|
|
|
|
if (sb.Length > 0)
|
|
{
|
|
sb.Append(", ");
|
|
}
|
|
|
|
sb.Append(mob.Name);
|
|
}
|
|
|
|
return sb.Length == 0 ? "Empty" : sb.ToString();
|
|
}
|
|
}
|
|
|
|
public DuelPlayer Find(Mobile mob)
|
|
{
|
|
if (mob is PlayerMobile pm)
|
|
{
|
|
if (pm.DuelContext == Context && pm.DuelPlayer.Participant == this)
|
|
{
|
|
return pm.DuelPlayer;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i]?.Mobile == mob)
|
|
{
|
|
return Players[i];
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
public bool Contains(Mobile mob) => Find(mob) != null;
|
|
|
|
public void Broadcast(int hue, string message, string nonLocalOverhead, string localOverhead)
|
|
{
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i] != null)
|
|
{
|
|
if (message != null)
|
|
{
|
|
Players[i].Mobile.SendMessage(hue, message);
|
|
}
|
|
|
|
if (nonLocalOverhead != null)
|
|
{
|
|
// Phase 3 audit: Format string passed by caller; restructuring requires changing all callers — out of scope for this PR.
|
|
Players[i]
|
|
.Mobile.NonlocalOverheadMessage(
|
|
MessageType.Regular,
|
|
hue,
|
|
false,
|
|
string.Format(
|
|
nonLocalOverhead,
|
|
Players[i].Mobile.Name,
|
|
Players[i].Mobile.Female ? "her" : "his"
|
|
)
|
|
);
|
|
}
|
|
|
|
if (localOverhead != null)
|
|
{
|
|
Players[i].Mobile.LocalOverheadMessage(MessageType.Regular, hue, false, localOverhead);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Nullify(DuelPlayer player)
|
|
{
|
|
if (player == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var index = Array.IndexOf(Players, player);
|
|
|
|
if (index == -1)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Players[index] = null;
|
|
}
|
|
|
|
public void Remove(DuelPlayer player)
|
|
{
|
|
if (player == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var index = Array.IndexOf(Players, player);
|
|
|
|
if (index == -1)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var old = Players;
|
|
Players = new DuelPlayer[old.Length - 1];
|
|
|
|
for (var i = 0; i < index; ++i)
|
|
{
|
|
Players[i] = old[i];
|
|
}
|
|
|
|
for (var i = index + 1; i < old.Length; ++i)
|
|
{
|
|
Players[i - 1] = old[i];
|
|
}
|
|
}
|
|
|
|
public void Remove(Mobile player)
|
|
{
|
|
Remove(Find(player));
|
|
}
|
|
|
|
public void Add(Mobile player)
|
|
{
|
|
if (Contains(player))
|
|
{
|
|
return;
|
|
}
|
|
|
|
for (var i = 0; i < Players.Length; ++i)
|
|
{
|
|
if (Players[i] == null)
|
|
{
|
|
Players[i] = new DuelPlayer(player, this);
|
|
return;
|
|
}
|
|
}
|
|
|
|
Resize(Players.Length + 1);
|
|
Players[^1] = new DuelPlayer(player, this);
|
|
}
|
|
|
|
public void Resize(int count)
|
|
{
|
|
var old = Players;
|
|
Players = new DuelPlayer[count];
|
|
|
|
if (old != null)
|
|
{
|
|
var ct = 0;
|
|
|
|
for (var i = 0; i < old.Length; ++i)
|
|
{
|
|
if (old[i] != null && ct < count)
|
|
{
|
|
Players[ct++] = old[i];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public class DuelPlayer
|
|
{
|
|
private bool m_Eliminated;
|
|
|
|
public DuelPlayer(Mobile mob, Participant p)
|
|
{
|
|
Mobile = mob;
|
|
Participant = p;
|
|
|
|
if (mob is PlayerMobile mobile)
|
|
{
|
|
mobile.DuelPlayer = this;
|
|
}
|
|
}
|
|
|
|
public Mobile Mobile { get; }
|
|
|
|
public bool Ready { get; set; }
|
|
|
|
public bool Eliminated
|
|
{
|
|
get => m_Eliminated;
|
|
set
|
|
{
|
|
m_Eliminated = value;
|
|
if (Participant.Context.m_Tournament != null && m_Eliminated)
|
|
{
|
|
Participant.Context.m_Tournament.OnEliminated(this);
|
|
Mobile.SendEverything();
|
|
}
|
|
}
|
|
}
|
|
|
|
public Participant Participant { get; set; }
|
|
}
|
|
}
|