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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Engines/Craft/Core/CraftContext.cs
View file

@ -19,11 +19,21 @@ namespace Server.Engines.Craft
private CraftMarkOption m_MarkOption;
public List<CraftItem> Items => m_Items;
public int LastResourceIndex{ get{ return m_LastResourceIndex; } set{ m_LastResourceIndex = value; } }
public int LastResourceIndex2{ get{ return m_LastResourceIndex2; } set{ m_LastResourceIndex2 = value; } }
public int LastGroupIndex{ get{ return m_LastGroupIndex; } set{ m_LastGroupIndex = value; } }
public bool DoNotColor{ get{ return m_DoNotColor; } set{ m_DoNotColor = value; } }
public CraftMarkOption MarkOption{ get{ return m_MarkOption; } set{ m_MarkOption = value; } }
public int LastResourceIndex{ get => m_LastResourceIndex;
set => m_LastResourceIndex = value;
}
public int LastResourceIndex2{ get => m_LastResourceIndex2;
set => m_LastResourceIndex2 = value;
}
public int LastGroupIndex{ get => m_LastGroupIndex;
set => m_LastGroupIndex = value;
}
public bool DoNotColor{ get => m_DoNotColor;
set => m_DoNotColor = value;
}
public CraftMarkOption MarkOption{ get => m_MarkOption;
set => m_MarkOption = value;
}
public CraftContext()
{

15
Scripts/Engines/Craft/Core/CraftGroup.cs
View file

@ -19,19 +19,10 @@ namespace Server.Engines.Craft
m_arCraftItem.Add( craftItem );
}
public CraftItemCol CraftItems
{
get { return m_arCraftItem; }
}
public CraftItemCol CraftItems => m_arCraftItem;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
}
}

88
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -49,24 +49,21 @@ namespace Server.Engines.Craft
public bool ForceNonExceptional
{
get { return m_ForceNonExceptional; }
set { m_ForceNonExceptional = value; }
get => m_ForceNonExceptional;
set => m_ForceNonExceptional = value;
}
private Expansion m_RequiredExpansion;
public Expansion RequiredExpansion
{
get { return m_RequiredExpansion; }
set { m_RequiredExpansion = value; }
get => m_RequiredExpansion;
set => m_RequiredExpansion = value;
}
private Recipe m_Recipe;
public Recipe Recipe
{
get { return m_Recipe; }
}
public Recipe Recipe => m_Recipe;
public void AddRecipe( int id, CraftSystem system )
{
@ -148,8 +145,8 @@ namespace Server.Engines.Craft
public BeverageType RequiredBeverage
{
get { return m_RequiredBeverage; }
set { m_RequiredBeverage = value; }
get => m_RequiredBeverage;
set => m_RequiredBeverage = value;
}
public void AddRes( Type type, TextDefinition name, int amount )
@ -172,92 +169,71 @@ namespace Server.Engines.Craft
public int Mana
{
get { return m_Mana; }
set { m_Mana = value; }
get => m_Mana;
set => m_Mana = value;
}
public int Hits
{
get { return m_Hits; }
set { m_Hits = value; }
get => m_Hits;
set => m_Hits = value;
}
public int Stam
{
get { return m_Stam; }
set { m_Stam = value; }
get => m_Stam;
set => m_Stam = value;
}
public bool UseSubRes2
{
get { return m_UseSubRes2; }
set { m_UseSubRes2 = value; }
get => m_UseSubRes2;
set => m_UseSubRes2 = value;
}
public bool UseAllRes
{
get { return m_UseAllRes; }
set { m_UseAllRes = value; }
get => m_UseAllRes;
set => m_UseAllRes = value;
}
public bool NeedHeat
{
get { return m_NeedHeat; }
set { m_NeedHeat = value; }
get => m_NeedHeat;
set => m_NeedHeat = value;
}
public bool NeedOven
{
get { return m_NeedOven; }
set { m_NeedOven = value; }
get => m_NeedOven;
set => m_NeedOven = value;
}
public bool NeedMill
{
get { return m_NeedMill; }
set { m_NeedMill = value; }
get => m_NeedMill;
set => m_NeedMill = value;
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public int ItemHue
{
get { return m_ItemHue; }
set { m_ItemHue = value; }
get => m_ItemHue;
set => m_ItemHue = value;
}
public string GroupNameString
{
get { return m_GroupNameString; }
}
public string GroupNameString => m_GroupNameString;
public int GroupNameNumber
{
get { return m_GroupNameNumber; }
}
public int GroupNameNumber => m_GroupNameNumber;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public CraftResCol Resources
{
get { return m_arCraftRes; }
}
public CraftResCol Resources => m_arCraftRes;
public CraftSkillCol Skills
{
get { return m_arCraftSkill; }
}
public CraftSkillCol Skills => m_arCraftSkill;
public bool ConsumeAttributes( Mobile from, ref object message, bool consume )
{

2
Scripts/Engines/Craft/Core/CraftItemIDAttribute.cs
View file

@ -7,7 +7,7 @@ namespace Server.Engines.Craft
{
private int m_ItemID;
public int ItemID{ get{ return m_ItemID; } }
public int ItemID => m_ItemID;
public CraftItemIDAttribute( int itemID )
{

30
Scripts/Engines/Craft/Core/CraftRes.cs
View file

@ -38,34 +38,16 @@ namespace Server.Engines.Craft
from.SendLocalizedMessage( 502925 ); // You don't have the resources required to make that item.
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public string MessageString
{
get { return m_MessageString; }
}
public string MessageString => m_MessageString;
public int MessageNumber
{
get { return m_MessageNumber; }
}
public int MessageNumber => m_MessageNumber;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public int Amount
{
get { return m_Amount; }
}
public int Amount => m_Amount;
}
}

15
Scripts/Engines/Craft/Core/CraftSkill.cs
View file

@ -13,19 +13,10 @@ namespace Server.Engines.Craft
m_MaxSkill = maxSkill;
}
public SkillName SkillToMake
{
get { return m_SkillToMake; }
}
public SkillName SkillToMake => m_SkillToMake;
public double MinSkill
{
get { return m_MinSkill; }
}
public double MinSkill => m_MinSkill;
public double MaxSkill
{
get { return m_MaxSkill; }
}
public double MaxSkill => m_MaxSkill;
}
}

