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

Removes literal variables (#257)

Browse source
This commit is contained in:
Kamron Batman 2020-09-18 18:41:26 -07:00 • committed by GitHub
parent 580da8a0cc
commit 4d6e584b6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
359 changed files with 1306 additions and 1306 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Projects/UOContent/Engines/Party/Party.cs
View file

@ -154,15 +154,15 @@ namespace Server.Engines.PartySystem
if (m == from)
{
p.SendPublicMessage(@from, "I killed myself !!");
p.SendPublicMessage(from, "I killed myself !!");
}
else if (m == null)
{
p.SendPublicMessage(@from, "I was killed !!");
p.SendPublicMessage(from, "I was killed !!");
}
else
{
p.SendPublicMessage(@from, $"I was killed by {m.Name} !!");
p.SendPublicMessage(from, $"I was killed by {m.Name} !!");
}
}
}
@ -173,11 +173,11 @@ namespace Server.Engines.PartySystem
if (p != null)
{
new RejoinTimer(@from).Start();
new RejoinTimer(from).Start();
}
else
{
@from.Party = null;
from.Party = null;
}
}
@ -348,7 +348,7 @@ namespace Server.Engines.PartySystem
if (p == null)
{
@from.Party = p = new Party(@from);
from.Party = p = new Party(from);
}
if (!p.Candidates.Contains(target))
@ -405,7 +405,7 @@ namespace Server.Engines.PartySystem
if (mob.Party != this)
{
m_Listeners[i].SendMessage("[{0}]: {1}", @from.Name, text);
m_Listeners[i].SendMessage("[{0}]: {1}", from.Name, text);
}
}
@ -422,7 +422,7 @@ namespace Server.Engines.PartySystem
if (mob.Party != this)
{
m_Listeners[i].SendMessage("[{0}]->[{1}]: {2}", @from.Name, to.Name, text);
m_Listeners[i].SendMessage("[{0}]->[{1}]: {2}", from.Name, to.Name, text);
}
}
@ -444,13 +444,13 @@ namespace Server.Engines.PartySystem
{
p = Packet.Acquire(
new UnicodeMessage(
@from.Serial,
@from.Body,
from.Serial,
from.Body,
MessageType.Regular,
@from.SpeechHue,
from.SpeechHue,
3,
@from.Language,
@from.Name,
from.Language,
from.Name,
text
)
);

26
Projects/UOContent/Engines/Party/PartyCommands.cs
View file

@ -13,15 +13,15 @@ namespace Server.Engines.PartySystem
if (p != null && p.Leader != from)
{
@from.SendLocalizedMessage(1005453); // You may only add members to the party if you are the leader.
from.SendLocalizedMessage(1005453); // You may only add members to the party if you are the leader.
}
else if (p != null && p.Members.Count + p.Candidates.Count >= Party.Capacity)
{
@from.SendLocalizedMessage(1008095); // You may only have 10 in your party (this includes candidates).
from.SendLocalizedMessage(1008095); // You may only have 10 in your party (this includes candidates).
}
else
{
@from.Target = new AddPartyTarget(@from);
from.Target = new AddPartyTarget(from);
}
}
@ -57,11 +57,11 @@ namespace Server.Engines.PartySystem
if (p?.Contains(target) == true)
{
p.SendPrivateMessage(@from, target, text);
p.SendPrivateMessage(from, target, text);
}
else
{
@from.SendLocalizedMessage(3000211); // You are not in a party.
from.SendLocalizedMessage(3000211); // You are not in a party.
}
}
@ -76,11 +76,11 @@ namespace Server.Engines.PartySystem
if (p != null)
{
p.SendPublicMessage(@from, text);
p.SendPublicMessage(from, text);
}
else
{
@from.SendLocalizedMessage(3000211); // You are not in a party.
from.SendLocalizedMessage(3000211); // You are not in a party.
}
}
@ -102,11 +102,11 @@ namespace Server.Engines.PartySystem
if (canLoot)
{
@from.SendLocalizedMessage(1005447); // You have chosen to allow your party to loot your corpse.
from.SendLocalizedMessage(1005447); // You have chosen to allow your party to loot your corpse.
}
else
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1005448
); // You have chosen to prevent your party from looting your corpse.
}
@ -123,11 +123,11 @@ namespace Server.Engines.PartySystem
if (leader == null || p?.Candidates.Contains(from) != true)
{
@from.SendLocalizedMessage(3000222); // No one has invited you to be in a party.
from.SendLocalizedMessage(3000222); // No one has invited you to be in a party.
}
else if (p.Members.Count + p.Candidates.Count <= Party.Capacity)
{
p.OnAccept(@from);
p.OnAccept(from);
}
}
@ -140,11 +140,11 @@ namespace Server.Engines.PartySystem
if (leader == null || p?.Candidates.Contains(from) != true)
{
@from.SendLocalizedMessage(3000222); // No one has invited you to be in a party.
from.SendLocalizedMessage(3000222); // No one has invited you to be in a party.
}
else
{
p.OnDecline(@from, leader);
p.OnDecline(from, leader);
}
}
}

2
Projects/UOContent/Engines/Party/RemovePartyTarget.cs
View file

@ -21,7 +21,7 @@ namespace Server.Engines.PartySystem
if (from == m)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1005446
); // You may only remove yourself from a party if you are not the leader.
}