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

fix: Fixes considering sins for all eras (#2373)

Browse source
This commit is contained in:
Kamron Batman 2026-03-15 01:55:41 -07:00 • committed by GitHub
parent af35c25ca2
commit 6f8e9b9aec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Projects/UOContent/Engines/Player Murder System/PlayerMurderSystem.cs
View file

@ -222,47 +222,53 @@ public class PlayerMurderSystem : GenericPersistence
}
}
internal static void ReportKillsToSelf(PlayerMobile player)
public static void ReportKillsToSelf(PlayerMobile player)
{
if (Core.Expansion == Expansion.None)
if (Core.SA)
{
return; // no consider sins in pre-t2a
player.SendLocalizedMessage(1114370, $"{player.ShortTermMurders}\t{player.Kills}");
}
else if (Core.Expansion is Expansion.T2A)
else if (Core.SE)
{
if (player.ShortTermMurders >= 5)
{
player.SendLocalizedMessage(502126, "", 0x022); // If thou should return to the land of the living, the innocent shall wreak havoc upon thy soul
}
else if (PingPongEnabled && player.Murderer)
{
player.SendLocalizedMessage(502123, "", 0x022); // Thou art known throughout the land as a murderous brigand.
}
else if (player.ShortTermMurders > 0)
{
player.SendLocalizedMessage(502125, "", 0x59); // Although thou hast slain the innocent, thy deeds shall not bring retribution upon thy return to the living
}
else if (player.Kills > 0)
{
player.SendLocalizedMessage(502124, "", 0x59); // Fear not, thou hast not slain the innocent in some time...
}
else // no kills
{
player.SendLocalizedMessage(502122, "", 0x59); // Fear not, thou hast not slain the innocent.
}
player.SendMessage($"Short Term Murders: {player.ShortTermMurders} Long Term Murders: {player.Kills}");
}
else if (!Core.SE)
else if (Core.AOS)
{
player.SendMessage($"Short Term Murders : {player.ShortTermMurders}");
player.SendMessage($"Long Term Murders : {player.Kills}");
player.SendMessage($"Short Term Murders: {player.ShortTermMurders}");
player.SendMessage($"Long Term Murders: {player.Kills}");
if (PingPongEnabled)
{
player.SendMessage($"Ping Pongs: {player.PingPong}");
}
}
else
else if (!Core.T2A)
{
player.SendLocalizedMessage(1114370, $"{player.ShortTermMurders}\t{player.Kills}");
// No "i must consider my sins" before t2a
}
else if (PingPongEnabled && player.Murderer)
{
// Thou art known throughout the land as a murderous brigand.
player.SendLocalizedMessage(502123, "", player.ShortTermMurders >= 5 ? 0x22 : 0x59);
}
else if (player.ShortTermMurders >= 5)
{
// If thou should return to the land of the living, the innocent shall wreak havoc upon thy soul
player.SendLocalizedMessage(502126, "", 0x22);
}
else if (player.ShortTermMurders > 0)
{
// Although thou hast slain the innocent, thy deeds shall not bring retribution upon thy return to the living
player.SendLocalizedMessage(502125, "", 0x59);
}
else if (player.Kills > 0)
{
// Fear not, thou hast not slain the innocent in some time...
player.SendLocalizedMessage(502124, "", 0x59);
}
else // no kills
{
// Fear not, thou hast not slain the innocent.
player.SendLocalizedMessage(502122, "", 0x59);
}
}