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/Items/Skill Items/Camping/Bedroll.cs
View file

@ -51,7 +51,7 @@ namespace Server.Items
if (entry?.Safe == true)
{
@from.SendGump(new LogoutGump(entry, this));
from.SendGump(new LogoutGump(entry, this));
}
}
}

2
Projects/UOContent/Items/Skill Items/Camping/Kindling.cs
View file

@ -61,7 +61,7 @@ namespace Server.Items
if (!Deleted && Parent == null)
{
@from.PlaceInBackpack(this);
from.PlaceInBackpack(this);
}
new Campfire().MoveToWorld(fireLocation, from.Map);

6
Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -496,7 +496,7 @@ namespace Server.Items
if (northWall && westWall)
{
switch (@from.Direction & Direction.Mask)
switch (from.Direction & Direction.Mask)
{
case Direction.North:
case Direction.South:
@ -509,7 +509,7 @@ namespace Server.Items
break;
default:
@from.SendMessage("Turn to face the wall on which to hang this trophy.");
from.SendMessage("Turn to face the wall on which to hang this trophy.");
return;
}
}
@ -526,7 +526,7 @@ namespace Server.Items
}
else
{
@from.SendLocalizedMessage(1042626); // The trophy must be placed next to a wall.
from.SendLocalizedMessage(1042626); // The trophy must be placed next to a wall.
}
if (itemID > 0)

4
Projects/UOContent/Items/Skill Items/Fishing/FishingPole.cs
View file

@ -24,11 +24,11 @@ namespace Server.Items
if (!from.InLOS(loc) || !from.InRange(loc, 2))
{
@from.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1019045); // I can't reach that
from.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1019045); // I can't reach that
}
else
{
Fishing.System.BeginHarvesting(@from, this);
Fishing.System.BeginHarvesting(from, this);
}
}

