Commit: 5dd86de17b17a8fecc3f42580b0c0525fb4f42a6 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: 5dd86de17b17a8fecc3f42580b0c0525fb4f42a6 (tree)
• l'heure: 2020-08-27 05:40:57
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Working: Tempering, Timing for Carburization

Change Summary

• modified: ElementalTools/Block/PackCarburization.cs
• modified: ElementalTools/General/IAmSteel.cs
• modified: ElementalTools/Items/SteeIWrapItem.cs
• modified: ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json

Modification

--- a/ElementalTools/Block/PackCarburization.cs
+++ b/ElementalTools/Block/PackCarburization.cs
@@ -58,7 +58,7 @@ namespace ElementalTools
 			//Seconds
 			get
 			{
-			if (this.Attributes[steelTransitionTempKey].Exists) { return this.Attributes[steelTransitionTempKey].AsFloat( ); }
+			if (this.Attributes[steelTransitionTimeKey].Exists) { return this.Attributes[steelTransitionTimeKey].AsFloat( ); }
 
 			return 38f;
 			}
@@ -185,7 +185,9 @@ namespace ElementalTools
 		public override float GetMeltingDuration(IWorldAccessor world, ISlotProvider cookingSlotsProvider, ItemSlot inputSlot)
 		{//TimeSpan - would have been far better a return type
 		var extraCookTime = GetExtraCookTime(inputSlot.Itemstack);
-
+		#if DEBUG
+		api.World.Logger.VerboseDebug("GetMeltingDuration::{0}", (SteelTransitionTime + extraCookTime));
+		#endif
 		return SteelTransitionTime + extraCookTime;
 		}
 
@@ -283,16 +285,17 @@ namespace ElementalTools
 		outputSlot.Itemstack = outputStack.Clone();
 
 		temperature = Math.Min(temperature, maxInnerTemperature);
-		contentStack.Collectible.SetTemperature(world, contentStack, temperature);//TODO: Temperature clamping inside contents of stack...
+		contentStack.Collectible.SetTemperature(world, contentStack, temperature);
 
 		ItemStack[ ] transmutedItems = new ItemStack[ ] { contentStack.Clone( ) };
 		transmutedItems.First( ).StackSize = 1;//There can be only 1, per pack
 		SetContents(outputSlot.Itemstack, transmutedItems);
-		
+		outputSlot.Itemstack.Collectible.SetTemperature(world, outputSlot.Itemstack, temperature);
+
 		inputSlot.Itemstack = null;		
 
 		#if DEBUG
-		world.Logger.VerboseDebug("Contents of pack: {0}", contentStack);
+		world.Logger.VerboseDebug("Contents of pack: {0} @{1}C", contentStack,temperature);
 		world.Logger.VerboseDebug("Finished: 'DoSmelt' " );
 		#endif	
 		}

--- a/ElementalTools/General/IAmSteel.cs
+++ b/ElementalTools/General/IAmSteel.cs
@@ -79,17 +79,18 @@ namespace ElementalTools
 	}
 
 	/// <summary>
-	/// The metals crystal state; changed only by tempering/quenching/annealing
+	/// The metals crystal state; changed only by normalizing/quenching/annealing
 	/// </summary>
 	/// <remarks>
-	/// Reduces wear - with a penalty of random catastrophic failure...
+	/// Reduces wear - with a penalty of random catastrophic failure...Metal's "Temper'
 	/// </remarks>
 	public enum HardnessState : byte
 	{
 		Soft	=	0,
-		Medium	=	1,
-		Hard	=	2,
-		Brittle	=	3,
+		Mild 	= 	1,
+		Medium	=	2,
+		Hard	=	3,
+		Brittle	=	4,
 	}
 
 }

