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

2
Projects/UOContent/Engines/ConPVP/Arena.cs
View file

@ -45,7 +45,7 @@ namespace Server.Engines.ConPVP
{
if (from.AccessLevel >= AccessLevel.GameMaster)
{
@from.SendGump(new PropertiesGump(@from, Arena));
from.SendGump(new PropertiesGump(from, Arena));
}
}

18
Projects/UOContent/Engines/ConPVP/DuelContext.cs
View file

@ -174,7 +174,7 @@ namespace Server.Engines.ConPVP
if (spell is RecallSpell)
{
@from.SendMessage("You may not cast this spell.");
from.SendMessage("You may not cast this spell.");
}
string title;
@ -295,7 +295,7 @@ namespace Server.Engines.ConPVP
if (message)
{
@from.SendMessage("The dueling ruleset prevents you from using this combat ability.");
from.SendMessage("The dueling ruleset prevents you from using this combat ability.");
}
return false;
@ -414,7 +414,7 @@ namespace Server.Engines.ConPVP
if (!(item is BaseRefreshPotion))
{
if (CantDoAnything(@from))
if (CantDoAnything(from))
{
return false;
}
@ -700,7 +700,7 @@ namespace Server.Engines.ConPVP
if (killer?.Player == true)
{
killer.AddToBackpack(new Head(m_Tournament == null ? HeadType.Duel : HeadType.Tournament, @from.Name));
killer.AddToBackpack(new Head(m_Tournament == null ? HeadType.Duel : HeadType.Tournament, from.Name));
}
}
@ -708,11 +708,11 @@ namespace Server.Engines.ConPVP
if (didntFit)
{
@from.SendLocalizedMessage(1062472); // You gather some of your belongings. The rest remain on the corpse.
from.SendLocalizedMessage(1062472); // You gather some of your belongings. The rest remain on the corpse.
}
else
{
@from.SendLocalizedMessage(1062471); // You quickly gather all of your belongings.
from.SendLocalizedMessage(1062471); // You quickly gather all of your belongings.
}
}
@ -1290,7 +1290,7 @@ namespace Server.Engines.ConPVP
if (entry != null)
{
@from.SendGump(new PropertiesGump(@from, entry));
from.SendGump(new PropertiesGump(from, entry));
}
}
}
@ -1364,7 +1364,7 @@ namespace Server.Engines.ConPVP
mob.SpeechHue,
false,
"I'm not a duelist, and quite frankly, I resent the implication.",
@from.NetState
from.NetState
);
}
else
@ -1374,7 +1374,7 @@ namespace Server.Engines.ConPVP
0x3B2,
true,
"It's probably better than you.",
@from.NetState
from.NetState
);
}
}

6
Projects/UOContent/Engines/ConPVP/Games/CTF.cs
View file

@ -499,7 +499,7 @@ namespace Server.Engines.ConPVP
if (passTo == from)
{
@from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them.");
from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them.");
}
else if (passTeam == useTeam && passTo.PlaceInBackpack(this))
{
@ -507,12 +507,12 @@ namespace Server.Engines.ConPVP
MessageType.Regular,
0x59,
false,
$"{@from.Name} has passed you the cookies!"
$"{from.Name} has passed you the cookies!"
);
}
else
{
@from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them.");
from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them.");
}
}
}

2
Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -1198,7 +1198,7 @@ namespace Server.Engines.ConPVP
if (team != null && team != TeamOwner)
{
m_Game.Dominate(this, @from, team);
m_Game.Dominate(this, from, team);
}
}

2
Projects/UOContent/Engines/ConPVP/Games/EventGame.cs
View file

@ -40,7 +40,7 @@ namespace Server.Engines.ConPVP
{
if (from.AccessLevel >= AccessLevel.GameMaster)
{
@from.SendGump(new PropertiesGump(@from, this));
from.SendGump(new PropertiesGump(from, this));
}
}
}

6
Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs
View file

@ -55,7 +55,7 @@ namespace Server.Engines.ConPVP
if (!from.Hidden || from.AccessLevel == AccessLevel.Player)
{
Effects.PlaySound(@from.Location, @from.Map, 0x20E);
Effects.PlaySound(from.Location, from.Map, 0x20E);
}
return true;
@ -65,11 +65,11 @@ namespace Server.Engines.ConPVP
{
if (from.InRange(GetWorldLocation(), 1))
{
UseGate(@from);
UseGate(from);
}
else
{
@from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that
}
}

20
Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs
View file

