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

4
Projects/UOContent/Items/Addons/AddonComponent.cs
View file

@ -204,11 +204,11 @@ namespace Server.Items
{
if (Addon != null && from.InRange(GetWorldLocation(), 3))
{
Addon.OnChop(@from);
Addon.OnChop(from);
}
else
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
}

6
Projects/UOContent/Items/Addons/AddonContainerComponent.cs
View file

@ -46,11 +46,11 @@ namespace Server.Items
{
if (Addon != null && from.InRange(GetWorldLocation(), 3))
{
Addon.OnChop(@from);
Addon.OnChop(from);
}
else
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
}
@ -58,7 +58,7 @@ namespace Server.Items
{
if (Addon != null)
{
return Addon.OnDragDrop(@from, dropped);
return Addon.OnDragDrop(from, dropped);
}
return false;

16
Projects/UOContent/Items/Addons/ArcheryButteAddon.cs
View file

@ -48,11 +48,11 @@ namespace Server.Items
{
if ((Arrows > 0 || Bolts > 0) && from.InRange(GetWorldLocation(), 1))
{
Gather(@from);
Gather(from);
}
else
{
Fire(@from);
Fire(from);
}
}
@ -62,12 +62,12 @@ namespace Server.Items
if (Arrows > 0)
{
@from.AddToBackpack(new Arrow(Arrows));
from.AddToBackpack(new Arrow(Arrows));
}
if (Bolts > 0)
{
@from.AddToBackpack(new Bolt(Bolts));
from.AddToBackpack(new Bolt(Bolts));
}
Arrows = 0;
@ -85,7 +85,7 @@ namespace Server.Items
if (!m_Entries.TryGetValue(from, out var e))
{
m_Entries[@from] = e = new ScoreEntry();
m_Entries[from] = e = new ScoreEntry();
}
return e;
@ -153,7 +153,7 @@ namespace Server.Items
{
if (isArrow)
{
@from.LocalOverheadMessage(
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
500594
@ -161,7 +161,7 @@ namespace Server.Items
}
else if (isBolt)
{
@from.LocalOverheadMessage(
from.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
500595
@ -169,7 +169,7 @@ namespace Server.Items
}
else
{
SendLocalizedMessageTo(@from, 500593); // You must practice with ranged weapons on this.
SendLocalizedMessageTo(from, 500593); // You must practice with ranged weapons on this.
}
return;

14
Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs
View file

@ -89,11 +89,11 @@ namespace Server.Items
{
if (IsChildOf(from.Backpack))
{
@from.Target = new InternalTarget(this);
from.Target = new InternalTarget(this);
}
else
{
@from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used.
from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used.
}
}
@ -145,23 +145,23 @@ namespace Server.Items
}
else if (res == AddonFitResult.Blocked)
{
@from.SendLocalizedMessage(500269); // You cannot build that there.
from.SendLocalizedMessage(500269); // You cannot build that there.
}
else if (res == AddonFitResult.NotInHouse)
{
@from.SendLocalizedMessage(500274); // You can only place this in a house that you own!
from.SendLocalizedMessage(500274); // You can only place this in a house that you own!
}
else if (res == AddonFitResult.DoorsNotClosed)
{
@from.SendMessage("You must close all house doors before placing this.");
from.SendMessage("You must close all house doors before placing this.");
}
else if (res == AddonFitResult.DoorTooClose)
{
@from.SendLocalizedMessage(500271); // You cannot build near the door.
from.SendLocalizedMessage(500271); // You cannot build near the door.
}
else if (res == AddonFitResult.NoWall)
{
@from.SendLocalizedMessage(500268); // This object needs to be mounted on something.
from.SendLocalizedMessage(500268); // This object needs to be mounted on something.
}
if (res == AddonFitResult.Valid)

12
Projects/UOContent/Items/Addons/BaseAddonDeed.cs
View file

@ -64,11 +64,11 @@ namespace Server.Items
{
if (IsChildOf(from.Backpack))
{
@from.Target = new InternalTarget(this);
from.Target = new InternalTarget(this);
}
else
{
@from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
@ -109,19 +109,19 @@ namespace Server.Items
}
else if (res == AddonFitResult.Blocked)
{
@from.SendLocalizedMessage(500269); // You cannot build that there.
from.SendLocalizedMessage(500269); // You cannot build that there.
}
else if (res == AddonFitResult.NotInHouse)
{
@from.SendLocalizedMessage(500274); // You can only place this in a house that you own!
from.SendLocalizedMessage(500274); // You can only place this in a house that you own!
}
else if (res == AddonFitResult.DoorTooClose)
{
@from.SendLocalizedMessage(500271); // You cannot build near the door.
from.SendLocalizedMessage(500271); // You cannot build near the door.
}
else if (res == AddonFitResult.NoWall)
{
@from.SendLocalizedMessage(500268); // This object needs to be mounted on something.
from.SendLocalizedMessage(500268); // This object needs to be mounted on something.
}
if (res == AddonFitResult.Valid)

6
Projects/UOContent/Items/Addons/DartBoard.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
Direction dir;
if (from.Location != Location)
{
dir = @from.GetDirectionTo(this);
dir = from.GetDirectionTo(this);
}
else if (East)
{
@ -53,11 +53,11 @@ namespace Server.Items
if (canThrow)
{
Throw(@from);
Throw(from);
}
else
{
@from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
}

6
Projects/UOContent/Items/Addons/FlourMillEastAddon.cs
View file

@ -162,15 +162,15 @@ namespace Server.Items
{
if (!from.InRange(GetWorldLocation(), 4) || !from.InLOS(this))
{
@from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
else if (!IsFull)
{
@from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour.
from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour.
}
else
{
StartWorking(@from);
StartWorking(from);
}
}

6
Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs
View file

@ -151,15 +151,15 @@ namespace Server.Items
{
if (!from.InRange(GetWorldLocation(), 4) || !from.InLOS(this))
{
@from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
else if (!IsFull)
{
@from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour.
from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour.
}
else
{
StartWorking(@from);
StartWorking(from);
}
}

10
Projects/UOContent/Items/Addons/PickpocketDips.cs
View file

@ -76,26 +76,26 @@ namespace Server.Items
{
if (!from.InRange(GetWorldLocation(), 1))
{
SendLocalizedMessageTo(@from, 501816); // You are too far away to do that.
SendLocalizedMessageTo(from, 501816); // You are too far away to do that.
}
else if (Swinging)
{
SendLocalizedMessageTo(@from, 501815); // You have to wait until it stops swinging.
SendLocalizedMessageTo(from, 501815); // You have to wait until it stops swinging.
}
else if (from.Skills.Stealing.Base >= MaxSkill)
{
SendLocalizedMessageTo(
@from,
from,
501830
); // Your ability to steal cannot improve any further by simply practicing on a dummy.
}
else if (from.Mounted)
{
SendLocalizedMessageTo(@from, 501829); // You can't practice on this while on a mount.
SendLocalizedMessageTo(from, 501829); // You can't practice on this while on a mount.
}
else
{
Use(@from);
Use(from);
}
}

12
Projects/UOContent/Items/Addons/TrainingDummies.cs
View file

@ -73,30 +73,30 @@ namespace Server.Items
if (weapon is BaseRanged)
{
SendLocalizedMessageTo(@from, 501822); // You can't practice ranged weapons on this.
SendLocalizedMessageTo(from, 501822); // You can't practice ranged weapons on this.
}
else if (weapon == null || !from.InRange(GetWorldLocation(), weapon.MaxRange))
{
SendLocalizedMessageTo(@from, 501816); // You are too far away to do that.
SendLocalizedMessageTo(from, 501816); // You are too far away to do that.
}
else if (Swinging)
{
SendLocalizedMessageTo(@from, 501815); // You have to wait until it stops swinging.
SendLocalizedMessageTo(from, 501815); // You have to wait until it stops swinging.
}
else if (from.Skills[weapon.Skill].Base >= MaxSkill)
{
SendLocalizedMessageTo(
@from,
from,
501828
); // Your skill cannot improve any further by simply practicing with a dummy.
}
else if (from.Mounted)
{
SendLocalizedMessageTo(@from, 501829); // You can't practice on this while on a mount.
SendLocalizedMessageTo(from, 501829); // You can't practice on this while on a mount.
}
else
{
Use(@from, weapon);
Use(from, weapon);
}
}