4
Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -165,7 +165,7 @@ namespace Server.Items
{
for (var i = 1; i < Amount; ++i) // these were stackable before, doh
{
@from.AddToBackpack(new SpecialFishingNet());
from.AddToBackpack(new SpecialFishingNet());
}
}
@ -276,7 +276,7 @@ namespace Server.Items
if (index == 14)
{
FinishEffect(p, Map, @from);
FinishEffect(p, Map, from);
}
else
{

6
Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs
View file

@ -65,7 +65,7 @@ namespace Server.Items
if (makersMark)
{
Crafter = @from;
Crafter = from;
}
return quality;
@ -141,11 +141,11 @@ namespace Server.Items
{
if (IsChildOf(from.Backpack) || Parent == from)
{
HarvestSystem.BeginHarvesting(@from, this);
HarvestSystem.BeginHarvesting(from, 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.
}
}

4
Projects/UOContent/Items/Skill Items/Harvest Tools/ProspectorsTool.cs
View file

@ -55,11 +55,11 @@ namespace Server.Items
{
if (IsChildOf(from.Backpack) || Parent == from)
{
@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.
}
}

14
Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -51,11 +51,11 @@ namespace Server.Items
if (from.InRange(GetWorldLocation(), 1))
{
CheckGate(@from, 1);
CheckGate(from, 1);
}
else
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
}
@ -164,7 +164,7 @@ namespace Server.Items
{
if (message)
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
return false;
@ -180,7 +180,7 @@ namespace Server.Items
{
if (from.AccessLevel == AccessLevel.Player || !from.Hidden)
{
@from.Send(new PlaySound(0x20E, @from.Location));
from.Send(new PlaySound(0x20E, from.Location));
}
from.CloseGump<MoongateConfirmGump>();
@ -211,11 +211,11 @@ namespace Server.Items
if (TargetMap != null)
{
BeginConfirmation(@from);
BeginConfirmation(from);
}
else
{
@from.SendMessage("This moongate does not seem to go anywhere.");
from.SendMessage("This moongate does not seem to go anywhere.");
}
}
@ -283,7 +283,7 @@ namespace Server.Items
{
if (okay)
{
EndConfirmation(@from);
EndConfirmation(from);
}
}

6
Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -235,7 +235,7 @@ namespace Server.Items
if (--Held == 0)
{
@from.SendLocalizedMessage(502245); // The keg is now empty.
from.SendLocalizedMessage(502245); // The keg is now empty.
}
}
else
@ -293,7 +293,7 @@ namespace Server.Items
if (!pot.Deleted)
{
pot.Bounce(@from);
pot.Bounce(from);
}
return true;
@ -323,7 +323,7 @@ namespace Server.Items
if (!pot.Deleted)
{
pot.Bounce(@from);
pot.Bounce(from);
}
return true;

10
Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -262,7 +262,7 @@ namespace Server.Items
if (m_TargetMap == Map.Tokuno)
{
LabelTo(
@from,
from,
House != null ? 1063260 : 1063259,
string.Format(RuneFormat, desc)
); // ~1_val~ (Tokuno Islands)[(House)]
@ -270,7 +270,7 @@ namespace Server.Items
else if (m_TargetMap == Map.Malas)
{
LabelTo(
@from,
from,
House != null ? 1062454 : 1060804,
string.Format(RuneFormat, desc)
); // ~1_val~ (Malas)[(House)]
@ -278,7 +278,7 @@ namespace Server.Items
else if (m_TargetMap == Map.Felucca)
{
LabelTo(
@from,
from,
House != null ? 1062452 : 1060805,
string.Format(RuneFormat, desc)
); // ~1_val~ (Felucca)[(House)]
@ -286,7 +286,7 @@ namespace Server.Items
else if (m_TargetMap == Map.Trammel)
{
LabelTo(
@from,
from,
House != null ? 1062453 : 1060806,
string.Format(RuneFormat, desc)
); // ~1_val~ (Trammel)[(House)]
@ -294,7 +294,7 @@ namespace Server.Items
else
{
LabelTo(
@from,
from,
House != null ? "{0} ({1})(House)" : "{0} ({1})",
string.Format(RuneFormat, desc),
m_TargetMap

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);

6
Projects/UOContent/Items/Skill Items/Magical/Runebook.cs
View file

@ -136,7 +136,7 @@ namespace Server.Items
if (makersMark)
{
Crafter = @from;
Crafter = from;
}
m_Quality = (BookQuality)(quality - 1);
@ -322,14 +322,14 @@ namespace Server.Items
{
if (m_Description?.Length > 0)
{
LabelTo(@from, m_Description);
LabelTo(from, m_Description);
}
base.OnSingleClick(from);
if (m_Crafter != null)
{
LabelTo(@from, 1050043, m_Crafter.Name);
LabelTo(from, 1050043, m_Crafter.Name);
}
}

2
Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs
View file

@ -83,7 +83,7 @@ namespace Server.Items
}
else
{
@from.SendLocalizedMessage(502345); // This spell has been temporarily disabled.
from.SendLocalizedMessage(502345); // This spell has been temporarily disabled.
}
}
}

24
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

@ -219,7 +219,7 @@ namespace Server.Items
if (makersMark)
{
Crafter = @from;
Crafter = from;
}
m_Quality = (BookQuality)(quality - 1);
@ -340,11 +340,11 @@ namespace Server.Items
if (move != null)
{
SpecialMove.SetCurrentMove(@from, move);
SpecialMove.SetCurrentMove(from, move);
}
else
{
SpellRegistry.NewSpell(spellId, @from, null)?.Cast();
SpellRegistry.NewSpell(spellId, from, null)?.Cast();
}
}
@ -359,7 +359,7 @@ namespace Server.Items
if (book?.HasSpell(spellID) != true)
{
book = Find(@from, spellID);
book = Find(from, spellID);
}
if (book?.HasSpell(spellID) == true)
@ -380,7 +380,7 @@ namespace Server.Items
}
else
{
@from.SendLocalizedMessage(502345); // This spell has been temporarily disabled.
from.SendLocalizedMessage(502345); // This spell has been temporarily disabled.
}
}
}
@ -463,7 +463,7 @@ namespace Server.Items
if (!m_Table.TryGetValue(from, out var list))
{
m_Table[@from] = list = FindAllSpellbooks(@from);
m_Table[from] = list = FindAllSpellbooks(from);
}
else
{
@ -626,17 +626,17 @@ namespace Server.Items
if (strBonus != 0)
{
@from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero));
from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero));
}
if (dexBonus != 0)
{
@from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero));
from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero));
}
if (intBonus != 0)
{
@from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero));
from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero));
}
}
@ -910,7 +910,7 @@ namespace Server.Items
if (m_Crafter != null)
{
LabelTo(@from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~
LabelTo(from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~
}
LabelTo(from, 1042886, SpellCount.ToString());
@ -922,11 +922,11 @@ namespace Server.Items
if (Parent == from || pack != null && Parent == pack)
{
DisplayTo(@from);
DisplayTo(from);
}
else
{
@from.SendLocalizedMessage(
from.SendLocalizedMessage(
500207
); // The spellbook must be in your backpack (and not in a container within) to open.
}

8
Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -127,7 +127,7 @@ namespace Server.Items
if (m_Crafter != null)
{
LabelTo(@from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~
LabelTo(from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~
}
}
@ -170,7 +170,7 @@ namespace Server.Items
{
if (Check(from))
{
Repair.Do(@from, RepairSkillInfo.GetInfo(m_Skill).System, this);
Repair.Do(from, RepairSkillInfo.GetInfo(m_Skill).System, this);
}
}
@ -178,11 +178,11 @@ namespace Server.Items
{
if (!IsChildOf(from.Backpack))
{
@from.SendLocalizedMessage(1047012); // The contract must be in your backpack to use it.
from.SendLocalizedMessage(1047012); // The contract must be in your backpack to use it.
}
else if (!VerifyRegion(from))
{
TextDefinition.SendMessageTo(@from, RepairSkillInfo.GetInfo(m_Skill).NotNearbyMessage);
TextDefinition.SendMessageTo(from, RepairSkillInfo.GetInfo(m_Skill).NotNearbyMessage);
}
else
{

6
Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -124,7 +124,7 @@ namespace Server.Items
if (makersMark)
{
Crafter = @from;
Crafter = from;
}
return quality;
@ -579,11 +579,11 @@ namespace Server.Items
if (CheckMusicianship(from))
{
PlayInstrumentWell(@from);
PlayInstrumentWell(from);
}
else
{
PlayInstrumentBadly(@from);
PlayInstrumentBadly(from);
}
}
else

2
Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -80,7 +80,7 @@ namespace Server.Items
{
if (from.Body.IsHuman && !from.Mounted)
{
@from.Animate(33, 2, 1, true, true, 0);
from.Animate(33, 2, 1, true, true, 0);
}
from.PlaySound(0x223);

2
Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -82,7 +82,7 @@ namespace Server.Items
{
if (from.Body.IsHuman)
{
@from.Animate(@from.Mounted ? 26 : 9, 7, 1, true, false, 0);
from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
}
from.PlaySound(0x23A);

10
Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs
View file

@ -47,7 +47,7 @@ namespace Server.Items
{
if (CanUseWeapon(from, weapon))
{
@from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon);
}
}
@ -69,7 +69,7 @@ namespace Server.Items
if (CombatCheck(from, target))
{
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, @from, target, weapon);
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, from, target, weapon);
}
Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from);
@ -125,7 +125,7 @@ namespace Server.Items
if (weapon.Poison == null && ammo.Poison != null
|| weapon.Poison != null && ammo.Poison != null && weapon.Poison.Level != ammo.Poison.Level)
{
Unload(@from, weapon);
Unload(from, weapon);
need = Math.Min(MaxUses, ammo.UsesRemaining);
}
}
@ -299,11 +299,11 @@ namespace Server.Items
{
if (EvilOmenSpell.TryEndEffect(target))
{
target.ApplyPoison(@from, Poison.GetPoison(weapon.Poison.Level + 1));
target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1));
}
else
{
target.ApplyPoison(@from, weapon.Poison);
target.ApplyPoison(from, weapon.Poison);
}
weapon.PoisonCharges--;

10
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -143,15 +143,15 @@ namespace Server.Items
{
if (!from.InRange(m_Tub.GetWorldLocation(), 1) || !from.InRange(item.GetWorldLocation(), 1))
{
@from.SendLocalizedMessage(500446); // That is too far away.
from.SendLocalizedMessage(500446); // That is too far away.
}
else if (item.Parent is Mobile)
{
@from.SendLocalizedMessage(500861); // Can't Dye clothing that is being worn.
from.SendLocalizedMessage(500861); // Can't Dye clothing that is being worn.
}
else if (dyable.Dye(from, m_Tub))
{
@from.PlaySound(0x23E);
from.PlaySound(0x23E);
}
}
else if ((FurnitureAttribute.Check(item) || item is PotionKeg) && m_Tub.AllowFurniture)
@ -172,11 +172,11 @@ namespace Server.Items
if (house == null || !house.HasLockedDownItem(item) && !house.HasSecureItem(item))
{
@from.SendLocalizedMessage(501022); // Furniture must be locked down to paint it.
from.SendLocalizedMessage(501022); // Furniture must be locked down to paint it.
}
else if (!house.IsCoOwner(from))
{
@from.SendLocalizedMessage(501023); // You must be the owner to use this item.
from.SendLocalizedMessage(501023); // You must be the owner to use this item.
}
else
{

10
Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Dyes.cs
View file

@ -7,10 +7,10 @@ namespace Server.Items
{
/*
public bool ShowUsesRemaining { get { return false; } set { } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int UsesRemaining { get { return m_UsesRemaining; } set { m_UsesRemaining = value; } }
private int m_UsesRemaining;
*/
@ -69,15 +69,15 @@ namespace Server.Items
{
if (tub.MetallicHues) /* OSI has three metallic tubs now */
{
@from.SendGump(new MetallicHuePicker<DyeTub>(@from, SetTubHue, tub));
from.SendGump(new MetallicHuePicker<DyeTub>(from, SetTubHue, tub));
}
else if (tub.CustomHuePicker != null)
{
@from.SendGump(new CustomHuePickerGump<DyeTub>(@from, tub.CustomHuePicker, SetTubHue, tub));
from.SendGump(new CustomHuePickerGump<DyeTub>(from, tub.CustomHuePicker, SetTubHue, tub));
}
else
{
@from.SendHuePicker(new InternalPicker(tub));
from.SendHuePicker(new InternalPicker(tub));
}
}
else if (tub is BlackDyeTub)

8
Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs
View file

@ -87,9 +87,9 @@ namespace Server.Items
{
if (item is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore))
{
if (CanScissor(@from, obj) && obj.Scissor(@from, m_Item))
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
{
@from.PlaySound(0x248);
from.PlaySound(0x248);
}
}
}
@ -97,7 +97,7 @@ namespace Server.Items
{
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
{
@from.PlaySound(0x248);
from.PlaySound(0x248);
}
}
else
@ -112,7 +112,7 @@ namespace Server.Items
{
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
{
@from.PlaySound(0x248);
from.PlaySound(0x248);
}
}
else

18
Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -42,35 +42,35 @@ namespace Server.Items
if (!IsChildOf(from.Backpack))
{
@from.SendLocalizedMessage(1042001);
from.SendLocalizedMessage(1042001);
}
else if (pm == null || pm.NpcGuild != NpcGuild.ThievesGuild)
{
@from.SendLocalizedMessage(501702);
from.SendLocalizedMessage(501702);
}
else if (Stealing.SuspendOnMurder && pm.Kills > 0)
{
@from.SendLocalizedMessage(501703);
from.SendLocalizedMessage(501703);
}
else if (!from.CanBeginAction<IncognitoSpell>())
{
@from.SendLocalizedMessage(501704);
from.SendLocalizedMessage(501704);
}
else if (Sigil.ExistsOn(from))
{
@from.SendLocalizedMessage(1010465); // You cannot disguise yourself while holding a sigil
from.SendLocalizedMessage(1010465); // You cannot disguise yourself while holding a sigil
}
else if (TransformationSpellHelper.UnderTransformation(from))
{
@from.SendLocalizedMessage(1061634);
from.SendLocalizedMessage(1061634);
}
else if (from.BodyMod == 183 || from.BodyMod == 184)
{
@from.SendLocalizedMessage(1040002);
from.SendLocalizedMessage(1040002);
}
else if (!from.CanBeginAction<PolymorphSpell>() || from.IsBodyMod)
{
@from.SendLocalizedMessage(501705);
from.SendLocalizedMessage(501705);
}
else
{
@ -84,7 +84,7 @@ namespace Server.Items
{
if (ValidateUse(from))
{
@from.SendGump(new DisguiseGump(@from, this, true, false));
from.SendGump(new DisguiseGump(from, this, true, false));
}
}
}

6
Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs
View file

@ -70,7 +70,7 @@ namespace Server.Items
if (makersMark)
{
Crafter = @from;
Crafter = from;
}
return quality;
@ -169,11 +169,11 @@ namespace Server.Items
// Blacksmithing shows the gump regardless of proximity of an anvil and forge after SE
if (num > 0 && (num != 1044267 || !Core.SE))
{
@from.SendLocalizedMessage(num);
from.SendLocalizedMessage(num);
}
else
{
@from.SendGump(new CraftGump(@from, system, this, null));
from.SendGump(new CraftGump(from, system, this, null));
}
}
else