Changes properties to use automatic property initializers
This commit is contained in:
Kamron Batman
parent
f0a48ad431
commit
06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
|
|
@ -11,44 +11,32 @@ namespace Server.Engines.Craft
|
|||
|
||||
public class CraftContext
|
||||
{
|
||||
private List<CraftItem> m_Items;
|
||||
private int m_LastResourceIndex;
|
||||
private int m_LastResourceIndex2;
|
||||
private int m_LastGroupIndex;
|
||||
private bool m_DoNotColor;
|
||||
private CraftMarkOption m_MarkOption;
|
||||
public List<CraftItem> Items { get; }
|
||||
|
||||
public List<CraftItem> Items => m_Items;
|
||||
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 int LastResourceIndex { get; set; }
|
||||
|
||||
public int LastResourceIndex2 { get; set; }
|
||||
|
||||
public int LastGroupIndex { get; set; }
|
||||
|
||||
public bool DoNotColor { get; set; }
|
||||
|
||||
public CraftMarkOption MarkOption { get; set; }
|
||||
|
||||
public CraftContext()
|
||||
{
|
||||
m_Items = new List<CraftItem>();
|
||||
m_LastResourceIndex = -1;
|
||||
m_LastResourceIndex2 = -1;
|
||||
m_LastGroupIndex = -1;
|
||||
Items = new List<CraftItem>();
|
||||
LastResourceIndex = -1;
|
||||
LastResourceIndex2 = -1;
|
||||
LastGroupIndex = -1;
|
||||
}
|
||||
|
||||
public CraftItem LastMade
|
||||
{
|
||||
get
|
||||
{
|
||||
if ( m_Items.Count > 0 )
|
||||
return m_Items[0];
|
||||
if ( Items.Count > 0 )
|
||||
return Items[0];
|
||||
|
||||
return null;
|
||||
}
|
||||
|
|
@ -56,12 +44,12 @@ namespace Server.Engines.Craft
|
|||
|
||||
public void OnMade( CraftItem item )
|
||||
{
|
||||
m_Items.Remove( item );
|
||||
Items.Remove( item );
|
||||
|
||||
if ( m_Items.Count == 10 )
|
||||
m_Items.RemoveAt( 9 );
|
||||
if ( Items.Count == 10 )
|
||||
Items.RemoveAt( 9 );
|
||||
|
||||
m_Items.Insert( 0, item );
|
||||
Items.Insert( 0, item );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,27 +2,22 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public class CraftGroup
|
||||
{
|
||||
private CraftItemCol m_arCraftItem;
|
||||
|
||||
private string m_NameString;
|
||||
private int m_NameNumber;
|
||||
|
||||
public CraftGroup( TextDefinition groupName )
|
||||
{
|
||||
m_NameNumber = groupName;
|
||||
m_NameString = groupName;
|
||||
m_arCraftItem = new CraftItemCol();
|
||||
NameNumber = groupName;
|
||||
NameString = groupName;
|
||||
CraftItems = new CraftItemCol();
|
||||
}
|
||||
|
||||
public void AddCraftItem( CraftItem craftItem )
|
||||
{
|
||||
m_arCraftItem.Add( craftItem );
|
||||
CraftItems.Add( craftItem );
|
||||
}
|
||||
|
||||
public CraftItemCol CraftItems => m_arCraftItem;
|
||||
public CraftItemCol CraftItems { get; }
|
||||
|
||||
public string NameString => m_NameString;
|
||||
public string NameString { get; }
|
||||
|
||||
public int NameNumber => m_NameNumber;
|
||||
public int NameNumber { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -19,61 +19,21 @@ namespace Server.Engines.Craft
|
|||
|
||||
public class CraftItem
|
||||
{
|
||||
private CraftResCol m_arCraftRes;
|
||||
private CraftSkillCol m_arCraftSkill;
|
||||
private Type m_Type;
|
||||
public bool ForceNonExceptional { get; set; }
|
||||
|
||||
private string m_GroupNameString;
|
||||
private int m_GroupNameNumber;
|
||||
public Expansion RequiredExpansion { get; set; }
|
||||
|
||||
private string m_NameString;
|
||||
private int m_NameNumber;
|
||||
|
||||
private int m_ItemHue;
|
||||
|
||||
private int m_Mana;
|
||||
private int m_Hits;
|
||||
private int m_Stam;
|
||||
|
||||
private BeverageType m_RequiredBeverage;
|
||||
|
||||
private bool m_UseAllRes;
|
||||
|
||||
private bool m_NeedHeat;
|
||||
private bool m_NeedOven;
|
||||
private bool m_NeedMill;
|
||||
|
||||
private bool m_UseSubRes2;
|
||||
|
||||
private bool m_ForceNonExceptional;
|
||||
|
||||
public bool ForceNonExceptional
|
||||
{
|
||||
get => m_ForceNonExceptional;
|
||||
set => m_ForceNonExceptional = value;
|
||||
}
|
||||
|
||||
private Expansion m_RequiredExpansion;
|
||||
|
||||
public Expansion RequiredExpansion
|
||||
{
|
||||
get => m_RequiredExpansion;
|
||||
set => m_RequiredExpansion = value;
|
||||
}
|
||||
|
||||
private Recipe m_Recipe;
|
||||
|
||||
public Recipe Recipe => m_Recipe;
|
||||
public Recipe Recipe { get; private set; }
|
||||
|
||||
public void AddRecipe( int id, CraftSystem system )
|
||||
{
|
||||
if ( m_Recipe != null )
|
||||
if ( Recipe != null )
|
||||
{
|
||||
Console.WriteLine( "Warning: Attempted add of recipe #{0} to the crafting of {1} in CraftSystem {2}.", id, m_Type.Name, system );
|
||||
Console.WriteLine( "Warning: Attempted add of recipe #{0} to the crafting of {1} in CraftSystem {2}.", id, ItemType.Name, system );
|
||||
return;
|
||||
}
|
||||
|
||||
m_Recipe = new Recipe( id, system, this );
|
||||
Recipe = new Recipe( id, system, this );
|
||||
}
|
||||
|
||||
public static int LabelNumber( Type type ) {
|
||||
|
|
@ -129,25 +89,21 @@ namespace Server.Engines.Craft
|
|||
|
||||
public CraftItem( Type type, TextDefinition groupName, TextDefinition name )
|
||||
{
|
||||
m_arCraftRes = new CraftResCol();
|
||||
m_arCraftSkill = new CraftSkillCol();
|
||||
Resources = new CraftResCol();
|
||||
Skills = new CraftSkillCol();
|
||||
|
||||
m_Type = type;
|
||||
ItemType = type;
|
||||
|
||||
m_GroupNameString = groupName;
|
||||
m_NameString = name;
|
||||
GroupNameString = groupName;
|
||||
NameString = name;
|
||||
|
||||
m_GroupNameNumber = groupName;
|
||||
m_NameNumber = name;
|
||||
GroupNameNumber = groupName;
|
||||
NameNumber = name;
|
||||
|
||||
m_RequiredBeverage = BeverageType.Water;
|
||||
RequiredBeverage = BeverageType.Water;
|
||||
}
|
||||
|
||||
public BeverageType RequiredBeverage
|
||||
{
|
||||
get => m_RequiredBeverage;
|
||||
set => m_RequiredBeverage = value;
|
||||
}
|
||||
public BeverageType RequiredBeverage { get; set; }
|
||||
|
||||
public void AddRes( Type type, TextDefinition name, int amount )
|
||||
{
|
||||
|
|
@ -157,83 +113,47 @@ namespace Server.Engines.Craft
|
|||
public void AddRes( Type type, TextDefinition name, int amount, TextDefinition message )
|
||||
{
|
||||
CraftRes craftRes = new CraftRes( type, name, amount, message );
|
||||
m_arCraftRes.Add( craftRes );
|
||||
Resources.Add( craftRes );
|
||||
}
|
||||
|
||||
|
||||
public void AddSkill( SkillName skillToMake, double minSkill, double maxSkill )
|
||||
{
|
||||
CraftSkill craftSkill = new CraftSkill( skillToMake, minSkill, maxSkill );
|
||||
m_arCraftSkill.Add( craftSkill );
|
||||
Skills.Add( craftSkill );
|
||||
}
|
||||
|
||||
public int Mana
|
||||
{
|
||||
get => m_Mana;
|
||||
set => m_Mana = value;
|
||||
}
|
||||
public int Mana { get; set; }
|
||||
|
||||
public int Hits
|
||||
{
|
||||
get => m_Hits;
|
||||
set => m_Hits = value;
|
||||
}
|
||||
public int Hits { get; set; }
|
||||
|
||||
public int Stam
|
||||
{
|
||||
get => m_Stam;
|
||||
set => m_Stam = value;
|
||||
}
|
||||
public int Stam { get; set; }
|
||||
|
||||
public bool UseSubRes2
|
||||
{
|
||||
get => m_UseSubRes2;
|
||||
set => m_UseSubRes2 = value;
|
||||
}
|
||||
public bool UseSubRes2 { get; set; }
|
||||
|
||||
public bool UseAllRes
|
||||
{
|
||||
get => m_UseAllRes;
|
||||
set => m_UseAllRes = value;
|
||||
}
|
||||
public bool UseAllRes { get; set; }
|
||||
|
||||
public bool NeedHeat
|
||||
{
|
||||
get => m_NeedHeat;
|
||||
set => m_NeedHeat = value;
|
||||
}
|
||||
public bool NeedHeat { get; set; }
|
||||
|
||||
public bool NeedOven
|
||||
{
|
||||
get => m_NeedOven;
|
||||
set => m_NeedOven = value;
|
||||
}
|
||||
public bool NeedOven { get; set; }
|
||||
|
||||
public bool NeedMill
|
||||
{
|
||||
get => m_NeedMill;
|
||||
set => m_NeedMill = value;
|
||||
}
|
||||
public bool NeedMill { get; set; }
|
||||
|
||||
public Type ItemType => m_Type;
|
||||
public Type ItemType { get; }
|
||||
|
||||
public int ItemHue
|
||||
{
|
||||
get => m_ItemHue;
|
||||
set => m_ItemHue = value;
|
||||
}
|
||||
public int ItemHue { get; set; }
|
||||
|
||||
public string GroupNameString => m_GroupNameString;
|
||||
public string GroupNameString { get; }
|
||||
|
||||
public int GroupNameNumber => m_GroupNameNumber;
|
||||
public int GroupNameNumber { get; }
|
||||
|
||||
public string NameString => m_NameString;
|
||||
public string NameString { get; }
|
||||
|
||||
public int NameNumber => m_NameNumber;
|
||||
public int NameNumber { get; }
|
||||
|
||||
public CraftResCol Resources => m_arCraftRes;
|
||||
public CraftResCol Resources { get; }
|
||||
|
||||
public CraftSkillCol Skills => m_arCraftSkill;
|
||||
public CraftSkillCol Skills { get; }
|
||||
|
||||
public bool ConsumeAttributes( Mobile from, ref object message, bool consume )
|
||||
{
|
||||
|
|
@ -355,7 +275,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
public bool IsMarkable( Type type )
|
||||
{
|
||||
if ( m_ForceNonExceptional ) //Don't even display the stuff for marking if it can't ever be exceptional.
|
||||
if ( ForceNonExceptional ) //Don't even display the stuff for marking if it can't ever be exceptional.
|
||||
return false;
|
||||
|
||||
for ( int i = 0; i < m_MarkableTable.Length; ++i )
|
||||
|
|
@ -390,7 +310,7 @@ namespace Server.Engines.Craft
|
|||
if ( system.RetainsColorFrom( this, type ) )
|
||||
return true;
|
||||
|
||||
bool inItemTable = RetainsColor( m_Type );
|
||||
bool inItemTable = RetainsColor( ItemType );
|
||||
|
||||
if ( !inItemTable )
|
||||
return false;
|
||||
|
|
@ -492,7 +412,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
else
|
||||
{
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != m_RequiredBeverage )
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != RequiredBeverage )
|
||||
continue;
|
||||
|
||||
totals[i] += hq.Quantity;
|
||||
|
|
@ -528,7 +448,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
else
|
||||
{
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != m_RequiredBeverage )
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != RequiredBeverage )
|
||||
continue;
|
||||
|
||||
int theirAmount = hq.Quantity;
|
||||
|
|
@ -564,7 +484,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
else
|
||||
{
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != m_RequiredBeverage )
|
||||
if ( hq is BaseBeverage beverage && beverage.Content != RequiredBeverage )
|
||||
continue;
|
||||
|
||||
amount += hq.Quantity;
|
||||
|
|
@ -586,34 +506,34 @@ namespace Server.Engines.Craft
|
|||
if ( ourPack == null )
|
||||
return false;
|
||||
|
||||
if ( m_NeedHeat && !Find( from, m_HeatSources ) )
|
||||
if ( NeedHeat && !Find( from, m_HeatSources ) )
|
||||
{
|
||||
message = 1044487; // You must be near a fire source to cook.
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( m_NeedOven && !Find( from, m_Ovens ) )
|
||||
if ( NeedOven && !Find( from, m_Ovens ) )
|
||||
{
|
||||
message = 1044493; // You must be near an oven to bake that.
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( m_NeedMill && !Find( from, m_Mills ) )
|
||||
if ( NeedMill && !Find( from, m_Mills ) )
|
||||
{
|
||||
message = 1044491; // You must be near a flour mill to do that.
|
||||
return false;
|
||||
}
|
||||
|
||||
Type[][] types = new Type[m_arCraftRes.Count][];
|
||||
int[] amounts = new int[m_arCraftRes.Count];
|
||||
Type[][] types = new Type[Resources.Count][];
|
||||
int[] amounts = new int[Resources.Count];
|
||||
|
||||
maxAmount = int.MaxValue;
|
||||
|
||||
CraftSubResCol resCol = ( m_UseSubRes2 ? craftSystem.CraftSubRes2 : craftSystem.CraftSubRes );
|
||||
CraftSubResCol resCol = ( UseSubRes2 ? craftSystem.CraftSubRes2 : craftSystem.CraftSubRes );
|
||||
|
||||
for ( int i = 0; i < types.Length; ++i )
|
||||
{
|
||||
CraftRes craftRes = m_arCraftRes.GetAt( i );
|
||||
CraftRes craftRes = Resources.GetAt( i );
|
||||
Type baseType = craftRes.ItemType;
|
||||
|
||||
// Resource Mutation
|
||||
|
|
@ -653,7 +573,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
if ( maxAmount == 0 )
|
||||
{
|
||||
CraftRes res = m_arCraftRes.GetAt( i );
|
||||
CraftRes res = Resources.GetAt( i );
|
||||
|
||||
if ( res.MessageNumber > 0 )
|
||||
message = res.MessageNumber;
|
||||
|
|
@ -683,7 +603,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
Item consumeExtra = null;
|
||||
|
||||
if ( m_NameNumber == 1041267 )
|
||||
if ( NameNumber == 1041267 )
|
||||
{
|
||||
// Runebooks are a special case, they need a blank recall rune
|
||||
|
||||
|
|
@ -782,7 +702,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
|
||||
{
|
||||
CraftRes res = m_arCraftRes.GetAt( index );
|
||||
CraftRes res = Resources.GetAt( index );
|
||||
|
||||
if ( res.MessageNumber > 0 )
|
||||
message = res.MessageNumber;
|
||||
|
|
@ -818,7 +738,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
public double GetExceptionalChance( CraftSystem system, double chance, Mobile from )
|
||||
{
|
||||
if ( m_ForceNonExceptional )
|
||||
if ( ForceNonExceptional )
|
||||
return 0.0;
|
||||
|
||||
double bonus = 0.0;
|
||||
|
|
@ -876,9 +796,9 @@ namespace Server.Engines.Craft
|
|||
|
||||
allRequiredSkills = true;
|
||||
|
||||
for ( int i = 0; i < m_arCraftSkill.Count; i++)
|
||||
for ( int i = 0; i < Skills.Count; i++)
|
||||
{
|
||||
CraftSkill craftSkill = m_arCraftSkill.GetAt(i);
|
||||
CraftSkill craftSkill = Skills.GetAt(i);
|
||||
|
||||
double minSkill = craftSkill.MinSkill;
|
||||
double maxSkill = craftSkill.MaxSkill;
|
||||
|
|
@ -927,7 +847,7 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
if ( Recipe == null || !(from is PlayerMobile) || ((PlayerMobile)from).HasRecipe( Recipe ) )
|
||||
{
|
||||
int badCraft = craftSystem.CanCraft( from, tool, m_Type );
|
||||
int badCraft = craftSystem.CanCraft( from, tool, ItemType );
|
||||
|
||||
if ( badCraft <= 0 )
|
||||
{
|
||||
|
|
@ -1009,7 +929,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
public void CompleteCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CustomCraft customCraft )
|
||||
{
|
||||
int badCraft = craftSystem.CanCraft( from, tool, m_Type );
|
||||
int badCraft = craftSystem.CanCraft( from, tool, ItemType );
|
||||
|
||||
if ( badCraft > 0 )
|
||||
{
|
||||
|
|
@ -1251,7 +1171,7 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
m_From.EndAction( typeof( CraftSystem ) );
|
||||
|
||||
int badCraft = m_CraftSystem.CanCraft( m_From, m_Tool, m_CraftItem.m_Type );
|
||||
int badCraft = m_CraftSystem.CanCraft( m_From, m_Tool, m_CraftItem.ItemType );
|
||||
|
||||
if ( badCraft > 0 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@ namespace Server.Engines.Craft
|
|||
[AttributeUsage( AttributeTargets.Class )]
|
||||
public class CraftItemIDAttribute : Attribute
|
||||
{
|
||||
private int m_ItemID;
|
||||
|
||||
public int ItemID => m_ItemID;
|
||||
public int ItemID { get; }
|
||||
|
||||
public CraftItemIDAttribute( int itemID )
|
||||
{
|
||||
m_ItemID = itemID;
|
||||
ItemID = itemID;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,50 +4,41 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public class CraftRes
|
||||
{
|
||||
private Type m_Type;
|
||||
private int m_Amount;
|
||||
|
||||
private string m_MessageString;
|
||||
private int m_MessageNumber;
|
||||
|
||||
private string m_NameString;
|
||||
private int m_NameNumber;
|
||||
|
||||
public CraftRes( Type type, int amount )
|
||||
{
|
||||
m_Type = type;
|
||||
m_Amount = amount;
|
||||
ItemType = type;
|
||||
Amount = amount;
|
||||
}
|
||||
|
||||
public CraftRes( Type type, TextDefinition name, int amount, TextDefinition message ): this ( type, amount )
|
||||
{
|
||||
m_NameNumber = name;
|
||||
m_MessageNumber = message;
|
||||
NameNumber = name;
|
||||
MessageNumber = message;
|
||||
|
||||
m_NameString = name;
|
||||
m_MessageString = message;
|
||||
NameString = name;
|
||||
MessageString = message;
|
||||
}
|
||||
|
||||
public void SendMessage( Mobile from )
|
||||
{
|
||||
if ( m_MessageNumber > 0 )
|
||||
from.SendLocalizedMessage( m_MessageNumber );
|
||||
else if ( !string.IsNullOrEmpty( m_MessageString ) )
|
||||
from.SendMessage( m_MessageString );
|
||||
if ( MessageNumber > 0 )
|
||||
from.SendLocalizedMessage( MessageNumber );
|
||||
else if ( !string.IsNullOrEmpty( MessageString ) )
|
||||
from.SendMessage( MessageString );
|
||||
else
|
||||
from.SendLocalizedMessage( 502925 ); // You don't have the resources required to make that item.
|
||||
}
|
||||
|
||||
public Type ItemType => m_Type;
|
||||
public Type ItemType { get; }
|
||||
|
||||
public string MessageString => m_MessageString;
|
||||
public string MessageString { get; }
|
||||
|
||||
public int MessageNumber => m_MessageNumber;
|
||||
public int MessageNumber { get; }
|
||||
|
||||
public string NameString => m_NameString;
|
||||
public string NameString { get; }
|
||||
|
||||
public int NameNumber => m_NameNumber;
|
||||
public int NameNumber { get; }
|
||||
|
||||
public int Amount => m_Amount;
|
||||
public int Amount { get; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,21 +2,17 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public class CraftSkill
|
||||
{
|
||||
private SkillName m_SkillToMake;
|
||||
private double m_MinSkill;
|
||||
private double m_MaxSkill;
|
||||
|
||||
public CraftSkill( SkillName skillToMake, double minSkill, double maxSkill )
|
||||
{
|
||||
m_SkillToMake = skillToMake;
|
||||
m_MinSkill = minSkill;
|
||||
m_MaxSkill = maxSkill;
|
||||
SkillToMake = skillToMake;
|
||||
MinSkill = minSkill;
|
||||
MaxSkill = maxSkill;
|
||||
}
|
||||
|
||||
public SkillName SkillToMake => m_SkillToMake;
|
||||
public SkillName SkillToMake { get; }
|
||||
|
||||
public double MinSkill => m_MinSkill;
|
||||
public double MinSkill { get; }
|
||||
|
||||
public double MaxSkill => m_MaxSkill;
|
||||
public double MaxSkill { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -4,37 +4,30 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public class CraftSubRes
|
||||
{
|
||||
private Type m_Type;
|
||||
private double m_ReqSkill;
|
||||
private string m_NameString;
|
||||
private int m_NameNumber;
|
||||
private int m_GenericNameNumber;
|
||||
private object m_Message;
|
||||
|
||||
public CraftSubRes( Type type, TextDefinition name, double reqSkill, object message ) : this( type, name, reqSkill, 0, message )
|
||||
{
|
||||
}
|
||||
|
||||
public CraftSubRes( Type type, TextDefinition name, double reqSkill, int genericNameNumber, object message )
|
||||
{
|
||||
m_Type = type;
|
||||
m_NameNumber = name;
|
||||
m_NameString = name;
|
||||
m_ReqSkill = reqSkill;
|
||||
m_GenericNameNumber = genericNameNumber;
|
||||
m_Message = message;
|
||||
ItemType = type;
|
||||
NameNumber = name;
|
||||
NameString = name;
|
||||
RequiredSkill = reqSkill;
|
||||
GenericNameNumber = genericNameNumber;
|
||||
Message = message;
|
||||
}
|
||||
|
||||
public Type ItemType => m_Type;
|
||||
public Type ItemType { get; }
|
||||
|
||||
public string NameString => m_NameString;
|
||||
public string NameString { get; }
|
||||
|
||||
public int NameNumber => m_NameNumber;
|
||||
public int NameNumber { get; }
|
||||
|
||||
public int GenericNameNumber => m_GenericNameNumber;
|
||||
public int GenericNameNumber { get; }
|
||||
|
||||
public object Message => m_Message;
|
||||
public object Message { get; }
|
||||
|
||||
public double RequiredSkill => m_ReqSkill;
|
||||
public double RequiredSkill { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -4,38 +4,17 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public class CraftSubResCol : System.Collections.CollectionBase
|
||||
{
|
||||
private Type m_Type;
|
||||
private string m_NameString;
|
||||
private int m_NameNumber;
|
||||
private bool m_Init;
|
||||
public bool Init { get; set; }
|
||||
|
||||
public bool Init
|
||||
{
|
||||
get => m_Init;
|
||||
set => m_Init = value;
|
||||
}
|
||||
|
||||
public Type ResType
|
||||
{
|
||||
get => m_Type;
|
||||
set => m_Type = value;
|
||||
}
|
||||
public Type ResType { get; set; }
|
||||
|
||||
public string NameString
|
||||
{
|
||||
get => m_NameString;
|
||||
set => m_NameString = value;
|
||||
}
|
||||
public string NameString { get; set; }
|
||||
|
||||
public int NameNumber
|
||||
{
|
||||
get => m_NameNumber;
|
||||
set => m_NameNumber = value;
|
||||
}
|
||||
public int NameNumber { get; set; }
|
||||
|
||||
public CraftSubResCol()
|
||||
{
|
||||
m_Init = false;
|
||||
Init = false;
|
||||
}
|
||||
|
||||
public void Add( CraftSubRes craftSubRes )
|
||||
|
|
|
|||
|
|
@ -13,30 +13,22 @@ namespace Server.Engines.Craft
|
|||
|
||||
public abstract class CraftSystem
|
||||
{
|
||||
private int m_MinCraftEffect;
|
||||
private int m_MaxCraftEffect;
|
||||
private double m_Delay;
|
||||
private bool m_Resmelt;
|
||||
private bool m_Repair;
|
||||
private bool m_MarkOption;
|
||||
private bool m_CanEnhance;
|
||||
|
||||
private CraftItemCol m_CraftItems;
|
||||
private CraftGroupCol m_CraftGroups;
|
||||
private CraftSubResCol m_CraftSubRes;
|
||||
private CraftSubResCol m_CraftSubRes2;
|
||||
|
||||
private List<int> m_Recipes;
|
||||
private List<int> m_RareRecipes;
|
||||
|
||||
public int MinCraftEffect => m_MinCraftEffect;
|
||||
public int MaxCraftEffect => m_MaxCraftEffect;
|
||||
public double Delay => m_Delay;
|
||||
public int MinCraftEffect { get; }
|
||||
|
||||
public CraftItemCol CraftItems => m_CraftItems;
|
||||
public CraftGroupCol CraftGroups => m_CraftGroups;
|
||||
public CraftSubResCol CraftSubRes => m_CraftSubRes;
|
||||
public CraftSubResCol CraftSubRes2 => m_CraftSubRes2;
|
||||
public int MaxCraftEffect { get; }
|
||||
|
||||
public double Delay { get; }
|
||||
|
||||
public CraftItemCol CraftItems { get; }
|
||||
|
||||
public CraftGroupCol CraftGroups { get; }
|
||||
|
||||
public CraftSubResCol CraftSubRes { get; }
|
||||
|
||||
public CraftSubResCol CraftSubRes2 { get; }
|
||||
|
||||
public abstract SkillName MainSkill{ get; }
|
||||
|
||||
|
|
@ -80,40 +72,24 @@ namespace Server.Engines.Craft
|
|||
c?.OnMade( item );
|
||||
}
|
||||
|
||||
public bool Resmelt
|
||||
{
|
||||
get => m_Resmelt;
|
||||
set => m_Resmelt = value;
|
||||
}
|
||||
public bool Resmelt { get; set; }
|
||||
|
||||
public bool Repair
|
||||
{
|
||||
get => m_Repair;
|
||||
set => m_Repair = value;
|
||||
}
|
||||
public bool Repair { get; set; }
|
||||
|
||||
public bool MarkOption
|
||||
{
|
||||
get => m_MarkOption;
|
||||
set => m_MarkOption = value;
|
||||
}
|
||||
public bool MarkOption { get; set; }
|
||||
|
||||
public bool CanEnhance
|
||||
{
|
||||
get => m_CanEnhance;
|
||||
set => m_CanEnhance = value;
|
||||
}
|
||||
public bool CanEnhance { get; set; }
|
||||
|
||||
public CraftSystem( int minCraftEffect, int maxCraftEffect, double delay )
|
||||
{
|
||||
m_MinCraftEffect = minCraftEffect;
|
||||
m_MaxCraftEffect = maxCraftEffect;
|
||||
m_Delay = delay;
|
||||
MinCraftEffect = minCraftEffect;
|
||||
MaxCraftEffect = maxCraftEffect;
|
||||
Delay = delay;
|
||||
|
||||
m_CraftItems = new CraftItemCol();
|
||||
m_CraftGroups = new CraftGroupCol();
|
||||
m_CraftSubRes = new CraftSubResCol();
|
||||
m_CraftSubRes2 = new CraftSubResCol();
|
||||
CraftItems = new CraftItemCol();
|
||||
CraftGroups = new CraftGroupCol();
|
||||
CraftSubRes = new CraftSubResCol();
|
||||
CraftSubRes2 = new CraftSubResCol();
|
||||
|
||||
m_Recipes = new List<int>();
|
||||
m_RareRecipes = new List<int>();
|
||||
|
|
@ -129,7 +105,7 @@ namespace Server.Engines.Craft
|
|||
public void CreateItem( Mobile from, Type type, Type typeRes, BaseTool tool, CraftItem realCraftItem )
|
||||
{
|
||||
// Verify if the type is in the list of the craftable item
|
||||
CraftItem craftItem = m_CraftItems.SearchFor( type );
|
||||
CraftItem craftItem = CraftItems.SearchFor( type );
|
||||
if ( craftItem != null )
|
||||
{
|
||||
// The item is in the list, try to create it
|
||||
|
|
@ -178,84 +154,84 @@ namespace Server.Engines.Craft
|
|||
craftItem.AddSkill( skillToMake, minSkill, maxSkill );
|
||||
|
||||
DoGroup( group, craftItem );
|
||||
return m_CraftItems.Add( craftItem );
|
||||
return CraftItems.Add( craftItem );
|
||||
}
|
||||
|
||||
|
||||
private void DoGroup( TextDefinition groupName, CraftItem craftItem )
|
||||
{
|
||||
int index = m_CraftGroups.SearchFor( groupName );
|
||||
int index = CraftGroups.SearchFor( groupName );
|
||||
|
||||
if ( index == -1)
|
||||
{
|
||||
CraftGroup craftGroup = new CraftGroup( groupName );
|
||||
craftGroup.AddCraftItem( craftItem );
|
||||
m_CraftGroups.Add( craftGroup );
|
||||
CraftGroups.Add( craftGroup );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_CraftGroups.GetAt( index ).AddCraftItem( craftItem );
|
||||
CraftGroups.GetAt( index ).AddCraftItem( craftItem );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void SetItemHue( int index, int hue )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.ItemHue = hue;
|
||||
}
|
||||
|
||||
public void SetManaReq( int index, int mana )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.Mana = mana;
|
||||
}
|
||||
|
||||
public void SetStamReq( int index, int stam )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.Stam = stam;
|
||||
}
|
||||
|
||||
public void SetHitsReq( int index, int hits )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.Hits = hits;
|
||||
}
|
||||
|
||||
public void SetUseAllRes( int index, bool useAll )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.UseAllRes = useAll;
|
||||
}
|
||||
|
||||
public void SetNeedHeat( int index, bool needHeat )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.NeedHeat = needHeat;
|
||||
}
|
||||
|
||||
public void SetNeedOven( int index, bool needOven )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.NeedOven = needOven;
|
||||
}
|
||||
|
||||
public void SetBeverageType( int index, BeverageType requiredBeverage )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.RequiredBeverage = requiredBeverage;
|
||||
}
|
||||
|
||||
public void SetNeedMill( int index, bool needMill )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.NeedMill = needMill;
|
||||
}
|
||||
|
||||
public void SetNeededExpansion( int index, Expansion expansion )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.RequiredExpansion = expansion;
|
||||
}
|
||||
|
||||
|
|
@ -266,25 +242,25 @@ namespace Server.Engines.Craft
|
|||
|
||||
public void AddRes( int index, Type type, TextDefinition name, int amount, TextDefinition message )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.AddRes( type, name, amount, message );
|
||||
}
|
||||
|
||||
public void AddSkill( int index, SkillName skillToMake, double minSkill, double maxSkill )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt(index);
|
||||
CraftItem craftItem = CraftItems.GetAt(index);
|
||||
craftItem.AddSkill(skillToMake, minSkill, maxSkill);
|
||||
}
|
||||
|
||||
public void SetUseSubRes2( int index, bool val )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt(index);
|
||||
CraftItem craftItem = CraftItems.GetAt(index);
|
||||
craftItem.UseSubRes2 = val;
|
||||
}
|
||||
|
||||
private void AddRecipeBase( int index, int id )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.AddRecipe( id, this );
|
||||
}
|
||||
|
||||
|
|
@ -307,74 +283,74 @@ namespace Server.Engines.Craft
|
|||
|
||||
public void ForceNonExceptional( int index )
|
||||
{
|
||||
CraftItem craftItem = m_CraftItems.GetAt( index );
|
||||
CraftItem craftItem = CraftItems.GetAt( index );
|
||||
craftItem.ForceNonExceptional = true;
|
||||
}
|
||||
|
||||
|
||||
public void SetSubRes( Type type, string name )
|
||||
{
|
||||
m_CraftSubRes.ResType = type;
|
||||
m_CraftSubRes.NameString = name;
|
||||
m_CraftSubRes.Init = true;
|
||||
CraftSubRes.ResType = type;
|
||||
CraftSubRes.NameString = name;
|
||||
CraftSubRes.Init = true;
|
||||
}
|
||||
|
||||
public void SetSubRes( Type type, int name )
|
||||
{
|
||||
m_CraftSubRes.ResType = type;
|
||||
m_CraftSubRes.NameNumber = name;
|
||||
m_CraftSubRes.Init = true;
|
||||
CraftSubRes.ResType = type;
|
||||
CraftSubRes.NameNumber = name;
|
||||
CraftSubRes.Init = true;
|
||||
}
|
||||
|
||||
public void AddSubRes( Type type, int name, double reqSkill, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, message );
|
||||
m_CraftSubRes.Add( craftSubRes );
|
||||
CraftSubRes.Add( craftSubRes );
|
||||
}
|
||||
|
||||
public void AddSubRes( Type type, int name, double reqSkill, int genericName, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, genericName, message );
|
||||
m_CraftSubRes.Add( craftSubRes );
|
||||
CraftSubRes.Add( craftSubRes );
|
||||
}
|
||||
|
||||
public void AddSubRes( Type type, string name, double reqSkill, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, message );
|
||||
m_CraftSubRes.Add( craftSubRes );
|
||||
CraftSubRes.Add( craftSubRes );
|
||||
}
|
||||
|
||||
|
||||
public void SetSubRes2( Type type, string name )
|
||||
{
|
||||
m_CraftSubRes2.ResType = type;
|
||||
m_CraftSubRes2.NameString = name;
|
||||
m_CraftSubRes2.Init = true;
|
||||
CraftSubRes2.ResType = type;
|
||||
CraftSubRes2.NameString = name;
|
||||
CraftSubRes2.Init = true;
|
||||
}
|
||||
|
||||
public void SetSubRes2( Type type, int name )
|
||||
{
|
||||
m_CraftSubRes2.ResType = type;
|
||||
m_CraftSubRes2.NameNumber = name;
|
||||
m_CraftSubRes2.Init = true;
|
||||
CraftSubRes2.ResType = type;
|
||||
CraftSubRes2.NameNumber = name;
|
||||
CraftSubRes2.Init = true;
|
||||
}
|
||||
|
||||
public void AddSubRes2( Type type, int name, double reqSkill, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, message );
|
||||
m_CraftSubRes2.Add( craftSubRes );
|
||||
CraftSubRes2.Add( craftSubRes );
|
||||
}
|
||||
|
||||
public void AddSubRes2( Type type, int name, double reqSkill, int genericName, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, genericName, message );
|
||||
m_CraftSubRes2.Add( craftSubRes );
|
||||
CraftSubRes2.Add( craftSubRes );
|
||||
}
|
||||
|
||||
public void AddSubRes2( Type type, string name, double reqSkill, object message )
|
||||
{
|
||||
CraftSubRes craftSubRes = new CraftSubRes( type, name, reqSkill, message );
|
||||
m_CraftSubRes2.Add( craftSubRes );
|
||||
CraftSubRes2.Add( craftSubRes );
|
||||
}
|
||||
|
||||
public abstract void InitCraftList();
|
||||
|
|
|
|||
|
|
@ -5,28 +5,26 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
public abstract class CustomCraft
|
||||
{
|
||||
private Mobile m_From;
|
||||
private CraftItem m_CraftItem;
|
||||
private CraftSystem m_CraftSystem;
|
||||
private Type m_TypeRes;
|
||||
private BaseTool m_Tool;
|
||||
private int m_Quality;
|
||||
public Mobile From { get; }
|
||||
|
||||
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 CraftItem CraftItem { get; }
|
||||
|
||||
public CraftSystem CraftSystem { get; }
|
||||
|
||||
public Type TypeRes { get; }
|
||||
|
||||
public BaseTool Tool { get; }
|
||||
|
||||
public int Quality { get; }
|
||||
|
||||
public CustomCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality )
|
||||
{
|
||||
m_From = from;
|
||||
m_CraftItem = craftItem;
|
||||
m_CraftSystem = craftSystem;
|
||||
m_TypeRes = typeRes;
|
||||
m_Tool = tool;
|
||||
m_Quality = quality;
|
||||
From = from;
|
||||
CraftItem = craftItem;
|
||||
CraftSystem = craftSystem;
|
||||
TypeRes = typeRes;
|
||||
Tool = tool;
|
||||
Quality = quality;
|
||||
}
|
||||
|
||||
public abstract void EndCraftAction();
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace Server.Engines.Craft
|
|||
{
|
||||
if ( targeted is PlayerMobile mobile )
|
||||
{
|
||||
foreach( KeyValuePair<int, Recipe> kvp in m_Recipes )
|
||||
foreach( KeyValuePair<int, Recipe> kvp in Recipes )
|
||||
mobile.AcquireRecipe( kvp.Key );
|
||||
|
||||
m.SendMessage( "You teach them all of the recipies." );
|
||||
|
|
@ -59,32 +59,15 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
|
||||
|
||||
private static Dictionary<int, Recipe> m_Recipes = new Dictionary<int, Recipe>();
|
||||
public static Dictionary<int, Recipe> Recipes { get; } = new Dictionary<int, Recipe>();
|
||||
|
||||
public static Dictionary<int, Recipe> Recipes => m_Recipes;
|
||||
public static int LargestRecipeID { get; private set; }
|
||||
|
||||
private static int m_LargestRecipeID;
|
||||
public static int LargestRecipeID => m_LargestRecipeID;
|
||||
public CraftSystem CraftSystem { get; set; }
|
||||
|
||||
private CraftSystem m_System;
|
||||
public CraftItem CraftItem { get; set; }
|
||||
|
||||
public CraftSystem CraftSystem
|
||||
{
|
||||
get => m_System;
|
||||
set => m_System = value;
|
||||
}
|
||||
|
||||
private CraftItem m_CraftItem;
|
||||
|
||||
public CraftItem CraftItem
|
||||
{
|
||||
get => m_CraftItem;
|
||||
set => m_CraftItem = value;
|
||||
}
|
||||
|
||||
private int m_ID;
|
||||
|
||||
public int ID => m_ID;
|
||||
public int ID { get; }
|
||||
|
||||
private TextDefinition m_TD;
|
||||
public TextDefinition TextDefinition
|
||||
|
|
@ -92,7 +75,7 @@ namespace Server.Engines.Craft
|
|||
get
|
||||
{
|
||||
if ( m_TD == null )
|
||||
m_TD = new TextDefinition( m_CraftItem.NameNumber, m_CraftItem.NameString );
|
||||
m_TD = new TextDefinition( CraftItem.NameNumber, CraftItem.NameString );
|
||||
|
||||
return m_TD;
|
||||
}
|
||||
|
|
@ -100,15 +83,15 @@ namespace Server.Engines.Craft
|
|||
|
||||
public Recipe( int id, CraftSystem system, CraftItem item )
|
||||
{
|
||||
m_ID = id;
|
||||
m_System = system;
|
||||
m_CraftItem = item;
|
||||
ID = id;
|
||||
CraftSystem = system;
|
||||
CraftItem = item;
|
||||
|
||||
if ( m_Recipes.ContainsKey( id ) )
|
||||
if ( Recipes.ContainsKey( id ) )
|
||||
throw new Exception( "Attempting to create recipe with preexisting ID." );
|
||||
|
||||
m_Recipes.Add( id, this );
|
||||
m_LargestRecipeID = Math.Max( id, m_LargestRecipeID );
|
||||
Recipes.Add( id, this );
|
||||
LargestRecipeID = Math.Max( id, LargestRecipeID );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue