Commit: e59f178d54935d61280116918ded5a2bb61496ca - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: e59f178d54935d61280116918ded5a2bb61496ca (tree)
• l'heure: 2020-07-20 14:20:56
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

W.I.P. Generic Steel Item class "universal?'

Change Summary

• modified: ElementalTools/Assignments.cs
• modified: ElementalTools/ElementalTools.csproj
• delete: ElementalTools/General/ElementOfSteel.cs
• add: ElementalTools/General/FactoryOfSteel.cs
• modified: ElementalTools/General/IAmSteel.cs
• modified: ElementalTools/Helpers.cs
• delete: ElementalTools/Items/ItemTemperableMetal.cs
• add: ElementalTools/Items/SteelItem.cs

Modification

--- a/ElementalTools/Assignments.cs
+++ b/ElementalTools/Assignments.cs
@@ -3,10 +3,13 @@ using System.Collections.Generic;
 
 using System.Linq;
 using System.Threading;
+
 using Newtonsoft.Json.Linq;
+
 using Vintagestory.API.Client;
 using Vintagestory.API.Common;
 using Vintagestory.API.Config;
+using Vintagestory.GameContent;
 using Vintagestory.ServerMods;
 
 namespace ElementalTools
@@ -14,6 +17,7 @@ namespace ElementalTools
 	public partial class ElementalToolsSystem : ModSystem
 	{
 		internal const string malletItemKey = @"ItemMallet";
+		internal const string genericSteelSwordKey = @"Steel_ItemSword";
 		internal const string pack_carburizationBlockKey = @"pack_carburization";
 		internal const string pack_stateFired = @"fired";
 		internal const string malletAssetKey = @"mallet";
@@ -37,6 +41,9 @@ namespace ElementalTools
 		private void RegisterItemClasses( )
 		{
 		CoreAPI.RegisterItemClass(malletItemKey, typeof(ItemMallet));
+
+		CoreAPI.RegisterItemClass(genericSteelSwordKey, typeof(SteelItem<ItemSword>) );
+		
 		}
 
 		private void RegisterBlockClasses( )

--- a/ElementalTools/ElementalTools.csproj
+++ b/ElementalTools/ElementalTools.csproj
@@ -73,9 +73,8 @@
     <Compile Include="Block\PackCarburization.cs" />
     <Compile Include="BlockEntities\PackCarburizationEntity.cs" />
     <Compile Include="Helpers.cs" />
-    <Compile Include="Items\ItemTemperableMetal.cs" />
     <Compile Include="General\IAmSteel.cs" />
-    <Compile Include="General\ElementOfSteel.cs" />
+    <Compile Include="Items\SteelItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Items\" />
@@ -140,6 +139,7 @@
     <None Include="assets\fma\recipes\grid\remapping\blister_steel_mappings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="General\FactoryOfSteel.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/ElementalTools/General/ElementOfSteel.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-
-using Vintagestory.API.Common;
-using Vintagestory.API.Datastructures;
-using Vintagestory.API.MathTools;
-
-namespace ElementalTools
-{
-	public abstract class ElementOfSteel<T> : IAmSteel where T : CollectibleObject
-	{
-		public virtual bool Hardenable {
-			get; set;
-		}
-
-		public virtual HardnessState Hardness {
-			get; set;
-		}
-
-		public virtual bool Sharpenable {
-			get; set;
-		}
-
-		public virtual SharpnessState Sharpness {
-			get; set;
-		}
-	}
-}
-

--- /dev/null
+++ b/ElementalTools/General/FactoryOfSteel.cs
@@ -0,0 +1,61 @@
+using System;
+
+//using System.CodeDom;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Threading;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Datastructures;
+using Vintagestory.API.MathTools;
+
+
+
+
+namespace ElementalTools
+{
+	/// <summary>
+	/// Abstract Factory of (Item) Steel behavior inheriting things
+	/// </summary>
+	public static class FactoryOfSteel
+	{
+		private static Assembly thineOwnAssembly;
+		private static AssemblyName steelAssemblyName;
+		private static AssemblyBuilder stAsmBuilder;
+
+		static FactoryOfSteel()
+		{
+		thineOwnAssembly = typeof(FactoryOfSteel).Assembly;
+		AppDomain localAppDomain = Thread.GetDomain( );
+		steelAssemblyName = new AssemblyName(@"Dynamic_Steel");
+		stAsmBuilder = localAppDomain.DefineDynamicAssembly(
+							 steelAssemblyName,
+							 AssemblyBuilderAccess.RunAndCollect);//?
+		}
+
+		/// <summary>
+		/// Emit Dynamic class of specified 'ResultingClassName'.
+		/// </summary>
+		/// <param name="ResultingClassName">Resulting class name.</param>
+		public static Item ManufactureItemClass( string resultingClassName, Item original )
+		{			
+		ModuleBuilder moduleBuilder = stAsmBuilder.DefineDynamicModule(resultingClassName);
+
+		
+
+		//Item customItemClass = original.GetType( );
+
+		//Generate class & remap methods to Steely ones...
+
+		//var fWrapper = SourceItem.GetAttackPower;
+
+
+		return customItemClass;
+		}
+
+
+
+
+	}
+}
+

--- a/ElementalTools/General/IAmSteel.cs
+++ b/ElementalTools/General/IAmSteel.cs
@@ -1,15 +1,50 @@
 using System;
+
+using Vintagestory.API.Common;
+
 namespace ElementalTools
 {
 	public interface IAmSteel
 	{
-		bool Sharpenable { get; set; }
-		bool Hardenable { get; set; }
-		SharpnessState Sharpness { get; set; }//To sharpen - what unit if numerical?
-		HardnessState Hardness { get; set; }//To harden - Perhaps translate these to brinell units...
+		//Static read-only properties from Item Def.
+		string Name { get; }//Blister, Shear, Cast, Damascus...mostly descriptive
+		bool Sharpenable { get; }
+		bool Hardenable { get; }
+
+		/// <summary>
+		/// Read Sharpness; Dynamic properties from ItemStack - attribs
+		/// </summary>
+		/// <param name="someStack">Source stack.</param>
+		SharpnessState Sharpness(ItemStack someStack);
+
+		/// <summary>
+		/// Set Sharpness
+		/// </summary>
+		/// <param name="someStack">Some stack.</param>
+		/// <param name="set">Value.</param>
+		void Sharpness(ItemStack someStack, SharpnessState set);//Apply sharpen - what unit if numerical?
+
+		/// <summary>
+		/// Read Harness
+		/// </summary>
+		/// <param name="someStack">Some stack.</param>
+		HardnessState Hardness(ItemStack someStack);
+
+		/// <summary>
+		/// Set Hardness
+		/// </summary>
+		/// <param name="someStack">Some stack.</param>
+		/// <param name="set">Value.</param>
+		void Hardness(ItemStack someStack, HardnessState set);//Apply harden - Perhaps translate these to brinell units...
 
 	}
 
+	/// <summary>
+	/// "Sharpness" factor of working edge...only where applicable...relative vs. default tool/arm
+	/// </summary>
+	/// <remarks>
+	/// Affects: (GetMiningSpeed) , (GetAttackPower), (DamageItem), (OnConsumedByCrafting)
+	/// </remarks>
 	public enum SharpnessState : byte
 	{
 		Rough = 0,//Unsharpened state *Default*
@@ -20,6 +55,12 @@ namespace ElementalTools
 		Razor,
 	}
 
+	/// <summary>
+	/// The metals crystal state; changed only by tempering/quenching/annealing
+	/// </summary>
+	/// <remarks>
+	/// Reduces wear - with a penalty of random catastrophic failure...
+	/// </remarks>
 	public enum HardnessState : byte
 	{
 		Soft = 0,

--- a/ElementalTools/Helpers.cs
+++ b/ElementalTools/Helpers.cs
@@ -3,7 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+
 using Vintagestory.API.Common;
+using Vintagestory.API.Datastructures;
 
 namespace ElementalTools
 {
@@ -59,6 +61,14 @@ namespace ElementalTools
 		}
 		return originalAsset.Code;
 		}
+
+		//Why C# 7.0 ? WHY?!?!
+		public static T GetEnum<T>(this ITreeAttribute treeAttr, string keyword, T defaultValue = default(T)) where T : System.Enum
+		{
+			
+			return defaultValue;
+		}
+
 	}
 }
 

