Commit: 333d93b548274f35704aba800dcc9fbd299a20e8 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: 333d93b548274f35704aba800dcc9fbd299a20e8 (tree)
• l'heure: 2020-09-10 07:26:21
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

W.I.P. & fixes for model transforms...partly success

Change Summary

• modified: ElementalTools/Assignments.cs
• modified: ElementalTools/ElementalTools.csproj
• modified: ElementalTools/Items/SteeIWrapItem.cs
• modified: ElementalTools/Properties/AssemblyInfo.cs
• modified: ElementalTools/assets/fma/blocktypes/metallurgy/pack_carburization.json
• modified: ElementalTools/assets/fma/itemtypes/arms/spear.json
• modified: ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json
• modified: ElementalTools/assets/fma/shapes/item/tools/files.json

Modification

--- a/ElementalTools/Assignments.cs
+++ b/ElementalTools/Assignments.cs
@@ -350,7 +350,7 @@ attributes: {
 	outputOverride: "fma:zzzzzzz"
 },	
 
-
-
+* Item: Sickle - 2x2 hand-held harvest tool (works on reeds, crops, grass, any plants)
+* Sort out how Arrow's work with item merging...
 
  ******************************/

--- a/ElementalTools/ElementalTools.csproj
+++ b/ElementalTools/ElementalTools.csproj
@@ -300,6 +300,9 @@
     <None Include="assets\fma\recipes\smithing\dory_speartip.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\fma\shapes\item\tools\drawplate.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/ElementalTools/Items/SteeIWrapItem.cs
+++ b/ElementalTools/Items/SteeIWrapItem.cs
@@ -117,7 +117,12 @@ namespace ElementalTools
 		WrappedItem.AttackRange = this.AttackRange;
 		WrappedItem.ToolTier = this.ToolTier;
 		WrappedItem.MaxStackSize = this.MaxStackSize;
-		WrappedItem.MaterialDensity = this.MaterialDensity;		
+		WrappedItem.MaterialDensity = this.MaterialDensity;
+		WrappedItem.GuiTransform = this.GuiTransform;
+		WrappedItem.FpHandTransform = this.FpHandTransform;
+		WrappedItem.TpHandTransform = this.TpHandTransform;
+		WrappedItem.GroundTransform = this.GroundTransform;
+		
 		
 		WrappedItem.OnLoadedNative(api);//Hacky - but needed?
 		}

--- a/ElementalTools/Properties/AssemblyInfo.cs
+++ b/ElementalTools/Properties/AssemblyInfo.cs
@@ -4,12 +4,16 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("ElementalTools")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTitle("Era_Of_Steel")]
+[assembly: AssemblyDescription("Mod plugin for V.S.")]
+#if DEBUG
+[assembly: AssemblyConfiguration("DEBUG")]
+#else
+[assembly: AssemblyConfiguration("RELEASE")]
+#endif
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("librarian")]
+[assembly: AssemblyProduct("First_Machine_Age_component")]
+[assembly: AssemblyCopyright("Melchior")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

--- a/ElementalTools/assets/fma/blocktypes/metallurgy/pack_carburization.json
+++ b/ElementalTools/assets/fma/blocktypes/metallurgy/pack_carburization.json
@@ -13,7 +13,7 @@
 			}
 		},
 		SteelTransitionTemp:750,
-		SteelTransitionTime:38,
+		SteelTransitionTime:60,
 	},
 	variantgroups: [
 		{ code: "type", states: ["unfired","fired"] },
@@ -32,7 +32,7 @@
 	combustiblePropsByType: {
 		"pack_carbirization-unfired": {
 			meltingPoint: 750,
-			meltingDuration: 38,
+			meltingDuration: 60,
 			smeltedRatio: 1,
 			smeltingType: "convert",
 			smeltedStack: { type: "block", code: "pack_carbirization-fired" },

--- a/ElementalTools/assets/fma/itemtypes/arms/spear.json
+++ b/ElementalTools/assets/fma/itemtypes/arms/spear.json
@@ -60,10 +60,10 @@
 	},
 	creativeinventory: { "general": ["*"], "items": ["*"], "tools": ["*"] },
 	guiTransform: {
-		translation: { x: 0, y: 0, z: 0 },
-		rotation: { x: -77, y: 53, z: 25 },
+		translation: { x: 0.5, y: 0.5, z: 0.5 },
+		rotation: { x: -2, y: -38, z: -38 },
 		origin: { x: 0.4, y: 0.1, z: 0.4 },
-		scale: 0.9
+		scale: 0.65
 	},			
 	fpHandTransform: {
 		translation: { x: 0.3, y: 0.5, z: 0.16 },
@@ -77,10 +77,10 @@
 		origin: { x: 0.5, y: 0, z: 0.5 },
 		scale: 3.4
 	},
-	tpHandTransformByType: {				
-		translation: { x: -1.24, y: -0.01, z: -0.56 },
-		rotation: { x: -81, y: 0, z: 0 },
-		origin: { x: 0.6, y: 0, z: 0.5 },
-		scale: 0.8	
+	tpHandTransform: {
+		translation: { x: -1.35, y: -0.5, z: -1.21 },
+		rotation: { x: -34, y: 4, z: -1 },
+		origin: { x: 0.495, y: 0.485, z: 0.5 },
+		scale: 0.5
 	},
 }

--- a/ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json
+++ b/ElementalTools/assets/fma/recipes/grid/metallurgy/pack_carburization.json
@@ -240,7 +240,7 @@ ingredientPattern: "CCC	KXK	CCC",
 	width: 3,
 	height: 3,
 	attributes: {
-		outputOverride: "spear-blister_steel",
+		outputOverride: "speartip-blister_steel",
 	    extraCookTime:20,
 	},
 	output: { type: "block", code: "pack_carburization-unfired"  }

--- a/ElementalTools/assets/fma/shapes/item/tools/files.json
+++ b/ElementalTools/assets/fma/shapes/item/tools/files.json
@@ -130,5 +130,35 @@
 					}
 				}
 			]
+		},
+		{
+			"name": "FileSurface4",
+			"from": [ 3.75, 0.0, 0.2 ], 
+			"to": [ 11.55, 0.38, 0.58 ], 
+			"rotationOrigin": [ 2.4, 0.48, 4.2 ],
+			"rotationY": -1.0,
+			"faces": {
+				"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 7.5, 0.5 ] },
+				"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+				"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 7.5, 0.5 ] },
+				"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+				"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 7.5, 0.5 ] },
+				"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 7.5, 0.5 ] }
+			},
+			"children": [
+				{
+					"name": "FileTang4",
+					"from": [ -1.8, 0.125, 0.02 ], 
+					"to": [ 0.0, 0.215, 0.32 ], 
+					"faces": {
+						"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 0.5 ] },
+						"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 0.5 ] },
+						"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 0.5 ] },
+						"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 0.5 ] }
+					}
+				}
+			]
 		}
 	]}
\ No newline at end of file