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/Skills/Anatomy.cs
View file

@ -110,7 +110,7 @@ namespace Server.SkillHandlers
MessageType.Regular,
0x3B2,
1038303 + stmMod,
@from.NetState
from.NetState
); // That being is at [10,20,...] percent endurance.
}
}

2
Projects/UOContent/Skills/AnimalTaming.cs
View file

@ -107,7 +107,7 @@ namespace Server.SkillHandlers
{
if (m_SetSkillTime)
{
@from.NextSkillTime = Core.TickCount;
from.NextSkillTime = Core.TickCount;
}
}

12
Projects/UOContent/Skills/ArmsLore.cs
View file

@ -56,28 +56,28 @@ namespace Server.SkillHandlers
if (type == WeaponType.Ranged)
{
@from.SendLocalizedMessage(1038224 + damage * 9);
from.SendLocalizedMessage(1038224 + damage * 9);
}
else if (type == WeaponType.Piercing)
{
@from.SendLocalizedMessage(1038218 + hand + damage * 9);
from.SendLocalizedMessage(1038218 + hand + damage * 9);
}
else if (type == WeaponType.Slashing)
{
@from.SendLocalizedMessage(1038220 + hand + damage * 9);
from.SendLocalizedMessage(1038220 + hand + damage * 9);
}
else if (type == WeaponType.Bashing)
{
@from.SendLocalizedMessage(1038222 + hand + damage * 9);
from.SendLocalizedMessage(1038222 + hand + damage * 9);
}
else
{
@from.SendLocalizedMessage(1038216 + hand + damage * 9);
from.SendLocalizedMessage(1038216 + hand + damage * 9);
}
if (weap.Poison != null && weap.PoisonCharges > 0)
{
@from.SendLocalizedMessage(1038284); // It appears to have poison smeared on it.
from.SendLocalizedMessage(1038284); // It appears to have poison smeared on it.
}
}
else

4
Projects/UOContent/Skills/Begging.cs
View file

@ -37,7 +37,7 @@ namespace Server.SkillHandlers
{
if (m_SetSkillTime)
{
@from.NextSkillTime = Core.TickCount;
from.NextSkillTime = Core.TickCount;
}
}
@ -93,7 +93,7 @@ namespace Server.SkillHandlers
if (number != -1)
{
@from.SendLocalizedMessage(number);
from.SendLocalizedMessage(number);
}
}

2
Projects/UOContent/Skills/EvalInt.cs
View file

@ -88,7 +88,7 @@ namespace Server.SkillHandlers
MessageType.Regular,
0x3B2,
1038202 + mnMod,
@from.NetState
from.NetState
); // That being is at [10,20,...] percent mental strength.
}
}

14
Projects/UOContent/Skills/ForensicEval.cs
View file

@ -37,11 +37,11 @@ namespace Server.SkillHandlers
{
if (target is PlayerMobile pm && pm.NpcGuild == NpcGuild.ThievesGuild)
{
@from.SendLocalizedMessage(501004); // That individual is a thief!
from.SendLocalizedMessage(501004); // That individual is a thief!
}
else
{
@from.SendLocalizedMessage(501003); // You notice nothing unusual.
from.SendLocalizedMessage(501003); // You notice nothing unusual.
}
}
else
@ -55,19 +55,19 @@ namespace Server.SkillHandlers
{
if (c.m_Forensicist != null)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1042750,
c.m_Forensicist
); // The forensicist ~1_NAME~ has already discovered that:
}
else
{
c.m_Forensicist = @from.Name;
c.m_Forensicist = from.Name;
}
if (((Body)c.Amount).IsHuman)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1042751,
c.Killer == null ? "no one" : c.Killer.Name
); // This person was killed by ~1_KILLER_NAME~
@ -105,11 +105,11 @@ namespace Server.SkillHandlers
{
if (p.Picker != null)
{
@from.SendLocalizedMessage(1042749, p.Picker.Name); // This lock was opened by ~1_PICKER_NAME~
from.SendLocalizedMessage(1042749, p.Picker.Name); // This lock was opened by ~1_PICKER_NAME~
}
else
{
@from.SendLocalizedMessage(501003); // You notice nothing unusual.
from.SendLocalizedMessage(501003); // You notice nothing unusual.
}
}
}

