warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: Code cleanup (#399)

Browse source 
- [X] Code cleanup
This commit is contained in:
Kamron Batman 2021-01-10 09:14:03 -08:00 • committed by GitHub
parent a6e1172f97
commit 764d303543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 93 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Projects/UOContent/Commands/Handlers.cs
View file

@ -1009,58 +1009,6 @@ namespace Server.Commands
}
}
private class DismountTarget : Target
{
public DismountTarget() : base(-1, false, TargetFlags.None)
{
}
protected override void OnTarget(Mobile from, object targeted)
{
if (targeted is Mobile targ)
{
CommandLogging.WriteLine(
from,
"{0} {1} dismounting {2}",
from.AccessLevel,
CommandLogging.Format(from),
CommandLogging.Format(targ)
);
for (var i = 0; i < targ.Items.Count; ++i)
{
var item = targ.Items[i];
if (item is IMountItem mountItem)
{
var mount = mountItem.Mount;
if (mount != null)
{
mount.Rider = null;
}
if (targ.Items.IndexOf(item) == -1)
{
--i;
}
}
}
for (var i = 0; i < targ.Items.Count; ++i)
{
var item = targ.Items[i];
if (item.Layer == Layer.Mount)
{
item.Delete();
--i;
}
}
}
}
}
private class ClientTarget : Target
{
public ClientTarget() : base(-1, false, TargetFlags.None)

3
Projects/UOContent/Engines/BulkOrders/SmallSmithBOD.cs
View file

@ -140,8 +140,7 @@ namespace Server.Engines.BulkOrders
if (item != null)
{
var allRequiredSkills = true;
var chance = item.GetSuccessChance(m, null, system, false, out allRequiredSkills);
var chance = item.GetSuccessChance(m, null, system, false, out var allRequiredSkills);
if (allRequiredSkills && chance >= 0.0)
{

3
Projects/UOContent/Engines/BulkOrders/SmallTailorBOD.cs
View file

@ -142,8 +142,7 @@ namespace Server.Engines.BulkOrders
if (item != null)
{
var allRequiredSkills = true;
var chance = item.GetSuccessChance(m, null, system, false, out allRequiredSkills);
var chance = item.GetSuccessChance(m, null, system, false, out var allRequiredSkills);
if (allRequiredSkills && chance >= 0.0)
{

8
Projects/UOContent/Engines/CannedEvil/ChampionSkullBrazier.cs
View file

@ -83,7 +83,7 @@ namespace Server.Engines.CannedEvil
}
else
{
SendLocalizedMessageTo(from, 1049487, ""); // I already have my champions awakening skull!
SendLocalizedMessageTo(from, 1049487); // I already have my champions awakening skull!
}
}
@ -109,11 +109,11 @@ namespace Server.Engines.CannedEvil
}
else if (skull == null)
{
SendLocalizedMessageTo(from, 1049488, ""); // That is not my champions awakening skull!
SendLocalizedMessageTo(from, 1049488); // That is not my champions awakening skull!
}
else if (m_Skull != null)
{
SendLocalizedMessageTo(from, 1049487, ""); // I already have my champions awakening skull!
SendLocalizedMessageTo(from, 1049487); // I already have my champions awakening skull!
}
else if (!skull.IsChildOf(from.Backpack))
{
@ -130,7 +130,7 @@ namespace Server.Engines.CannedEvil
}
else
{
SendLocalizedMessageTo(from, 1049488, ""); // That is not my champions awakening skull!
SendLocalizedMessageTo(from, 1049488); // That is not my champions awakening skull!
}
}
}

2
Projects/UOContent/Engines/Chat/Channel.cs
View file