30
Scripts/Engines/Craft/Core/CraftSubRes.cs
View file

@ -25,34 +25,16 @@ namespace Server.Engines.Craft
m_Message = message;
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public int GenericNameNumber
{
get { return m_GenericNameNumber; }
}
public int GenericNameNumber => m_GenericNameNumber;
public object Message
{
get { return m_Message; }
}
public object Message => m_Message;
public double RequiredSkill
{
get { return m_ReqSkill; }
}
public double RequiredSkill => m_ReqSkill;
}
}

16
Scripts/Engines/Craft/Core/CraftSubResCol.cs
View file

@ -11,26 +11,26 @@ namespace Server.Engines.Craft
public bool Init
{
get { return m_Init; }
set { m_Init = value; }
get => m_Init;
set => m_Init = value;
}
public Type ResType
{
get { return m_Type; }
set { m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public string NameString
{
get { return m_NameString; }
set { m_NameString = value; }
get => m_NameString;
set => m_NameString = value;
}
public int NameNumber
{
get { return m_NameNumber; }
set { m_NameNumber = value; }
get => m_NameNumber;
set => m_NameNumber = value;
}
public CraftSubResCol()

22
Scripts/Engines/Craft/Core/CraftSystem.cs
View file

@ -40,10 +40,10 @@ namespace Server.Engines.Craft
public abstract SkillName MainSkill{ get; }
public virtual int GumpTitleNumber{ get{ return 0; } }
public virtual string GumpTitleString{ get{ return ""; } }
public virtual int GumpTitleNumber => 0;
public virtual string GumpTitleString => "";
public virtual CraftECA ECA{ get{ return CraftECA.ChanceMinusSixty; } }
public virtual CraftECA ECA => CraftECA.ChanceMinusSixty;
private Dictionary<Mobile, CraftContext> m_ContextTable = new Dictionary<Mobile, CraftContext>();
@ -83,26 +83,26 @@ namespace Server.Engines.Craft
public bool Resmelt
{
get { return m_Resmelt; }
set { m_Resmelt = value; }
get => m_Resmelt;
set => m_Resmelt = value;
}
public bool Repair
{
get{ return m_Repair; }
set{ m_Repair = value; }
get => m_Repair;
set => m_Repair = value;
}
public bool MarkOption
{
get{ return m_MarkOption; }
set{ m_MarkOption = value; }
get => m_MarkOption;
set => m_MarkOption = value;
}
public bool CanEnhance
{
get{ return m_CanEnhance; }
set{ m_CanEnhance = value; }
get => m_CanEnhance;
set => m_CanEnhance = value;
}
public CraftSystem( int minCraftEffect, int maxCraftEffect, double delay )

12
Scripts/Engines/Craft/Core/CustomCraft.cs
View file

@ -12,12 +12,12 @@ namespace Server.Engines.Craft
private BaseTool m_Tool;
private int m_Quality;
public Mobile From{ get{ return m_From; } }
public CraftItem CraftItem{ get{ return m_CraftItem; } }
public CraftSystem CraftSystem{ get{ return m_CraftSystem; } }
public Type TypeRes{ get{ return m_TypeRes; } }
public BaseTool Tool{ get{ return m_Tool; } }
public int Quality{ get{ return m_Quality; } }
public Mobile From => m_From;
public CraftItem CraftItem => m_CraftItem;
public CraftSystem CraftSystem => m_CraftSystem;
public Type TypeRes => m_TypeRes;
public BaseTool Tool => m_Tool;
public int Quality => m_Quality;
public CustomCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality )
{

15
Scripts/Engines/Craft/Core/Recipes.cs
View file

@ -68,30 +68,27 @@ namespace Server.Engines.Craft
public static Dictionary<int, Recipe> Recipes => m_Recipes;
private static int m_LargestRecipeID;
public static int LargestRecipeID{ get{ return m_LargestRecipeID; } }
public static int LargestRecipeID => m_LargestRecipeID;
private CraftSystem m_System;
public CraftSystem CraftSystem
{
get { return m_System; }
set { m_System = value; }
get => m_System;
set => m_System = value;
}
private CraftItem m_CraftItem;
public CraftItem CraftItem
{
get { return m_CraftItem; }
set { m_CraftItem = value; }
get => m_CraftItem;
set => m_CraftItem = value;
}
private int m_ID;
public int ID
{
get { return m_ID; }
}
public int ID => m_ID;
private TextDefinition m_TD;
public TextDefinition TextDefinition

10
Scripts/Engines/Craft/DefAlchemy.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefAlchemy : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Alchemy; }
}
public override SkillName MainSkill => SkillName.Alchemy;
public override int GumpTitleNumber
{
get { return 1044001; } // <CENTER>ALCHEMY MENU</CENTER>
}
public override int GumpTitleNumber => 1044001;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefBlacksmithy.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefBlacksmithy : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Blacksmith; }
}
public override SkillName MainSkill => SkillName.Blacksmith;
public override int GumpTitleNumber
{
get { return 1044002; } // <CENTER>BLACKSMITHY MENU</CENTER>
}
public override int GumpTitleNumber => 1044002;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefBowFletching.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefBowFletching : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Fletching; }
}
public override SkillName MainSkill => SkillName.Fletching;
public override int GumpTitleNumber
{
get { return 1044006; } // <CENTER>BOWCRAFT AND FLETCHING MENU</CENTER>
}
public override int GumpTitleNumber => 1044006;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefCarpentry.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCarpentry : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Carpentry; }
}
public override SkillName MainSkill => SkillName.Carpentry;
public override int GumpTitleNumber
{
get { return 1044004; } // <CENTER>CARPENTRY MENU</CENTER>
}
public override int GumpTitleNumber => 1044004;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefCartography.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCartography : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Cartography; }
}
public override SkillName MainSkill => SkillName.Cartography;
public override int GumpTitleNumber
{
get { return 1044008; } // <CENTER>CARTOGRAPHY MENU</CENTER>
}
public override int GumpTitleNumber => 1044008;
public override double GetChanceAtMin( CraftItem item )
{

10
Scripts/Engines/Craft/DefCooking.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCooking : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Cooking; }
}
public override SkillName MainSkill => SkillName.Cooking;
public override int GumpTitleNumber
{
get { return 1044003; } // <CENTER>COOKING MENU</CENTER>
}
public override int GumpTitleNumber => 1044003;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefGlassblowing.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefGlassblowing : CraftSystem
{
public override SkillName MainSkill
{
get{ return SkillName.Alchemy; }
}
public override SkillName MainSkill => SkillName.Alchemy;
public override int GumpTitleNumber
{
get{ return 1044622; } // <CENTER>Glassblowing MENU</CENTER>
}
public override int GumpTitleNumber => 1044622;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefInscription.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefInscription : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Inscribe; }
}
public override SkillName MainSkill => SkillName.Inscribe;
public override int GumpTitleNumber
{
get { return 1044009; } // <CENTER>INSCRIPTION MENU</CENTER>
}
public override int GumpTitleNumber => 1044009;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefMasonry.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefMasonry : CraftSystem
{
public override SkillName MainSkill
{
get{ return SkillName.Carpentry; }
}
public override SkillName MainSkill => SkillName.Carpentry;
public override int GumpTitleNumber
{
get{ return 1044500; } // <CENTER>MASONRY MENU</CENTER>
}
public override int GumpTitleNumber => 1044500;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefTailoring.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefTailoring : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Tailoring; }
}
public override SkillName MainSkill => SkillName.Tailoring;
public override int GumpTitleNumber
{
get { return 1044005; } // <CENTER>TAILORING MENU</CENTER>
}
public override int GumpTitleNumber => 1044005;
private static CraftSystem m_CraftSystem;

12
Scripts/Engines/Craft/DefTinkering.cs
View file

@ -7,15 +7,9 @@ namespace Server.Engines.Craft
{
public class DefTinkering : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Tinkering; }
}
public override SkillName MainSkill => SkillName.Tinkering;
public override int GumpTitleNumber
{
get { return 1044007; } // <CENTER>TINKERING MENU</CENTER>
}
public override int GumpTitleNumber => 1044007;
private static CraftSystem m_CraftSystem;
@ -388,7 +382,7 @@ namespace Server.Engines.Craft
{
private LockableContainer m_Container;
public LockableContainer Container{ get{ return m_Container; } }
public LockableContainer Container => m_Container;
public abstract TrapType TrapType{ get; }