4
Projects/UOContent/Skills/Inscribe.cs
View file

@ -102,7 +102,7 @@ namespace Server.SkillHandlers
{
if (cancelType == TargetCancelType.Timeout)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
501619
); // You have waited too long to make your inscribe selection, your inscription attempt has timed out.
}
@ -162,7 +162,7 @@ namespace Server.SkillHandlers
{
if (cancelType == TargetCancelType.Timeout)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
501619
); // You have waited too long to make your inscribe selection, your inscription attempt has timed out.
}

2
Projects/UOContent/Skills/ItemIdentification.cs
View file

@ -41,7 +41,7 @@ namespace Server.Items
if (!Core.AOS)
{
item.OnSingleClick(@from);
item.OnSingleClick(from);
}
}
else

8
Projects/UOContent/Skills/Peacemaking.cs
View file

@ -46,7 +46,7 @@ namespace Server.SkillHandlers
{
if (m_SetSkillTime)
{
@from.NextSkillTime = Core.TickCount;
from.NextSkillTime = Core.TickCount;
}
}
@ -126,19 +126,19 @@ namespace Server.SkillHandlers
if (bc?.BardPacified == false)
{
bc.Pacify(@from, DateTime.UtcNow + TimeSpan.FromSeconds(1.0));
bc.Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(1.0));
}
}
if (!calmed)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1049648
); // You play hypnotic music, but there is nothing in range for you to calm.
}
else
{
@from.SendLocalizedMessage(500615); // You play your hypnotic music, stopping the battle.
from.SendLocalizedMessage(500615); // You play your hypnotic music, stopping the battle.
}
}
}

4
Projects/UOContent/Skills/Poisoning.cs
View file

@ -89,13 +89,13 @@ namespace Server.SkillHandlers
{
if (Core.AOS)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1060204
); // You cannot poison that! You can only poison infectious weapons, food or drink.
}
else
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
502145
); // You cannot poison that! You can only poison bladed or piercing weapons, food or drink.
}

4
Projects/UOContent/Skills/RemoveTrap.cs
View file

@ -110,7 +110,7 @@ namespace Server.SkillHandlers
if (silver > 0)
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
1008113,
true,
silver.ToString(
@ -129,7 +129,7 @@ namespace Server.SkillHandlers
if (!isOwner)
{
kit.ConsumeCharge(@from);
kit.ConsumeCharge(from);
}
}
}

8
Projects/UOContent/Skills/Snooping.cs
View file

@ -18,7 +18,7 @@ namespace Server.SkillHandlers
if (to.Player)
{
return @from.CanBeHarmful(to, false, true); // normal restrictions
return from.CanBeHarmful(to, false, true); // normal restrictions
}
if ((map?.Rules & MapRules.HarmfulRestrictions) == 0)
@ -72,7 +72,7 @@ namespace Server.SkillHandlers
foreach (var ns in eable)
{
if (ns.Mobile != @from)
if (ns.Mobile != from)
{
ns.Mobile.SendMessage(message);
}
@ -84,7 +84,7 @@ namespace Server.SkillHandlers
if (from.AccessLevel == AccessLevel.Player)
{
Titles.AwardKarma(@from, -4, true);
Titles.AwardKarma(from, -4, true);
}
if (from.AccessLevel > AccessLevel.Player || from.CheckTargetSkill(SkillName.Snooping, cont, 0.0, 100.0))
@ -102,7 +102,7 @@ namespace Server.SkillHandlers
if (from.Skills.Hiding.Value / 2 < Utility.Random(100))
{
@from.RevealingAction();
from.RevealingAction();
}
}
}

4
Projects/UOContent/Skills/TasteID.cs
View file

@ -38,11 +38,11 @@ namespace Server.SkillHandlers
{
if (food.Poison != null)
{
food.SendLocalizedMessageTo(@from, 1038284); // It appears to have poison smeared on it.
food.SendLocalizedMessageTo(from, 1038284); // It appears to have poison smeared on it.
}
else
{
food.SendLocalizedMessageTo(@from, 1010600); // You detect nothing unusual about this substance.
food.SendLocalizedMessageTo(from, 1010600); // You detect nothing unusual about this substance.
}
}
else