@ -337,7 +337,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
"Excuse me? You are already signed up.",
@from.NetState
from.NetState
);
}
else
@ -347,7 +347,7 @@ namespace Server.Engines.ConPVP
0x22,
false,
"The tournament has already begun. You are too late to signup now.",
@from.NetState
from.NetState
);
}
}
@ -401,7 +401,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
"You have not yet proven yourself a worthy dueler.",
@from.NetState
from.NetState
);
}
else
@ -411,7 +411,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
$"{mob.Name} has not yet proven themselves a worthy dueler.",
@from.NetState
from.NetState
);
}
}
@ -445,7 +445,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
"You have already entered this tournament.",
@from.NetState
from.NetState
);
}
else
@ -455,7 +455,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
$"{mob.Name} has already entered this tournament.",
@from.NetState
from.NetState
);
}
}
@ -473,7 +473,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
"You are already assigned to a duel. You must yield it before joining this tournament.",
@from.NetState
from.NetState
);
}
else
@ -483,7 +483,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
$"{mobile.Name} is already assigned to a duel. They must yield it before joining this tournament.",
@from.NetState
from.NetState
);
}
@ -583,11 +583,11 @@ namespace Server.Engines.ConPVP
if (mob.Body.IsHuman)
{
mob.SayTo(@from, 1005443); // Nay, I would rather stay here and watch a nail rust.
mob.SayTo(from, 1005443); // Nay, I would rather stay here and watch a nail rust.
}
else
{
mob.SayTo(@from, 1005444); // The creature ignores your offer.
mob.SayTo(from, 1005444); // The creature ignores your offer.
}
}
else if (AcceptDuelGump.IsIgnored(mob, from) || mob.Blessed)

6
Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs
View file

@ -153,7 +153,7 @@ namespace Server.Engines.ConPVP
AddImage( 22, y + 5, 0x2616, 0x96C );
AddImage( 20, y + 7, 0x2616, 0x96C );
AddImage( 22, y + 7, 0x2616, 0x96C );
AddImage( 21, y + 6, 0x2616, 0x454 );*/
AddImage(x + 3, y + 4, 0x805);
@ -227,11 +227,11 @@ namespace Server.Engines.ConPVP
if (info.ButtonID == 1 && m_Page > 0)
{
@from.SendGump(new LadderGump(m_Ladder, m_Page - 1));
from.SendGump(new LadderGump(m_Ladder, m_Page - 1));
}
else if (info.ButtonID == 2 && (m_Page + 1) * 15 < Math.Min(m_List.Count, 150))
{
@from.SendGump(new LadderGump(m_Ladder, m_Page + 1));
from.SendGump(new LadderGump(m_Ladder, m_Page + 1));
}
}

18
Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs
View file

@ -129,7 +129,7 @@ namespace Server.Engines.ConPVP
else if (Context.Participants.Count > 2)
{
/*Container cont = m_Participant.Stakes;
if (cont != null)
cont.Delete();*/
@ -145,20 +145,20 @@ namespace Server.Engines.ConPVP
/*else if (bid == 4)
{
m_From.SendGump( new ParticipantGump( m_From, m_Context, m_Participant ) );
Container cont = m_Participant.Stakes;
if (cont != null && !cont.Deleted)
{
cont.DisplayTo( m_From );
Item[] checks = cont.FindItemsByType( typeof( BankCheck ) );
int gold = cont.TotalGold;
for ( int i = 0; i < checks.Length; ++i )
gold += ((BankCheck)checks[i]).Worth;
m_From.SendMessage( "This container has {0} item{1} and {2} stone{3}. In gold or check form there is a total of {4:D}gp.", cont.TotalItems, cont.TotalItems==1?"":"s", cont.TotalWeight, cont.TotalWeight==1?"":"s", gold );
}
}*/
@ -225,11 +225,11 @@ namespace Server.Engines.ConPVP
{
if (mob.Body.IsHuman)
{
mob.SayTo(@from, 1005443); // Nay, I would rather stay here and watch a nail rust.
mob.SayTo(from, 1005443); // Nay, I would rather stay here and watch a nail rust.
}
else
{
mob.SayTo(@from, 1005444); // The creature ignores your offer.
mob.SayTo(from, 1005444); // The creature ignores your offer.
}
}
else if (AcceptDuelGump.IsIgnored(mob, from) || mob.Blessed)

4
Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs
View file

@ -55,7 +55,7 @@ namespace Server.Engines.ConPVP
0x35,
false,
"Excuse me? You are already signed up.",
@from.NetState
from.NetState
);
}
else
@ -65,7 +65,7 @@ namespace Server.Engines.ConPVP
0x22,
false,
"The tournament has already begun. You are too late to signup now.",
@from.NetState
from.NetState
);
}
}

6
Projects/UOContent/Engines/ConPVP/Trophy.cs
View file

@ -92,16 +92,16 @@ namespace Server.Items
if (Owner != null)
{
LabelTo(@from, "{0} -- {1}", Title, Owner.RawName);
LabelTo(from, "{0} -- {1}", Title, Owner.RawName);
}
else if (Title != null)
{
LabelTo(@from, Title);
LabelTo(from, Title);
}
if (Date != DateTime.MinValue)
{
LabelTo(@from, Date.ToString("d"));
LabelTo(from, Date.ToString("d"));
}
}