@ -76,7 +76,7 @@ namespace Server.Engines.Chat
public bool IsVoiced(ChatUser user) => m_Voices.Contains(user);
public bool ValidatePassword(string password) => m_Password == null || m_Password.InsensitiveEquals(password);
public bool ValidatePassword(string password) => m_Password?.InsensitiveEquals(password) != false;
public bool ValidateModerator(ChatUser user)
{

6
Projects/UOContent/Engines/Craft/Core/CraftItem.cs
View file

@ -950,8 +950,7 @@ namespace Server.Engines.Craft
if (RequiredExpansion == Expansion.None ||
from.NetState?.SupportsExpansion(RequiredExpansion) == true)
{
bool allRequiredSkills;
var chance = GetSuccessChance(from, typeRes, craftSystem, false, out allRequiredSkills);
var chance = GetSuccessChance(from, typeRes, craftSystem, false, out var allRequiredSkills);
if (allRequiredSkills && chance >= 0.0)
{
@ -1414,9 +1413,8 @@ namespace Server.Engines.Craft
}
var quality = 1;
var allRequiredSkills = true;
m_CraftItem.CheckSkills(m_From, m_TypeRes, m_CraftSystem, ref quality, out allRequiredSkills, false);
m_CraftItem.CheckSkills(m_From, m_TypeRes, m_CraftSystem, ref quality, out _, false);
var context = m_CraftSystem.GetContext(m_From);

18
Projects/UOContent/Engines/Craft/DefBlacksmithy.cs
View file

@ -136,11 +136,10 @@ namespace Server.Engines.Craft
public override void PlayCraftEffect(Mobile from)
{
// no animation, instant sound
// To animate and synchronize with sound
// if (from.Body.Type == BodyType.Human && !from.Mounted)
// from.Animate( 9, 5, 1, true, false, 0 );
// new InternalTimer( from ).Start();
// 0.7 second delay
from.PlaySound(0x2A);
}
@ -1336,19 +1335,6 @@ namespace Server.Engines.Craft
MarkOption = true;
CanEnhance = Core.AOS;
}
// Delay to synchronize the sound with the hit on the anvil
private class InternalTimer : Timer
{
private readonly Mobile m_From;
public InternalTimer(Mobile from) : base(TimeSpan.FromSeconds(0.7)) => m_From = from;
protected override void OnTick()
{
m_From.PlaySound(0x2A);
}
}
}
[AttributeUsage(AttributeTargets.Class)]

1
Projects/UOContent/Engines/Craft/DefCarpentry.cs
View file

@ -39,6 +39,7 @@ namespace Server.Engines.Craft
// no animation
// if (from.Body.Type == BodyType.Human && !from.Mounted)
// from.Animate( 9, 5, 1, true, false, 0 );
// 0.7 second delay
from.PlaySound(0x23D);
}

13
Projects/UOContent/Engines/Craft/DefGlassblowing.cs
View file

@ -120,18 +120,5 @@ namespace Server.Engines.Craft
SetNeededExpansion(index, Expansion.ML);
}
}
// Delay to synchronize the sound with the hit on the anvil
private class InternalTimer : Timer
{
private readonly Mobile m_From;
public InternalTimer(Mobile from) : base(TimeSpan.FromSeconds(0.7)) => m_From = from;
protected override void OnTick()
{
m_From.PlaySound(0x2A);
}
}
}
}

13
Projects/UOContent/Engines/Craft/DefMasonry.cs
View file

@ -143,18 +143,5 @@ namespace Server.Engines.Craft
AddSubRes(typeof(VeriteGranite), 1044029, 95.0, 1044514, 1044527);
AddSubRes(typeof(ValoriteGranite), 1044030, 99.0, 1044514, 1044527);
}
// Delay to synchronize the sound with the hit on the anvil
private class InternalTimer : Timer
{
private readonly Mobile m_From;
public InternalTimer(Mobile from) : base(TimeSpan.FromSeconds(0.7)) => m_From = from;
protected override void OnTick()
{
m_From.PlaySound(0x23D);
}
}
}
}

2
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -44,7 +44,7 @@ namespace Server.Engines.Doom
public void CallBackMessage()
{
PublicOverheadMessage(MessageType.Regular, 0x3B2, 1060003, ""); // You try to pry the box open...
PublicOverheadMessage(MessageType.Regular, 0x3B2, 1060003); // You try to pry the box open...
}
public override void OnAfterDelete()

