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/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -157,11 +157,11 @@ namespace Server.Items
if (from.Backpack?.Deleted != false)
{
@from.Backpack.DropItem(pot);
from.Backpack.DropItem(pot);
}
else
{
pot.MoveToWorld(@from.Location, @from.Map);
pot.MoveToWorld(from.Location, from.Map);
}
pot.Drink(from);

18
Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -49,7 +49,7 @@ namespace Server.Items
if (!m_Users.Contains(from))
{
m_Users.Add(@from);
m_Users.Add(from);
}
from.Target = new ThrowTarget(this);
@ -83,7 +83,7 @@ namespace Server.Items
{
if (m_Users[i].Target is ThrowTarget targ && targ.Potion == this)
{
Target.Cancel(@from);
Target.Cancel(from);
}
}
@ -96,9 +96,9 @@ namespace Server.Items
{
var p = new Point3D(loc.X + i, loc.Y + j, loc.Z);
if (map.CanFit(p, 12, true, false) && @from.InLOS(p))
if (map.CanFit(p, 12, true, false) && from.InLOS(p))
{
new InternalItem(@from, p, map, MinDamage, MaxDamage);
new InternalItem(from, p, map, MinDamage, MaxDamage);
}
}
}
@ -162,7 +162,7 @@ namespace Server.Items
}
else
{
to = new Entity(Serial.Zero, new Point3D(p), @from.Map);
to = new Entity(Serial.Zero, new Point3D(p), from.Map);
}
Effects.SendMovingEffect(from, to, 0xF0D, 7, 0, false, false, Potion.Hue);
@ -308,12 +308,12 @@ namespace Server.Items
foreach (var m in m_Item.GetMobilesInRange(0))
{
if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != @from) &&
SpellHelper.ValidIndirectTarget(@from, m) && @from.CanBeHarmful(m, false))
if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != from) &&
SpellHelper.ValidIndirectTarget(from, m) && from.CanBeHarmful(m, false))
{
@from.DoHarmful(m);
from.DoHarmful(m);
AOS.Damage(m, @from, m_Item.GetDamage(), 0, 100, 0, 0, 0);
AOS.Damage(m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0);
m.PlaySound(0x208);
}
}

8
Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -50,7 +50,7 @@ namespace Server.Items
if (!m_Users.Contains(from))
{
m_Users.Add(@from);
m_Users.Add(from);
}
from.Target = new ThrowTarget(this);
@ -84,7 +84,7 @@ namespace Server.Items
{
if (m_Users[i].Target is ThrowTarget targ && targ.Potion == this)
{
Target.Cancel(@from);
Target.Cancel(from);
}
}
@ -104,7 +104,7 @@ namespace Server.Items
continue;
}
mon.Pacify(@from, DateTime.UtcNow + TimeSpan.FromSeconds(5.0)); // TODO check
mon.Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(5.0)); // TODO check
}
}
}
@ -180,7 +180,7 @@ namespace Server.Items
}
else
{
to = new Entity(Serial.Zero, new Point3D(p), @from.Map);
to = new Entity(Serial.Zero, new Point3D(p), from.Map);
}
Effects.SendMovingEffect(from, to, 0xF0D, 7, 0, false, false, Potion.Hue);

12
Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
if (Map == Map.Internal)
{
return @from;
return from;
}
return this;
@ -88,7 +88,7 @@ namespace Server.Items
if (!Users.Contains(from))
{
Users.Add(@from);
Users.Add(from);
}
from.Target = new ThrowTarget(this);
@ -105,7 +105,7 @@ namespace Server.Items
TimeSpan.FromSeconds(1.0),
TimeSpan.FromSeconds(1.25),
5,
() => Detonate_OnTick(@from, timer--)
() => Detonate_OnTick(from, timer--)
); // 3.6 seconds explosion delay
}
else
@ -114,7 +114,7 @@ namespace Server.Items
TimeSpan.FromSeconds(0.75),
TimeSpan.FromSeconds(1.0),
4,
() => Detonate_OnTick(@from, timer--)
() => Detonate_OnTick(from, timer--)
); // 2.6 seconds explosion delay
}
}
@ -174,7 +174,7 @@ namespace Server.Items
if (InstantExplosion)
{
Explode(@from, true, loc, map);
Explode(from, true, loc, map);
}
else
{
@ -213,7 +213,7 @@ namespace Server.Items
if (direct)
{
alchemyBonus = (int)(@from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10));
alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10));
}
var eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion);