Commit: de1f838e17628ed460e688f23e26febb59549261 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: de1f838e17628ed460e688f23e26febb59549261 (tree)
• l'heure: 2020-08-13 13:08:12
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

W.I.P. More event processing, tool entries

Change Summary

• modified: ElementalTools/Assignments.cs
• modified: ElementalTools/ElementalTools.csproj
• modified: ElementalTools/General/IAmSteel.cs
• modified: ElementalTools/Items/SteelItem.cs
• modified: ElementalTools/assets/fma/itemtypes/tools/axe.json
• modified: ElementalTools/assets/fma/itemtypes/tools/cleaver.json
• modified: ElementalTools/assets/fma/itemtypes/tools/hammer.json
• add: ElementalTools/assets/fma/itemtypes/tools/heads/hammer_head.json

Modification

--- a/ElementalTools/Assignments.cs
+++ b/ElementalTools/Assignments.cs
@@ -19,11 +19,14 @@ namespace ElementalTools
 		internal const string malletItemKey = @"ItemMallet";
 		internal const string sharpeningStoneItemKey = @"ItemSharpening_stone";
 
-		internal const string genericSteelItemKey = @"Steel_Item";//Only for tool heads / blades...
-		internal const string genericSteelSwordKey = @"Steel_ItemSword";
-		internal const string genericSteelChiselKey = @"Steel_ItemChisel";
-		internal const string genericSteelAxeKey = @"Steel_ItemAxe";
-		internal const string genericSteelSpearKey = @"Steel_ItemSpear";
+		internal const string genericSteelItemKey = 	@"Steel_Item";//Only for tool heads / blades...
+		internal const string genericSteelSwordKey = 	@"Steel_ItemSword";
+		internal const string genericSteelChiselKey = 	@"Steel_ItemChisel";
+		internal const string genericSteelAxeKey = 		@"Steel_ItemAxe";
+		internal const string genericSteelSpearKey = 	@"Steel_ItemSpear";
+		internal const string genericSteelCleaverKey = 	@"Steel_ItemCleaver";
+		internal const string genericSteelHammerKey= 	@"Steel_ItemHammer";
+
 
 		internal const string pack_carburizationBlockKey = @"pack_carburization";
 		internal const string pack_stateFired = @"fired";
@@ -57,7 +60,10 @@ namespace ElementalTools
 		CoreAPI.RegisterItemClass(genericSteelChiselKey, typeof(SteelWrap<ItemChisel>));
 		CoreAPI.RegisterItemClass(genericSteelAxeKey, typeof(SteelWrap<ItemAxe>));
 		CoreAPI.RegisterItemClass(genericSteelSpearKey, typeof(SteelWrap<ItemSpear>));
-
+		CoreAPI.RegisterItemClass(genericSteelCleaverKey, typeof(SteelWrap<ItemCleaver>));
+		CoreAPI.RegisterItemClass(genericSteelHammerKey, typeof(SteelWrap<ItemHammer>));
+		
+	
 
 		}
 

--- a/ElementalTools/ElementalTools.csproj
+++ b/ElementalTools/ElementalTools.csproj
@@ -102,6 +102,7 @@
     <Folder Include="assets\fma\config\" />
     <Folder Include="assets\fma\config\handbook\" />
     <Folder Include="assets\fma\entities\" />
+    <Folder Include="assets\fma\itemtypes\tools\heads\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">
@@ -193,8 +194,12 @@
     <None Include="assets\fma\itemtypes\tools\prospectingpick.json" />
     <None Include="assets\fma\itemtypes\tools\scythe.json" />
     <None Include="assets\fma\itemtypes\tools\saw.json" />
-    <None Include="assets\fma\itemtypes\tools\cleaver.json" />
-    <None Include="assets\fma\itemtypes\tools\hammer.json" />
+    <None Include="assets\fma\itemtypes\tools\cleaver.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\fma\itemtypes\tools\hammer.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="assets\fma\itemtypes\tools\shears.json" />
     <None Include="assets\fma\itemtypes\tools\hoe.json" />
     <None Include="assets\fma\itemtypes\arms\spear.json">
@@ -206,6 +211,7 @@
     <None Include="assets\fma\entities\spears.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\fma\itemtypes\tools\heads\hammer_head.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/ElementalTools/General/IAmSteel.cs
+++ b/ElementalTools/General/IAmSteel.cs
@@ -34,7 +34,13 @@ namespace ElementalTools
 		SharpnessState Sharpen(IItemStack someStack);
 
 		/// <summary>
-		/// Read Harness
+		/// Reduce the sharpness.
+		/// </summary>
+		/// <param name="someStack">Some stack.</param>
+		SharpnessState Dull(IItemStack someStack);
+
+		/// <summary>
+		/// Read Hardness
 		/// </summary>
 		/// <param name="someStack">Some stack.</param>
 		HardnessState Hardness(IItemStack someStack);
@@ -46,6 +52,7 @@ namespace ElementalTools
 		/// <param name="set">Value.</param>
 		void Hardness(IItemStack someStack, HardnessState set);//Apply harden - Perhaps translate these to brinell units...
 
+
 		/// <summary>
 		/// Perpetuate Steely attributes from donor to recipient
 		/// </summary>

--- a/ElementalTools/Items/SteelItem.cs
+++ b/ElementalTools/Items/SteelItem.cs
@@ -21,6 +21,7 @@ namespace ElementalTools
 		private const float quench_min_temperature = 450f;//Celcius
 
 		private Item WrappedItem;//Special placeholder replica - for calling ancestor class
+
 		internal const string hardenableKeyword = @"hardenable";
 		internal const string sharpenableKeyword = @"sharpenable";
 		internal const string metalNameKeyword = @"metalName";
@@ -181,6 +182,23 @@ namespace ElementalTools
 		someStack.Attributes.SetBytes(sharpnessKeyword, bytes);
 		}
 
+		public virtual SharpnessState Dull(IItemStack someStack)
+		{
+		if (someStack.Attributes != null && someStack.Attributes.HasAttribute(sharpnessKeyword)) {
+		byte[ ] bytes = new byte[1];
+		bytes = someStack.Attributes.GetBytes(sharpnessKeyword, bytes);
+		var state = ( SharpnessState )bytes[0];
+
+		if (state > SharpnessState.Rough) state--;
+
+		bytes[0] = ( byte )state;
+		someStack.Attributes.SetBytes(sharpnessKeyword, bytes);
+
+		return state;
+		}
+		return SharpnessState.Rough;
+		}
+
 		public virtual HardnessState Hardness(IItemStack someStack)
 		{
 		if (someStack.Attributes != null && someStack.Attributes.HasAttribute(hardnessKeyword)) {
@@ -338,9 +356,9 @@ namespace ElementalTools
 		public override void OnAttackingWith(IWorldAccessor world, Entity byEntity, Entity attackedEntity, ItemSlot itemslot)
 		{
 		bool edged = this.Tool.EdgedImpliment( );
-		bool weapon = this.Tool.Weapons( ); 		
+		bool weapon = this.Tool.Weapons( );		
 		float targetArmorFactor = 0.0f;
-
+					
 		/*DETERMINE: 
 		 * Usage - Edged weapon attack Vs. creature Sc.#1 [What about armored players?]
 		 * Non-edged weapon vs. creature Sc. #2 [What about armored players?]
@@ -362,7 +380,7 @@ namespace ElementalTools
 		}
 		*/
 
-		WrappedItem.OnAttackingWith(world, byEntity, attackedEntity, itemslot);
+		//WrappedItem.OnAttackingWith(world, byEntity, attackedEntity, itemslot);
 		}
 
 
@@ -374,50 +392,72 @@ namespace ElementalTools
 		var targetBlock = api.World.BlockAccessor.GetBlock(blockSel.Position);
 		int targetTier = targetBlock.ToolTier;
 		float targetResistance = targetBlock.Resistance;
+		bool recomendedUsage = this.MiningSpeed.ContainsKey(targetBlock.BlockMaterial);
 
 		//Only called for attacks on BLOCKS / Envrionment. Scen# 5 - 6 here.	
-		
+
 		//Weapon & Tool applicability: Is rate > 1 ? then - its sorta OK...ish.
 
 		//Harndess Vs. Block-Resistance...
+		//Tool Specific special damage reduction rate: e.g. scythe, hoe, knife, here...
+		//By MiningSpeed 
+
 
 		api.World.Logger.VerboseDebug($"OnBlockBrokenWith:: (Weap:{weapon},Edge:{edged}) {byEntity.Code} -> {targetBlock.Code}");
 
 
 
 		return WrappedItem.OnBlockBrokenWith(world, byEntity, itemslot, blockSel);
+		//Post Damage reduction? or Increase??
+		
 		}
 
-
+		//This Method signature leaves _ALOT_ to be ascertained about the _ACUTAL_ Scenario / REASON of damage...
+		//Tool/Weapon Vs. What?
 		public override void DamageItem(IWorldAccessor world, Entity byEntity, ItemSlot itemslot, int amount = 1)
 		{
-		//TODO: too sharp edges...wear down EDGE randomly (extra for 'abuse' )
+		//ItemAxe: just repeatedly calls DamageItem....instead of accrued count...lame.
+
+		bool byPlayer = byEntity is EntityPlayer;
+		bool catasptrophicFailure = false, edgeBlunting = false;
+
+		float resistance = 0.0f;
 
-		//Tool Specific special damage reduction rate: e.g. scythe, hoe, knife, here...?
-		//By MiningSpeed ?
 		if (!itemslot.Empty) 
 		{
 		var hardness = this.Hardness(itemslot.Itemstack);
 		switch (hardness) 
 				{
 				case HardnessState.Soft:
-
+					resistance = 0.3f;
+					edgeBlunting = world.Rand.Next(1, 100) >= 99;
 					break;
 				case HardnessState.Medium:
-
+					resistance = -0.1f;
+					edgeBlunting = world.Rand.Next(1, 200) >= 199;
 					break;
 				case HardnessState.Hard:
-
+					resistance = -0.25f;
+					edgeBlunting = world.Rand.Next(1, 300) >= 299;
 					break;
 				case HardnessState.Brittle:
-
-					break;
-				default:
+					resistance = -0.3f;
+					edgeBlunting = world.Rand.Next(1, 400) >= 399;
+					catasptrophicFailure = world.Rand.Next(1, 1000) >= 999; 
 					break;
 				}
 		}
 
-		WrappedItem.DamageItem(world, byEntity, itemslot, amount);
+		amount = amount < 1 ? 1 : amount;//Zero or negative damange, possible but WHY?
+
+		float amountFractional =  (resistance * amount);
+		var dmgRandomizer = NatFloat.createUniform(amount, amountFractional);
+		var actualAmount = ( int )dmgRandomizer.nextFloat( );
+		
+		if (edgeBlunting) this.Dull(itemslot.Itemstack);
+		if (catasptrophicFailure) actualAmount += 1200;
+
+		base.DamageItem(world, byEntity, itemslot, actualAmount);
 		}
 
 
@@ -685,6 +725,8 @@ namespace ElementalTools
 		{
 		return recipient.Attributes.GetInt(durabilityKeyword, recipient.Item.Durability);
 		}
+
+
 	}
 }
 

--- a/ElementalTools/assets/fma/itemtypes/tools/axe.json
+++ b/ElementalTools/assets/fma/itemtypes/tools/axe.json
@@ -1,16 +1,6 @@
 {
 	code: "axe",
-	class: "Steel_ItemAxe",
-	attributes: {
-		handbook: {
-			groupBy: ["axe-*"]
-		},
-		toolrackTransform: {
-			rotation: { y: 1, z: -1 },
-			translation: { x: -0.3, y: 0.6 },
-			scale: 1.25,
-		}
-	},
+	class: "Steel_ItemAxe",	
 	variantgroups: [
 		{ code: "metal", states: ["blister_steel", "shear_steel" ] },
 	],
@@ -56,7 +46,17 @@
 			metalName:"Shear Steel",
 			sharpenable: true,
 			hardenable: true,
-		}		
+		},
+        "*": {
+            handbook: {
+			groupBy: ["axe-*"]
+			},
+		toolrackTransform: {
+				rotation: { y: 1, z: -1 },
+				translation: { x: -0.3, y: 0.6 },
+				scale: 1.25,
+				}
+            },
     },   	
 	creativeinventory: { "general": ["*"], "items": ["*"], "tools": ["*"] },
 	

--- a/ElementalTools/assets/fma/itemtypes/tools/cleaver.json
+++ b/ElementalTools/assets/fma/itemtypes/tools/cleaver.json
@@ -1 +1,71 @@
-
+{
+	code: "cleaver",
+	damagedby: ["blockbreaking", "attacking"],
+	class: "Steel_ItemCleaver",	
+	variantgroups: [
+		{ code: "metal", states: ["blister_steel", "shear_steel" ] },
+	],
+	shape: { base: "game:item/tool/cleaver" },
+	heldTpHitAnimation: "breaktool",
+	textures: {
+		"metal": { base:"fma:metal/{metal}"},
+		"toolhandle": {
+			base: "fma:metal/{metal}",
+			overlays: [ "game:item/tool/cleaver-overlay" ]
+		}
+	},
+	durabilitybytype: {		
+		"*-blister_steel": 1100,
+        "*-shear_steel": 1200,
+	},
+	attackpowerbytype: {
+		"*-blister_steel": 2.75,
+        "*-shear_steel": 3.0,
+	},
+    attributesByType: {
+		"*-blister_steel": {
+			metalName:"Blister Steel",
+			sharpenable: true,
+			hardenable: true,
+		},
+		"*-shear_steel": {
+			metalName:"Shear Steel",
+			sharpenable: true,
+			hardenable: true,
+		},
+        "*": {
+          handbook: {
+			groupBy: ["cleaver-*"]
+		},
+		rackable: true,
+		toolrackTransform: {
+			rotation: { x: 90 },
+			translation: { x: -0.35 },
+			scale: 1.25,
+			},
+        }
+    },   	
+	creativeinventory: { "general": ["*"], "items": ["*"], "tools": ["*"] },
+	fpHandTransform: {
+		translation: { x: -0.34, y: 0, z: 0.4 },
+		rotation: { x: -17, y: -93, z: -75 },
+		scale: 2.5
+	},
+	guiTransform: {
+		translation: { x: 0, y: 0, z: 0 },
+		rotation: { x: 0, y: 26, z: 140 },
+		origin: { x: 0.55, y: 0.52, z: 0.5 },
+		scale: 2.53
+	},
+	groundTransform: {
+		translation: { x: 0, y: 0, z: 0 },
+		rotation: { x: -90, y: 0, z: 0 },
+		origin: { x: 0.5, y: 0.5, z: 0.45 },
+		scale: 3.6
+	},
+	tpHandTransform: {
+		translation: { x: -0.78, y: -0.44, z: -0.5 },
+		rotation: { x: 0, y: 180, z: -10 },
+		scale: 1
+	}
+}
\ No newline at end of file

--- a/ElementalTools/assets/fma/itemtypes/tools/hammer.json
+++ b/ElementalTools/assets/fma/itemtypes/tools/hammer.json
@@ -1 +1,73 @@
-
+{
+	code: "hammer",
+	class: "Steel_ItemHammer",	
+	variantgroups: [
+		{ code: "metal", states: ["blister_steel", "shear_steel" ] },
+	],
+	tool: "hammer",
+	heldTpHitAnimation: "smithing",
+	shape: { base: "game:item/tool/hammer" },
+	textures: {
+		 "metal": { base:"fma:metal/{metal}"},
+		"wood": { base: "game:item/tool/material/wood" } 
+	},
+	tooltierbytype: {
+		"*-blister_steel": 5,
+		"*-shear_steel": 5,
+	},
+	durabilitybytype: {
+		"*-blister_steel": 2500,
+		"*-shear_steel": 2600,
+	},
+	attackpowerbytype: {
+		"*-blister_steel": 2.5,
+		"*-shear_steel": 2.5,
+	},
+    attributesByType: {
+		"*-blister_steel": {
+			metalName:"Blister Steel",
+			sharpenable: false,
+			hardenable: true,
+		},
+		"*-shear_steel": {
+			metalName:"Shear Steel",
+			sharpenable: false,
+			hardenable: true,
+		},
+        "*": 
+        {
+         handbook: {
+			groupBy: ["hammer-*"]
+		},
+		toolrackTransform: {
+			rotation: { y: 1, z: -1 },
+			translation: { x: -0.2 },
+			scale: 1.5,
+		}
+        }
+    },   	
+	creativeinventory: { "general": ["*"], "items": ["*"], "tools": ["*"] },
+	fpHandTransform: {
+		translation: { x: 0.0468, y: -0.2, z: 0 },
+		rotation: { x: 15, y: 15, z: 90 },
+		scale: 2.5
+	},
+	guiTransform: {
+		rotate: false,
+		translation: { x: 0, y: 5, z: 0 },
+		rotation: { x: -77, y: -135, z: 160 },
+		origin: { x: 0.54, y: 0.5, z: 0.48 },
+		scale: 2.6
+	},
+	groundTransform: {
+		translation: { x: 0, y: 0, z: 0 },
+		rotation: { x: 0, y: 0, z: 0 },
+		origin: { x: 0.5, y: 0.45, z: 0.5 },
+		scale: 4.5
+	},
+	tpHandTransform: {
+		translation: { x: -0.75, y: -0.48, z: -0.52 },
+		rotation: { x: 90, y: 1, z: 0 },
+		scale: 1
+	}
+}

--- /dev/null
+++ b/ElementalTools/assets/fma/itemtypes/tools/heads/hammer_head.json
@@ -0,0 +1,35 @@
+{
+	code: "hammerhead",
+	variantgroups: [
+		{ code: "metal", states: ["blister_steel", "shear_steel" ] },
+	],
+	shape: { base: "game:item/tool/hammer" },
+	textures: {
+		"metal": { base:"fma:metal/{metal}"},
+		"wood": { base: "game:block/transparent" },
+	},
+	creativeinventory: { "general": ["*"], "items": ["*"] },
+	fpHandTransform: {
+		translation: { x: 0.3, y: -0.4, z: 0 },
+		rotation: { x: 15, y: 15, z: 90 },
+		scale: 2.5
+	},
+	guiTransform: {
+		rotate: false,
+		translation: { x: 4, y: 1, z: 190 },
+		rotation: { x: -52, y: -131, z: -180 },
+		origin: { x: 0.37, y: 1.25, z: 0.1 },
+		scale: 3.5
+	},
+	groundTransform: {
+		translation: { x: 0, y: 0, z: 0 },
+		rotation: { x: 0, y: 0, z: 0 },
+		origin: { x: 0.8, y: 0.44, z: 0.5 },
+		scale: 4.5
+	},
+	tpHandTransform: {
+		translation: { x: -0.3, y: -0.8, z: -0.6 },
+		rotation: { x: 109, y: -30, z: 5 },
+		scale: 1
+	}
+}
\ No newline at end of file