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

Cleans up comments for localization (#260)

Browse source
This commit is contained in:
Kamron Batman 2020-09-20 12:48:10 -07:00 • committed by GitHub
parent fd9ec089f7
commit 13e2693b59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 751 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/UOContent/Engines/Factions/Core/Election.cs
View file

@ -182,9 +182,8 @@ namespace Server.Factions
{
if (Candidates.Count == 1)
{
Faction.Broadcast(
1038031
); // There are no longer any valid candidates in the Faction Commander election.
// There are no longer any valid candidates in the Faction Commander election.
Faction.Broadcast(1038031);
var winner = Candidates[0];
@ -206,9 +205,8 @@ namespace Server.Factions
}
else if (Candidates.Count == 0) // well, I guess this'll never happen
{
Faction.Broadcast(
1038031
); // There are no longer any valid candidates in the Faction Commander election.
// There are no longer any valid candidates in the Faction Commander election.
Faction.Broadcast(1038031);
Candidates.Clear();
State = ElectionState.Pending;

92
Projects/UOContent/Engines/Factions/Core/Faction.cs
View file

@ -436,9 +436,9 @@ namespace Server.Factions
if (mob.Young)
{
guild.RemoveMember(mob);
mob.SendLocalizedMessage(
1042283
); // You have been kicked out of your guild! Young players may not remain in a guild which is allied with a faction.
// You have been kicked out of your guild!
// Young players may not remain in a guild which is allied with a faction.
mob.SendLocalizedMessage(1042283);
}
else if (AlreadyHasCharInFaction(mob))
{
@ -453,7 +453,8 @@ namespace Server.Factions
else
{
AddMember(mob);
mob.SendLocalizedMessage(1042756, true, $" {m_Definition.FriendlyName}"); // You are now joining a faction:
// You are now joining a faction:
mob.SendLocalizedMessage(1042756, true, $" {m_Definition.FriendlyName}");
}
}
@ -506,15 +507,13 @@ namespace Server.Factions
}
else if (pl?.IsLeaving == true)
{
pm.SendLocalizedMessage(
1005051
); // You cannot use the faction stone until you have finished quitting your current faction
// You cannot use the faction stone until you have finished quitting your current faction
pm.SendLocalizedMessage(1005051);
}
else if (AlreadyHasCharInFaction(pm))
{
pm.SendLocalizedMessage(
1005059
); // You cannot join a faction because you already declared your allegiance with another character
// You cannot join a faction because you already declared your allegiance with another character
pm.SendLocalizedMessage(1005059);
}
else if (IsFactionBanned(mob))
{
@ -526,15 +525,13 @@ namespace Server.Factions
if (guild?.Leader != pm)
{
pm.SendLocalizedMessage(
1005057
); // You cannot join a faction because you are in a guild and not the guildmaster
// You cannot join a faction because you are in a guild and not the guildmaster
pm.SendLocalizedMessage(1005057);
}
else if (guild.Type != GuildType.Regular)
{
pm.SendLocalizedMessage(
1042161
); // You cannot join a faction because your guild is an Order or Chaos type.
// You cannot join a faction because your guild is an Order or Chaos type.
pm.SendLocalizedMessage(1042161);
}
else if (!Guild.NewGuildSystem && guild.Enemies?.Count > 0) // CAN join w/wars in new system
{
@ -542,15 +539,13 @@ namespace Server.Factions
}
else if (Guild.NewGuildSystem && guild.Alliance != null)
{
pm.SendLocalizedMessage(
1080454
); // Your guild cannot join a faction while in alliance with non-factioned guilds.
// Your guild cannot join a faction while in alliance with non-factioned guilds.
pm.SendLocalizedMessage(1080454);
}
else if (!CanHandleInflux(guild.Members.Count))
{
pm.SendLocalizedMessage(
1018031
); // In the interest of faction stability, this faction declines to accept new members for now.
// In the interest of faction stability, this faction declines to accept new members for now.
pm.SendLocalizedMessage(1018031);
}
else
{
@ -569,9 +564,8 @@ namespace Server.Factions
}
else if (!CanHandleInflux(1))
{
pm.SendLocalizedMessage(
1018031
); // In the interest of faction stability, this faction declines to accept new members for now.
// In the interest of faction stability, this faction declines to accept new members for now.
pm.SendLocalizedMessage(1018031);
}
else
{
@ -579,15 +573,7 @@ namespace Server.Factions
}
}
public bool IsCommander(Mobile mob)
{
if (mob == null)
{
return false;
}
return mob.AccessLevel >= AccessLevel.GameMaster || mob == Commander;
}
public bool IsCommander(Mobile mob) => mob != null && mob.AccessLevel >= AccessLevel.GameMaster || mob == Commander;
public override string ToString() => m_Definition.FriendlyName;
@ -1059,14 +1045,14 @@ namespace Server.Factions
else if (Sigil.ExistsOn(killer))
{
sigil.ReturnHome();
killer?.SendLocalizedMessage(
1010258
); // The sigil has gone back to its home location because you already have a sigil.
// The sigil has gone back to its home location because you already have a sigil.
killer?.SendLocalizedMessage(1010258);
}
else if (!killerPack.TryDropItem(killer, sigil, false))
{
sigil.ReturnHome();
killer?.SendLocalizedMessage(1010259); // The sigil has gone home because your backpack is full.
// The sigil has gone home because your backpack is full.
killer?.SendLocalizedMessage(1010259);
}
}
);
@ -1086,10 +1072,8 @@ namespace Server.Factions
if (silver > 0)
{
killer?.SendLocalizedMessage(
1042748,
silver.ToString("N0")
); // Thou hast earned ~1_AMOUNT~ silver for vanquishing the vile creature.
// Thou hast earned ~1_AMOUNT~ silver for vanquishing the vile creature.
killer?.SendLocalizedMessage(1042748, silver.ToString("N0"));
}
}
@ -1179,10 +1163,8 @@ namespace Server.Factions
if (silver > 0)
{
killer?.SendLocalizedMessage(
1042736,
$"{silver:N0} silver\t{victim.Name}"
); // You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
// You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
killer?.SendLocalizedMessage(1042736, $"{silver:N0} silver\t{victim.Name}");
}
}
@ -1193,14 +1175,11 @@ namespace Server.Factions
var args = $"{award}\t{victim.Name}\t{killer?.Name}";
killer?.SendLocalizedMessage(
1042737 + offset,
args
); // Thou hast been honored with ~1_KILL_POINTS~ kill point(s) for vanquishing ~2_DEAD_PLAYER~!
victim.SendLocalizedMessage(
1042738 + offset,
args
); // Thou has lost ~1_KILL_POINTS~ kill point(s) to ~3_ATTACKER_NAME~ for being vanquished!
// Thou hast been honored with ~1_KILL_POINTS~ kill point(s) for vanquishing ~2_DEAD_PLAYER~!
killer?.SendLocalizedMessage(1042737 + offset, args);
// Thou has lost ~1_KILL_POINTS~ kill point(s) to ~3_ATTACKER_NAME~ for being vanquished!
victim.SendLocalizedMessage(1042738 + offset, args);
var killerEPL = Player.Find(killer);
var victimEPL = Player.Find(victim);
@ -1227,9 +1206,8 @@ namespace Server.Factions
}
else
{
killer?.SendLocalizedMessage(
1042231
); // You have recently defeated this enemy and thus their death brings you no honor.
// You have recently defeated this enemy and thus their death brings you no honor.
killer?.SendLocalizedMessage(1042231);
}
}
}