--- a/ElementalTools/Items/SteeIWrapItem.cs
+++ b/ElementalTools/Items/SteeIWrapItem.cs
@@ -297,13 +297,13 @@ namespace ElementalTools
 		/// <param name="entityItem">Entity item.</param>
 		public override void OnGroundIdle(EntityItem entityItem)
 		{
-
-		if (entityItem.Swimming || entityItem.FeetInLiquid) {
+		if (api.Side.IsServer() && (entityItem.Swimming || entityItem.FeetInLiquid)) {
+				
 		if (!this.Hardenable) return;
 
 		float temperature = entityItem.Itemstack.Collectible.GetTemperature(api.World, entityItem.Itemstack);
 		//Track first moment in liquid;
-		this.SetTimestamp(entityItem);//BUG: NOT WORKING!?
+		this.SetTimestamp(entityItem);//Clear on pickup or...?
 
 		//Above 900C  - What should happen in this range; different phase of iron?
 
@@ -326,7 +326,7 @@ namespace ElementalTools
 		entityItem.Itemstack.Collectible.SetTemperature(api.World, entityItem.Itemstack, temperature - 17, false);
 
 		#if DEBUG
-		api.World.Logger.VerboseDebug("Quench process: {0}S elapsed @{1}C", elapsedTime.TotalSeconds, temperature);
+		api.World.Logger.VerboseDebug("Quench process: {0}S elapsed @{1}C H:{2} ~ QU#{3}", elapsedTime.TotalSeconds, temperature, this.Hardness(entityItem.Itemstack), quenchUnits );
 		#endif
 		}
 		}
@@ -773,16 +773,17 @@ namespace ElementalTools
 
 		internal void SetTimestamp(EntityItem entityItem)
 		{
-		if (!entityItem.Itemstack.TempAttributes.HasAttribute(_timestampKey)) {
-		entityItem.Itemstack.TempAttributes.SetLong(_timestampKey, entityItem.itemSpawnedMilliseconds);
+			
+		if (!entityItem.Attributes.HasAttribute(_timestampKey)) {
+			entityItem.Attributes.SetLong(_timestampKey, DateTime.Now.Ticks);
 		}
 		}
 
 		internal TimeSpan GetTimestampElapsed(EntityItem entityItem)
 		{
-		if (entityItem.Itemstack.TempAttributes.HasAttribute(_timestampKey)) {
-		var ts = TimeSpan.FromMilliseconds(entityItem.Itemstack.TempAttributes.GetLong(_timestampKey));
-		return ts.Subtract(TimeSpan.FromMilliseconds(entityItem.itemSpawnedMilliseconds)).Negate();
+		if (entityItem.Attributes.HasAttribute(_timestampKey)) {
+		var ts = TimeSpan.FromTicks(entityItem.Attributes.GetLong(_timestampKey));
+		return ts.Subtract(TimeSpan.FromTicks(DateTime.Now.Ticks)).Negate();
 		}
 		return TimeSpan.Zero;
 		}

--- a/ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json
+++ b/ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json
@@ -42,7 +42,7 @@
 	height: 3,
     attributes: {		
         outputOverride: "cleaver-blister_steel",
-        extraCookTime:10,
+        extraCookTime:1,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 },
@@ -89,7 +89,7 @@
 	height: 3,
 	attributes: {
 		outputOverride: "pickaxehead-blister_steel",
-        extraCookTime:25,
+        extraCookTime:2,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 },
@@ -145,7 +145,7 @@
 	height: 3,
 	attributes: {
 		outputOverride: "prospectingpickhead-blister_steel",
-        extraCookTime:15,
+        extraCookTime:10,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 },
@@ -161,7 +161,7 @@
 	height: 3,
     attributes: {
 		outputOverride: "sawblade-blister_steel",
-        extraCookTime:25,
+        extraCookTime:20,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 },
@@ -177,7 +177,7 @@
 	height: 3,
     attributes: {
 		outputOverride: "scythehead-blister_steel",
-        extraCookTime:20,
+        extraCookTime:25,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 },
@@ -225,7 +225,7 @@ ingredientPattern: "CCC	KXK	CCC",
 	height: 3,
 	attributes: {
 		outputOverride: "axehead-blister_steel",
-	    extraCookTime:25,
+	    extraCookTime:20,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }
 }