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/Misc/Animations.cs
View file

@ -18,7 +18,7 @@ namespace Server.Misc
if (action > 0 && from.Alive && !from.Mounted && from.Body.IsHuman)
{
@from.Animate(action, 5, 1, true, false, 0);
from.Animate(action, 5, 1, true, false, 0);
}
}
}

6
Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs
View file

@ -249,11 +249,11 @@ namespace Server.Items
if (northWall && westWall)
{
@from.SendGump(new MistletoeDeedGump(@from, loc, this));
from.SendGump(new MistletoeDeedGump(from, loc, this));
}
else
{
PlaceAddon(@from, loc, northWall, westWall);
PlaceAddon(from, loc, northWall, westWall);
}
}
else
@ -289,7 +289,7 @@ namespace Server.Items
}
else
{
@from.SendLocalizedMessage(1070883); // The mistletoe must be placed next to a wall.
from.SendLocalizedMessage(1070883); // The mistletoe must be placed next to a wall.
}
if (itemID > 0)

10
Projects/UOContent/Misc/HardwareInfo.cs
View file

@ -113,21 +113,21 @@ namespace Server
if (hwInfo != null)
{
CommandLogging.WriteLine(
@from,
from,
"{0} {1} viewing hardware info of {2}",
@from.AccessLevel,
CommandLogging.Format(@from),
from.AccessLevel,
CommandLogging.Format(from),
CommandLogging.Format(m)
);
}
if (hwInfo != null)
{
@from.SendGump(new PropertiesGump(@from, hwInfo));
from.SendGump(new PropertiesGump(from, hwInfo));
}
else
{
@from.SendMessage("No hardware information for that account was found.");
from.SendMessage("No hardware information for that account was found.");
}
}
else

14
Projects/UOContent/Misc/Keywords.cs
View file