22
Projects/UOContent/Engines/Factions/Core/Keywords.cs
View file

@ -18,7 +18,7 @@ namespace Server.Factions
pl.Mobile.SpeechHue,
true,
pl.KillPoints.ToString("N0")
); // NOTE: Added 'N0'
);
}
private static void EventSink_Speech(SpeechEventArgs e)
@ -133,22 +133,19 @@ namespace Server.Factions
}
else if (remaining.TotalHours >= 1)
{
from.SendLocalizedMessage(
1042741,
remaining.TotalHours
.ToString("N0")
); // Your term of service will come to an end in ~1_HOURS~ hours.
// Your term of service will come to an end in ~1_HOURS~ hours.
from.SendLocalizedMessage(1042741, remaining.TotalHours.ToString("N0"));
}
else
{
from.SendLocalizedMessage(
1042742
); // Your term of service will come to an end in less than one hour.
// Your term of service will come to an end in less than one hour.
from.SendLocalizedMessage(1042742);
}
}
else if (pl != null)
{
from.SendLocalizedMessage(1042233); // You are not in the process of quitting the faction.
// You are not in the process of quitting the faction.
from.SendLocalizedMessage(1042233);
}
break;
@ -164,9 +161,8 @@ namespace Server.Factions
if (from.AccessLevel == AccessLevel.Player && !faction.FactionMessageReady)
{
from.SendLocalizedMessage(
1010264
); // The required time has not yet passed since the last message was sent
// The required time has not yet passed since the last message was sent
from.SendLocalizedMessage(1010264);
}
else
{

33
Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -213,33 +213,28 @@ namespace Server.Factions
if (remaining.TotalMinutes < 4)
{
m_From.SendLocalizedMessage(
1042165
); // You must wait a short while before changing prices again.
// You must wait a short while before changing prices again.
m_From.SendLocalizedMessage(1042165);
}
else if (remaining.TotalMinutes < 10)
{
m_From.SendLocalizedMessage(
1042166
); // You must wait several minutes before changing prices again.
// You must wait several minutes before changing prices again.
m_From.SendLocalizedMessage(1042166);
}
else if (remaining.TotalHours < 1)
{
m_From.SendLocalizedMessage(
1042167
); // You must wait up to an hour before changing prices again.
// You must wait up to an hour before changing prices again.
m_From.SendLocalizedMessage(1042167);
}
else if (remaining.TotalHours < 4)
{
m_From.SendLocalizedMessage(
1042168
); // You must wait a few hours before changing prices again.
// You must wait a few hours before changing prices again.
m_From.SendLocalizedMessage(1042168);
}
else
{
m_From.SendLocalizedMessage(
1042169
); // You must wait several hours before changing prices again.
// You must wait several hours before changing prices again.
m_From.SendLocalizedMessage(1042169);
}
}
else
@ -268,13 +263,13 @@ namespace Server.Factions
if (Town.FromRegion(m_From.Region) != m_Town)
{
m_From.SendLocalizedMessage(1010305); // You must be in your controlled city to buy Items
// You must be in your controlled city to buy Items
m_From.SendLocalizedMessage(1010305);
}
else if (vendorList.Vendors.Count >= vendorList.Definition.Maximum)
{
m_From.SendLocalizedMessage(
1010306
); // You currently have too many of this enhancement type to place another
// You currently have too many of this enhancement type to place another
m_From.SendLocalizedMessage(1010306);
}
else if (BaseBoat.FindBoatAt(m_From.Location, m_From.Map) != null)
{

15
Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs
View file

@ -26,14 +26,15 @@ namespace Server.Factions
15,
230,
60,
1018057,
1018057, // Are you sure you want your entire guild to leave this faction?
true,
true
); // Are you sure you want your entire guild to leave this faction?
);
}
else
{
AddHtmlLocalized(20, 15, 230, 60, 1018063, true, true); // Are you sure you want to leave this faction?
// Are you sure you want to leave this faction?s
AddHtmlLocalized(20, 15, 230, 60, 1018063, true, true);
}
AddHtmlLocalized(55, 80, 75, 20, 1011011); // CONTINUE
@ -72,9 +73,8 @@ namespace Server.Factions
}
else if (guild.Leader != m_From)
{
m_From.SendLocalizedMessage(
1005061
); // You cannot quit the faction because you are not the guild master
// You cannot quit the faction because you are not the guild master
m_From.SendLocalizedMessage(1005061);
}
else
{
@ -91,7 +91,8 @@ namespace Server.Factions
if (TimeSpan.FromDays(3.0) == Faction.LeavePeriod)
{
mob.SendLocalizedMessage(1005060); // Your guild will quit the faction in 3 days
// Your guild will quit the faction in 3 days
mob.SendLocalizedMessage(1005060);
}
else
{

5
Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs
View file

@ -142,9 +142,8 @@ namespace Server.Factions
}
else if (guardList.Guards.Count >= guardList.Definition.Maximum)
{
m_From.SendLocalizedMessage(
1010306
); // You currently have too many of this enhancement type to place another
// You currently have too many of this enhancement type to place another
m_From.SendLocalizedMessage(1010306);
}
else if (BaseBoat.FindBoatAt(m_From.Location, m_From.Map) != null)
{

24
Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs
View file

@ -54,9 +54,8 @@ namespace Server.Factions
{
if (m_Town.Sheriff != null)
{
m_From.SendLocalizedMessage(
1010342
); // You must fire your Sheriff before you can elect a new one
// You must fire your Sheriff before you can elect a new one
m_From.SendLocalizedMessage(1010342);
}
else
{
@ -70,9 +69,8 @@ namespace Server.Factions
{
if (m_Town.Finance != null)
{
m_From.SendLocalizedMessage(
1010345
); // You must fire your finance minister before you can elect a new one
// You must fire your finance minister before you can elect a new one
m_From.SendLocalizedMessage(1010345);
}
else
{
@ -86,7 +84,8 @@ namespace Server.Factions
{
if (m_Town.Sheriff == null)
{
m_From.SendLocalizedMessage(1010350); // You need to elect a sheriff before you can fire one
// You need to elect a sheriff before you can fire one
m_From.SendLocalizedMessage(1010350);
}
else
{
@ -101,9 +100,8 @@ namespace Server.Factions
{
if (m_Town.Finance == null)
{
m_From.SendLocalizedMessage(
1010352
); // You need to elect a financial minister before you can fire one
// You need to elect a financial minister before you can fire one
m_From.SendLocalizedMessage(1010352);
}
else
{
@ -147,7 +145,8 @@ namespace Server.Factions
}
else if (pl.Sheriff != null || pl.Finance != null)
{
from.SendLocalizedMessage(1005245); // You must pick someone who does not already hold a city post
// You must pick someone who does not already hold a city post
from.SendLocalizedMessage(1005245);
}
else
{
@ -190,7 +189,8 @@ namespace Server.Factions
}
else if (pl.Sheriff != null || pl.Finance != null)
{
from.SendLocalizedMessage(1005245); // You must pick someone who does not already hold a city post
// You must pick someone who does not already hold a city post
from.SendLocalizedMessage(1005245);
}
else
{

5
Projects/UOContent/Engines/Factions/Items/FactionStone.cs
View file

@ -57,9 +57,8 @@ namespace Server.Factions
if (pl?.IsLeaving == true)
{
mobile.SendLocalizedMessage(
1005051
); // You cannot use the faction stone until you have finished quitting your current faction
// You cannot use the faction stone until you have finished quitting your current faction
mobile.SendLocalizedMessage(1005051);
}
else
{

5
Projects/UOContent/Engines/Factions/Items/Power Faction Items/BloodRose.cs
View file

@ -37,9 +37,8 @@ namespace Server
return true;
}
from.SendLocalizedMessage(
1062927
); // You have eaten one of these recently and eating another would provide no benefit.
// You have eaten one of these recently and eating another would provide no benefit.
from.SendLocalizedMessage(1062927);
return false;
}

5
Projects/UOContent/Engines/Factions/Items/Sigil.cs
View file

@ -373,9 +373,8 @@ namespace Server.Factions
}
else if (m_Corrupted == null || m_Corrupted != Faction.Find(from))
{
from.SendLocalizedMessage(
1042244
); // Your faction did not corrupt this sigil. Take it to your stronghold.
// Your faction did not corrupt this sigil. Take it to your stronghold.
from.SendLocalizedMessage(1042244);
}
else
{

6
Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -101,10 +101,8 @@ namespace Server.Factions
}
else
{
Placer.SendLocalizedMessage(
1042736,
$"{silverGiven} silver\t{from.Name}"
); // You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
// You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
Placer.SendLocalizedMessage(1042736, $"{silverGiven} silver\t{from.Name}");
}
}

5
Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs
View file

@ -79,9 +79,8 @@ namespace Server.Factions
}
else if (pl.Rank.Rank < 2)
{
from.SendLocalizedMessage(
1010368
); // You must achieve a faction rank of at least two before riding a war horse!
// You must achieve a faction rank of at least two before riding a war horse!
from.SendLocalizedMessage(1010368);
}
else
{

4
Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs
View file

@ -40,9 +40,9 @@ namespace Server.Factions
PrivateOverheadMessage(
MessageType.Regular,
0x3B2,
1042201,
1042201, // You are not in my faction, I cannot sell you a horse!
from.NetState
); // You are not in my faction, I cannot sell you a horse!
);
}
else if (FactionGump.Exists(from))
{