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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs
View file

@ -99,7 +99,7 @@ namespace Server.Engines.Quests.Hag
public override void OnRead()
{
System.AddObjective(new FindIngredientObjective(new Ingredient[0]));
System.AddObjective(new FindIngredientObjective(global::System.Array.Empty<Ingredient>()));
}
}
@ -282,4 +282,4 @@ namespace Server.Engines.Quests.Hag
public override bool Logged => false;
}
}
}

8
Projects/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs
View file

@ -24,7 +24,7 @@ namespace Server.Engines.Quests.Hag
public class IngredientInfo
{
private static IngredientInfo[] m_Table =
private static readonly IngredientInfo[] m_Table =
{
// sheep liver
new IngredientInfo(1055020, 5, typeof(Sheep)),
@ -65,11 +65,11 @@ namespace Server.Engines.Quests.Hag
Quantity = quantity;
}
public int Name{ get; }
public int Name { get; }
public Type[] Creatures{ get; }
public Type[] Creatures { get; }
public int Quantity{ get; }
public int Quantity { get; }
public static IngredientInfo Get(Ingredient ingredient)
{

4
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/HagCauldron.cs
View file

@ -7,10 +7,10 @@ namespace Server.Items
{
AddonComponent pot;
pot = new AddonComponent(2420);
AddComponent(pot, 0, 0, 0); //pot w/ support
AddComponent(pot, 0, 0, 0); // pot w/ support
AddonComponent fire;
fire = new AddonComponent(4012); //fire pit
fire = new AddonComponent(4012); // fire pit
fire.Light = LightType.Circle150;
AddComponent(fire, 0, 0, 0);
}

6
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/HagStew.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
stew = new AddonComponent(2416);
stew.Name = "stew";
stew.Visible = true;
AddComponent(stew, 0, 0, -7); //stew
AddComponent(stew, 0, 0, -7); // stew
}
public HagStew(Serial serial) : base(serial)
@ -28,7 +28,7 @@ namespace Server.Items
{
stew.Visible = false;
BreadLoaf hagstew = new BreadLoaf(); //this decides your fillrate
BreadLoaf hagstew = new BreadLoaf(); // this decides your fillrate
hagstew.Eat(from);
Timer m_timer = new ShowStew(stew);
@ -52,7 +52,7 @@ namespace Server.Items
public class ShowStew : Timer
{
private AddonComponent stew;
private readonly AddonComponent stew;
public ShowStew(AddonComponent ac) : base(TimeSpan.FromSeconds(30))
{

18
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs
View file

@ -18,7 +18,7 @@ namespace Server.Engines.Quests.Hag
public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure
[CommandProperty(AccessLevel.GameMaster)]
public int Uses{ get; set; }
public int Uses { get; set; }
public override void OnDoubleClick(Mobile from)
{
@ -66,15 +66,15 @@ namespace Server.Engines.Quests.Hag
switch (version)
{
case 1:
{
Uses = reader.ReadEncodedInt();
break;
}
{
Uses = reader.ReadEncodedInt();
break;
}
case 0:
{
Uses = 20;
break;
}
{
Uses = 20;
break;
}
}
}
}

2
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs
View file

@ -32,7 +32,7 @@ namespace Server.Engines.Quests.Hag
FindZeefzorpulObjective obj = qs.FindObjective<FindZeefzorpulObjective>();
if (obj?.Completed == false)
{
if (player.Map != Map.Trammel && player.Map != Map.Felucca || !player.InRange(obj.ImpLocation, 8))
if ((player.Map != Map.Trammel && player.Map != Map.Felucca) || !player.InRange(obj.ImpLocation, 8))
{
player.SendLocalizedMessage(
1055053); // Nothing happens. Zeefzorpul must not be hiding in this area.

3
Projects/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs
View file

@ -159,8 +159,7 @@ namespace Server.Engines.Quests.Hag
{
bool gainedPath = false;
if (VirtueHelper.Award(player, VirtueName.Sacrifice, 250, ref gainedPath)
) // TODO: Check amount on OSI.
if (VirtueHelper.Award(player, VirtueName.Sacrifice, 250, ref gainedPath)) // TODO: Check amount on OSI.
player.SendLocalizedMessage(1054160); // You have gained in sacrifice.
PlaySound(0x253);

28
Projects/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Hag
{
public class FindApprenticeObjective : QuestObjective
{
private static Point3D[] m_CorpseLocations =
private static readonly Point3D[] m_CorpseLocations =
{
new Point3D(778, 1158, 0),
new Point3D(698, 1443, 0),
@ -29,7 +29,7 @@ namespace Server.Engines.Quests.Hag
public override object Message => 1055014;
public Corpse Corpse{ get; private set; }
public Corpse Corpse { get; private set; }
private static Point3D RandomCorpseLocation()
{
@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Hag
PlayerMobile player = System.From;
Map map = player.Map;
if (Corpse?.Deleted == false || map != Map.Trammel && map != Map.Felucca ||
if (Corpse?.Deleted == false || (map != Map.Trammel && map != Map.Felucca) ||
!player.InRange(m_CorpseLocation, 8))
return;
@ -85,15 +85,15 @@ namespace Server.Engines.Quests.Hag
switch (version)
{
case 1:
{
m_CorpseLocation = reader.ReadPoint3D();
goto case 0;
}
{
m_CorpseLocation = reader.ReadPoint3D();
goto case 0;
}
case 0:
{
Corpse = (Corpse)reader.ReadItem();
break;
}
{
Corpse = (Corpse)reader.ReadItem();
break;
}
}
if (version == 0)
@ -197,7 +197,7 @@ namespace Server.Engines.Quests.Hag
public override object Message => 1055017;
public Point3D ImpLocation{ get; private set; }
public Point3D ImpLocation { get; private set; }
public override void OnComplete()
{
@ -322,11 +322,11 @@ namespace Server.Engines.Quests.Hag
}
}
public Ingredient[] Ingredients{ get; private set; }
public Ingredient[] Ingredients { get; private set; }
public Ingredient Ingredient => Ingredients[Ingredients.Length - 1];
public int Step => Ingredients.Length;
public bool BlackheartMet{ get; private set; }
public bool BlackheartMet { get; private set; }
public override void RenderProgress(BaseQuestGump gump)
{

4
Projects/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Hag
{
public class WitchApprenticeQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable =
private static readonly Type[] m_TypeReferenceTable =
{
typeof(FindApprenticeObjective),
typeof(FindGrizeldaAboutMurderObjective),
@ -31,7 +31,7 @@ namespace Server.Engines.Quests.Hag
typeof(RecentlyFinishedConversation)
};
private static Point3D[] m_ZeefzorpulLocations =
private static readonly Point3D[] m_ZeefzorpulLocations =
{
new Point3D(1226, 1573, 0),
new Point3D(1929, 1148, 0),