2
Projects/UOContent/Engines/Events/BroadcastEvent.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Events
public class BroadcastEvent : IEvent
{
private readonly int _hue;
private readonly string _text = "";
private readonly string _text;
public BroadcastEvent(int hue, string text)
{

19
Projects/UOContent/Engines/Khaldun/KhaldunPitTeleporter.cs
View file

@ -33,8 +33,8 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public Map MapDest { get; set; }
public override int LabelNumber =>
1016511; // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit
// the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit
public override int LabelNumber => 1016511;
public override void OnDoubleClick(Mobile m)
{
@ -45,22 +45,9 @@ namespace Server.Items
var map = MapDest;
if (map == null || map == Map.Internal)
{
map = m.Map;
}
var p = PointDest;
if (p == Point3D.Zero)
{
p = m.Location;
}
if (m.InRange(this, 3))
if (map != null && map != Map.Internal && m.InRange(this, 3))
{
BaseCreature.TeleportPets(m, PointDest, MapDest);
m.MoveToWorld(PointDest, MapDest);
}
else

2
Projects/UOContent/Engines/MLQuests/Mobiles/BoonCollector.cs
View file

@ -10,8 +10,6 @@ namespace Server.Engines.MLQuests.Mobiles
{
public abstract class DoneQuestCollector : BaseCreature, IRaceChanger
{
private static Type typeOfRaceChangeConfirmGump = typeof(RaceChangeConfirmGump);
private InternalTimer m_Timer;
public DoneQuestCollector()

8
Projects/UOContent/Engines/Pathing/SlowAStarAlgorithm.cs
View file

@ -101,10 +101,10 @@ namespace Server.PathAlgorithms.SlowAStar
path[pathCount++] = (Direction)curNode.dir;
if (pathCount == MaxNodes)
{
break;
}
// if (pathCount == MaxNodes)
// {
// break;
// }
while (xBacktrack != startNode.x || yBacktrack != startNode.y || zBacktrack != startNode.z)
{

2
Projects/UOContent/Engines/Plants/PlantItem.cs
View file

@ -96,7 +96,7 @@ namespace Server.Engines.Plants
if (hits == 0 && m_PlantStatus > PlantStatus.BowlOfDirt)
{
PlantSystem.Hits = hits + 1;
PlantSystem.Hits = 1;
}
else
{

2
Projects/UOContent/Items/Misc/TrashBarrel.cs
View file

@ -123,7 +123,7 @@ namespace Server.Items
if (items.Count > 0)
{
PublicOverheadMessage(MessageType.Regular, 0x3B2, message, "");
PublicOverheadMessage(MessageType.Regular, 0x3B2, message);
for (var i = items.Count - 1; i >= 0; --i)
{

143
Projects/UOContent/Misc/CharacterCreation.cs
View file

@ -9,6 +9,8 @@ namespace Server.Misc
{
public static class CharacterCreation
{
private static readonly TimeSpan BadStartMessageDelay = TimeSpan.FromSeconds(3.5);
private static readonly CityInfo m_NewHavenInfo =
new("New Haven", "The Bountiful Harvest Inn", 3503, 2574, 14, Map.Trammel);
@ -81,9 +83,7 @@ namespace Server.Misc
Container cont;
// Begin box of money
cont = new WoodenBox();
cont.ItemID = 0xE7D;
cont.Hue = 0x489;
cont = new WoodenBox { ItemID = 0xE7D, Hue = 0x489 };
PlaceItemIn(cont, 16, 51, new BankCheck(500000));
PlaceItemIn(cont, 28, 51, new BankCheck(250000));
@ -98,8 +98,7 @@ namespace Server.Misc
// End box of money
// Begin bag of potion kegs
cont = new Backpack();
cont.Name = "Various Potion Kegs";
cont = new Backpack { Name = "Various Potion Kegs" };
PlaceItemIn(cont, 45, 149, MakePotionKeg(PotionEffect.CureGreater, 0x2D));
PlaceItemIn(cont, 69, 149, MakePotionKeg(PotionEffect.HealGreater, 0x499));
@ -113,8 +112,7 @@ namespace Server.Misc
// End bag of potion kegs
// Begin bag of tools
cont = new Bag();
cont.Name = "Tool Bag";
cont = new Bag { Name = "Tool Bag" };
PlaceItemIn(cont, 30, 35, new TinkerTools(1000));
PlaceItemIn(cont, 60, 35, new HousePlacementTool());
@ -144,8 +142,7 @@ namespace Server.Misc
// End bag of tools
// Begin bag of archery ammo
cont = new Bag();
cont.Name = "Bag Of Archery Ammo";
cont = new Bag { Name = "Bag Of Archery Ammo" };
PlaceItemIn(cont, 48, 76, new Arrow(5000));
PlaceItemIn(cont, 72, 76, new Bolt(5000));
@ -154,8 +151,7 @@ namespace Server.Misc
// End bag of archery ammo
// Begin bag of treasure maps
cont = new Bag();
cont.Name = "Bag Of Treasure Maps";
cont = new Bag { Name = "Bag Of Treasure Maps" };
PlaceItemIn(cont, 30, 35, new TreasureMap(1, Map.Trammel));
PlaceItemIn(cont, 45, 35, new TreasureMap(2, Map.Trammel));
@ -178,9 +174,7 @@ namespace Server.Misc
// End bag of treasure maps
// Begin bag of raw materials
cont = new Bag();
cont.Hue = 0x835;
cont.Name = "Raw Materials Bag";
cont = new Bag { Hue = 0x835, Name = "Raw Materials Bag" };
PlaceItemIn(cont, 92, 60, new BarbedLeather(5000));
PlaceItemIn(cont, 92, 68, new HornedLeather(5000));
@ -212,9 +206,7 @@ namespace Server.Misc
// End bag of raw materials
// Begin bag of spell casting stuff
cont = new Backpack();
cont.Hue = 0x480;
cont.Name = "Spell Casting Stuff";
cont = new Backpack { Hue = 0x480, Name = "Spell Casting Stuff" };
PlaceItemIn(cont, 45, 105, new Spellbook(ulong.MaxValue));
PlaceItemIn(cont, 65, 105, new NecromancerSpellbook(0xFFFFUL));
@ -226,12 +218,10 @@ namespace Server.Misc
runebook.CurCharges = runebook.MaxCharges;
PlaceItemIn(cont, 145, 105, runebook);
Item toHue = new BagOfReagents(150);
toHue.Hue = 0x2D;
Item toHue = new BagOfReagents(150) { Hue = 0x2D };
PlaceItemIn(cont, 45, 150, toHue);
toHue = new BagOfNecroReagents(150);
toHue.Hue = 0x488;
toHue = new BagOfNecroReagents(150) { Hue = 0x488 };
PlaceItemIn(cont, 65, 150, toHue);
PlaceItemIn(cont, 140, 150, new BagOfAllReagents(500));
@ -247,9 +237,7 @@ namespace Server.Misc
// End bag of spell casting stuff
// Begin bag of ethereals
cont = new Backpack();
cont.Hue = 0x490;
cont.Name = "Bag Of Ethy's!";
cont = new Backpack { Hue = 0x490, Name = "Bag Of Ethy's!" };
PlaceItemIn(cont, 45, 66, new EtherealHorse());
PlaceItemIn(cont, 69, 82, new EtherealOstard());
@ -264,9 +252,7 @@ namespace Server.Misc
// End bag of ethereals
// Begin first bag of artifacts
cont = new Backpack();
cont.Hue = 0x48F;
cont.Name = "Bag of Artifacts";
cont = new Backpack { Hue = 0x48F, Name = "Bag of Artifacts" };
PlaceItemIn(cont, 45, 66, new TitansHammer());
PlaceItemIn(cont, 69, 82, new InquisitorsResolution());
@ -277,9 +263,7 @@ namespace Server.Misc
// End first bag of artifacts
// Begin second bag of artifacts
cont = new Backpack();
cont.Hue = 0x48F;
cont.Name = "Bag of Artifacts";
cont = new Backpack { Hue = 0x48F, Name = "Bag of Artifacts" };
PlaceItemIn(cont, 45, 66, new GauntletsOfNobility());
PlaceItemIn(cont, 69, 82, new MidnightBracers());
@ -319,9 +303,7 @@ namespace Server.Misc
// End second bag of artifacts
// Begin bag of minor artifacts
cont = new Backpack();
cont.Hue = 0x48F;
cont.Name = "Bag of Minor Artifacts";
cont = new Backpack { Hue = 0x48F, Name = "Bag of Minor Artifacts" };
PlaceItemIn(cont, 45, 66, new LunaLance());
PlaceItemIn(cont, 69, 82, new VioletCourage());
@ -364,9 +346,7 @@ namespace Server.Misc
if (Core.SE)
{
cont = new Bag();
cont.Hue = 0x501;
cont.Name = "Tokuno Minor Artifacts";
cont = new Bag { Hue = 0x501, Name = "Tokuno Minor Artifacts" };
PlaceItemIn(cont, 42, 70, new Exiler());
PlaceItemIn(cont, 38, 53, new HanzosBow());
@ -394,8 +374,7 @@ namespace Server.Misc
if (Core.SE) // This bag came only after SE.
{
cont = new Bag();
cont.Name = "Bag of Bows";
cont = new Bag { Name = "Bag of Bows" };
PlaceItemIn(cont, 31, 84, new Bow());
PlaceItemIn(cont, 78, 74, new CompositeBow());
@ -430,9 +409,7 @@ namespace Server.Misc
bank.DropItem(new BankCheck(1000000));
// Full spellbook
var book = new Spellbook();
book.Content = ulong.MaxValue;
var book = new Spellbook { Content = ulong.MaxValue };
bank.DropItem(book);
@ -482,11 +459,7 @@ namespace Server.Misc
bank.DropItem(new DyeTub());
bank.DropItem(new BlackDyeTub());
var darkRedTub = new DyeTub();
darkRedTub.DyedHue = 0x485;
darkRedTub.Redyable = false;
var darkRedTub = new DyeTub { DyedHue = 0x485, Redyable = false };
bank.DropItem(darkRedTub);
// Some food
@ -667,20 +640,8 @@ namespace Server.Misc
newChar.Player = true;
newChar.AccessLevel = args.Account.AccessLevel;
newChar.Female = args.Female;
// newChar.Body = newChar.Female ? 0x191 : 0x190;
if (Core.Expansion >= args.Race.RequiredExpansion)
{
newChar.Race = args.Race; // Sets body
}
else
{
newChar.Race = Race.DefaultRace;
}
// newChar.Hue = Utility.ClipSkinHue( args.Hue & 0x3FFF ) | 0x8000;
newChar.Race = Core.Expansion >= args.Race.RequiredExpansion ? args.Race : Race.DefaultRace;
newChar.Hue = newChar.Race.ClipSkinHue(args.Hue & 0x3FFF) | 0x8000;
newChar.Hunger = 20;
var young = false;
@ -746,30 +707,9 @@ namespace Server.Misc
new WelcomeTimer(newChar).Start();
}
public static bool VerifyProfession(int profession)
{
if (profession < 0)
{
return false;
}
public static bool VerifyProfession(int profession) =>
profession >= 0 && (profession < 4 || Core.AOS && profession < 6 || Core.SE && profession < 8);
if (profession < 4)
{
return true;
}
if (Core.AOS && profession < 6)
{
return true;
}
if (Core.SE && profession < 8)
{
return true;
}
return false;
}
private static CityInfo GetStartLocation(CharacterCreatedEventArgs args, bool isYoung)
{
@ -794,15 +734,14 @@ namespace Server.Misc
useHaven = true;
// ReSharper disable once CA1806
new BadStartMessage(m, 1062205);
/*
* Unfortunately you are playing on a *NON-Age-Of-Shadows* game
* installation and cannot be transported to Malas.
* You will not be able to take your new player quest in Malas
* without an AOS client. You are now being taken to the city of
* Haven on the Trammel facet.
* */
*/
Timer.DelayCall(BadStartMessageDelay, from => from.SendLocalizedMessage(1062205), m);
break;
}
@ -819,15 +758,14 @@ namespace Server.Misc
useHaven = true;
// ReSharper disable once CA1806
new BadStartMessage(m, 1063487);
/*
* Unfortunately you are playing on a *NON-Samurai-Empire* game
* installation and cannot be transported to Tokuno.
* You will not be able to take your new player quest in Tokuno
* without an SE client. You are now being taken to the city of
* Haven on the Trammel facet.
* */
*/
Timer.DelayCall(BadStartMessageDelay, from => from.SendLocalizedMessage(1063487), m);
break;
}
@ -840,25 +778,20 @@ namespace Server.Misc
useHaven = true;
new BadStartMessage(m, 1063487);
/*
* Unfortunately you are playing on a *NON-Samurai-Empire* game
* installation and cannot be transported to Tokuno.
* You will not be able to take your new player quest in Tokuno
* without an SE client. You are now being taken to the city of
* Haven on the Trammel facet.
* */
*/
Timer.DelayCall(BadStartMessageDelay, from => from.SendLocalizedMessage(1063487), m);
break;
}
}
if (useHaven)
{
return m_NewHavenInfo;
}
return args.City;
return useHaven ? m_NewHavenInfo : args.City;
}
private static void FixStats(ref int str, ref int dex, ref int intel, int max)
@ -1890,22 +1823,4 @@ namespace Server.Misc
}
}
}
internal class BadStartMessage : Timer
{
private readonly int m_Message;
private readonly Mobile m_Mobile;
public BadStartMessage(Mobile m, int message) : base(TimeSpan.FromSeconds(3.5))
{
m_Mobile = m;
m_Message = message;
Start();
}
protected override void OnTick()
{
m_Mobile.SendLocalizedMessage(m_Message);
}
}
}

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

@ -126,7 +126,7 @@ namespace Server.SkillHandlers
}
else
{
(targeted as Item)?.SendLocalizedMessageTo(from, 500323, ""); // Only living things have anatomies!
(targeted as Item)?.SendLocalizedMessageTo(from, 500323); // Only living things have anatomies!
}
}
}

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

@ -106,8 +106,7 @@ namespace Server.SkillHandlers
{
(targeted as Item)?.SendLocalizedMessageTo(
from,
500908,
""
500908
); // It looks smarter than a rock, but dumber than a piece of wood.
}
}