@ -23,7 +23,7 @@ namespace Server.Misc
{
case 0x002A: // *i resign from my guild*
{
((Guild)@from.Guild)?.RemoveMember(@from);
((Guild)from.Guild)?.RemoveMember(from);
break;
}
@ -31,16 +31,16 @@ namespace Server.Misc
{
if (!Core.SE)
{
@from.SendMessage("Short Term Murders : {0}", @from.ShortTermMurders);
@from.SendMessage("Long Term Murders : {0}", @from.Kills);
from.SendMessage("Short Term Murders : {0}", from.ShortTermMurders);
from.SendMessage("Long Term Murders : {0}", from.Kills);
}
else
{
@from.SendMessage(
from.SendMessage(
0x3B2,
"Short Term Murders: {0} Long Term Murders: {1}",
@from.ShortTermMurders,
@from.Kills
from.ShortTermMurders,
from.Kills
);
}
@ -48,7 +48,7 @@ namespace Server.Misc
}
case 0x0035: // i renounce my young player status*
{
if (@from is PlayerMobile mobile && mobile.Young && !mobile.HasGump<RenounceYoungGump>())
if (from is PlayerMobile mobile && mobile.Young && !mobile.HasGump<RenounceYoungGump>())
{
mobile.SendGump(new RenounceYoungGump());
}

10
Projects/UOContent/Misc/LootPack.cs
View file

@ -183,7 +183,7 @@ namespace Server
if (item != null)
{
if (!item.Stackable || !cont.TryDropItem(@from, item, false))
if (!item.Stackable || !cont.TryDropItem(from, item, false))
{
cont.DropItem(item);
}
@ -572,7 +572,7 @@ namespace Server
{
new LootPackItem( typeof( ParrotItem ), 1 )
};
public static readonly LootPack Parrot = new LootPack( new LootPackEntry[]
{
new LootPackEntry( false, ParrotItem, 10.00, 1 )
@ -697,7 +697,7 @@ namespace Server
if (rnd < item.Chance)
{
return Mutate(@from, luckChance, item.Construct(IsInTokuno(@from), IsMondain(@from)));
return Mutate(from, luckChance, item.Construct(IsInTokuno(from), IsMondain(from)));
}
rnd -= item.Chance;
@ -822,7 +822,7 @@ namespace Server
if (from != null && weapon.AccuracyLevel == 0 && weapon.DamageLevel == 0 &&
weapon.DurabilityLevel == 0 && weapon.Slayer == SlayerName.None && Utility.Random(100) < 5)
{
weapon.Slayer = SlayerGroup.GetLootSlayerType(@from.GetType());
weapon.Slayer = SlayerGroup.GetLootSlayerType(from.GetType());
}
}
else if (item is BaseArmor armor)
@ -849,7 +849,7 @@ namespace Server
}
else
{
slayer = SlayerGroup.GetLootSlayerType(@from.GetType());
slayer = SlayerGroup.GetLootSlayerType(from.GetType());
}
if (slayer == SlayerName.None)

2
Projects/UOContent/Misc/MondainsLegacy.cs
View file

@ -69,7 +69,7 @@ namespace Server
if (message)
{
@from.SendLocalizedMessage(1072791); // You must upgrade to Mondain's Legacy in order to use that item.
from.SendLocalizedMessage(1072791); // You must upgrade to Mondain's Legacy in order to use that item.
}
return false;

2
Projects/UOContent/Misc/Notoriety.cs
View file

@ -134,7 +134,7 @@ namespace Server.Misc
if ((!Core.ML || map == Faction.Facet) && targetFaction != null)
{
if (Faction.Find(@from, true) != targetFaction)
if (Faction.Find(from, true) != targetFaction)
{
return false;
}

2
Projects/UOContent/Misc/ProfanityProtection.cs
View file

@ -131,7 +131,7 @@ namespace Server.Misc
StartDisallowed
))
{
e.Blocked = !OnProfanityDetected(@from, e.Speech);
e.Blocked = !OnProfanityDetected(from, e.Speech);
}
}
}

6
Projects/UOContent/Misc/RegenRates.cs
View file

@ -83,7 +83,7 @@ namespace Server.Misc
if (CheckAnimal(from, typeof(Dog)) || CheckAnimal(from, typeof(Cat)))
{
points += @from.Skills.Ninjitsu.Fixed / 30;
points += from.Skills.Ninjitsu.Fixed / 30;
}
return TimeSpan.FromSeconds(1.0 / (0.1 * (1 + points)));
@ -141,7 +141,7 @@ namespace Server.Misc
if (!from.Meditating)
{
CheckBonusSkill(@from, @from.Mana, @from.ManaMax, SkillName.Meditation);
CheckBonusSkill(from, from.Mana, from.ManaMax, SkillName.Meditation);
}
double rate;
@ -239,7 +239,7 @@ namespace Server.Misc
if (!Core.AOS)
{
rating += GetArmorMeditationValue(@from.ShieldArmor as BaseArmor);
rating += GetArmorMeditationValue(from.ShieldArmor as BaseArmor);
}
rating += GetArmorMeditationValue(from.NeckArmor as BaseArmor);

2
Projects/UOContent/Misc/RenameRequests.cs
View file

@ -34,7 +34,7 @@ namespace Server.Misc
{
if (name.IndexOf(disallowed[i]) != -1)
{
@from.SendLocalizedMessage(1072622); // That name isn't very polite.
from.SendLocalizedMessage(1072622); // That name isn't very polite.
return;
}
}

2
Projects/UOContent/Misc/ShardPoller.cs
View file

@ -218,7 +218,7 @@ namespace Server.Misc
{
if (from.AccessLevel >= AccessLevel.Administrator)
{
@from.SendGump(new ShardPollGump(@from, this, true, null));
from.SendGump(new ShardPollGump(from, this, true, null));
}
}

28
Projects/UOContent/Misc/SkillCheck.cs
View file

@ -178,7 +178,7 @@ namespace Server.Misc
if (from.Alive && (gc >= Utility.RandomDouble() && AllowGain(from, skill, amObj) || skill.Base < 10.0))
{
Gain(@from, skill);
Gain(from, skill);
}
return success;
@ -310,15 +310,15 @@ namespace Server.Misc
if (from.StrLock == StatLockType.Up && info.StrGain / 33.3 > Utility.RandomDouble())
{
GainStat(@from, Stat.Str);
GainStat(from, Stat.Str);
}
else if (from.DexLock == StatLockType.Up && info.DexGain / 33.3 > Utility.RandomDouble())
{
GainStat(@from, Stat.Dex);
GainStat(from, Stat.Dex);
}
else if (from.IntLock == StatLockType.Up && info.IntGain / 33.3 > Utility.RandomDouble())
{
GainStat(@from, Stat.Int);
GainStat(from, Stat.Int);
}
}
}
@ -338,7 +338,7 @@ namespace Server.Misc
{
if (!(from is BaseCreature creature && creature.Controlled))
{
if (@from.RawStatTotal >= @from.StatCap)
if (from.RawStatTotal >= from.StatCap)
{
return false;
}
@ -365,17 +365,17 @@ namespace Server.Misc
{
if (CanLower(from, Stat.Dex) && (from.RawDex < from.RawInt || !CanLower(from, Stat.Int)))
{
--@from.RawDex;
--from.RawDex;
}
else if (CanLower(from, Stat.Int))
{
--@from.RawInt;
--from.RawInt;
}
}
if (CanRaise(from, Stat.Str))
{
++@from.RawStr;
++from.RawStr;
}
break;
@ -386,17 +386,17 @@ namespace Server.Misc
{
if (CanLower(from, Stat.Str) && (from.RawStr < from.RawInt || !CanLower(from, Stat.Int)))
{
--@from.RawStr;
--from.RawStr;
}
else if (CanLower(from, Stat.Int))
{
--@from.RawInt;
--from.RawInt;
}
}
if (CanRaise(from, Stat.Dex))
{
++@from.RawDex;
++from.RawDex;
}
break;
@ -407,17 +407,17 @@ namespace Server.Misc
{
if (CanLower(from, Stat.Str) && (from.RawStr < from.RawDex || !CanLower(from, Stat.Dex)))
{
--@from.RawStr;
--from.RawStr;
}
else if (CanLower(from, Stat.Dex))
{
--@from.RawDex;
--from.RawDex;
}
}
if (CanRaise(from, Stat.Int))
{
++@from.RawInt;
++from.RawInt;
}
break;

2
Projects/UOContent/Misc/ToggleItem.cs
View file

@ -48,7 +48,7 @@ namespace Server.Items
}
else
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
}
}

2
Projects/UOContent/Misc/WeightOverloading.cs
View file

@ -82,7 +82,7 @@ namespace Server.Misc
if (from.Stam * 100 / Math.Max(from.StamMax, 1) < 10)
{
--@from.Stam;
--from.Stam;
}
if (from.Stam == 0)