--- a/ElementalTools/Items/ItemTemperableMetal.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-using Vintagestory.API.Common;
-using Vintagestory.API.Config;
-using Vintagestory.API.MathTools;
-
-namespace ElementalTools
-{
-	public class ItemTemperableMetal : Item
-	{
-
-
-
-	}
-}
-

--- /dev/null
+++ b/ElementalTools/Items/SteelItem.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Text;
+
+using Vintagestory.API.Common;
+using Vintagestory.GameContent;
+
+namespace ElementalTools
+{
+	/// <summary>
+	/// GENERIC Steel item. (Tool / Weapon / Armor...anything) [Possibly: Temperable and/or Hardenable ]
+	/// </summary>
+	public class SteelItem<T>: Item, IAmSteel where T : Item
+	{
+		internal const string hardenableKeyword = @"hardenable";
+		internal const string sharpenableKeyword = @"sharpenable";
+		internal const string metalNameKeyword = @"metalName";
+
+		internal const string hardnessKeyword = @"hardness";
+		internal const string sharpnessKeyword = @"sharpness";
+
+
+
+		/*
+		public virtual float GetAttackPower (IItemStack withItemStack)
+		public virtual float GetDurability (IItemStack itemstack)
+		public virtual float GetMiningSpeed (IItemStack itemstack, Block block)
+		public virtual void DamageItem (IWorldAccessor world, Entity byEntity, ItemSlot itemslot, int amount = 1)
+		public virtual void OnConsumedByCrafting (ItemSlot[] allInputSlots, ItemSlot stackInSlot, GridRecipe gridRecipe, CraftingRecipeIngredient fromIngredient, IPlayer byPlayer, int quantity)
+		public virtual void OnHeldDropped (IWorldAccessor world, IPlayer byPlayer, ItemSlot slot, int quantity, ref EnumHandling handling)
+
+		public int MiningTier  // public int ToolTier;
+
+		public virtual void GetHeldItemInfo(ItemSlot inSlot, StringBuilder dsc, IWorldAccessor world, bool withDebugInfo)
+		 * */
+
+		public virtual bool Hardenable {
+			get
+			{
+			return this.Attributes[hardenableKeyword].AsBool(false);
+			}
+		}
+			
+
+		public virtual string Name {
+			get
+			{
+			return this.Attributes[metalNameKeyword].AsString("?");
+			}
+		}
+
+		public virtual bool Sharpenable {
+			get
+			{
+			return this.Attributes[sharpenableKeyword].AsBool(false);
+			}
+		}
+
+		#region OVER_RIDES
+
+		public override void GetHeldItemInfo(ItemSlot inSlot, StringBuilder dsc, IWorldAccessor world, bool withDebugInfo)
+		{
+		dsc.AppendFormat("Metal: '{0}', ",Name);
+
+		if (Hardenable) {
+		dsc.AppendFormat("Temper: {0}\n", Hardness(inSlot.Itemstack) );
+		}
+
+		if (Sharpenable) {
+		dsc.AppendFormat("Wear: {0}\n", Sharpness(inSlot.Itemstack) );	
+		}
+
+		}
+
+		public virtual SharpnessState Sharpness(ItemStack someStack)
+		{
+		if (someStack.Attributes != null && someStack.Attributes.HasAttribute(sharpnessKeyword)) {
+		return someStack.Attributes.GetEnum<SharpnessState>(sharpnessKeyword, SharpnessState.Dull);
+		}
+		return SharpnessState.Dull;		
+		}
+
+		public virtual void Sharpness(ItemStack someStack, SharpnessState set)
+		{
+
+		}
+
+		public virtual HardnessState Hardness(ItemStack someStack)
+		{
+
+		}
+
+		public virtual void Hardness(ItemStack someStack, HardnessState set)
+		{
+
+		}
+
+		#endregion
+
+	}
+}
+