Commit: da78cb7b25d558a8a52efe051126ed0dc65f9f1f - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: da78cb7b25d558a8a52efe051126ed0dc65f9f1f (tree)
• l'heure: 2019-07-31 05:28:45
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

new model / textures incl. proj.
version incriment for V1.10

Change Summary

• modified: ArmourMod/ArmourMod.csproj
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler-metal.json
• modified: ArmourMod/modinfo.json

Modification

--- a/ArmourMod/ArmourMod.csproj
+++ b/ArmourMod/ArmourMod.csproj
@@ -74,6 +74,7 @@
     <Compile Include="Armour\ArmourModelData.cs" />
     <Compile Include="Armour\ArmourModConfig.cs" />
     <Compile Include="Armour\ItemArmour.cs" />
+    <Compile Include="Armour\ShieldBasher.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -150,7 +151,47 @@
     <None Include="assets\armourmod\shapes\item\armour\buckler.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="assets\armourmod\itemtypes\wearable\item-offhand-buckler.json">
+    <None Include="assets\armourmod\itemtypes\wearable\item-offhand-buckler-wood.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\shapes\item\armament\shield\shield_buckler.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\shapes\item\armament\shield\shield_heater_curved.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\shapes\item\armament\shield\shield_heater_straight.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\shapes\item\armament\shield\shield_round_basic.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_buckler.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_edging_grip.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_heater.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_heater_back.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_heater_straight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_heater_straight_back.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_round.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\shield_round_back.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\bunnyviking\textures\item\armament\shield\weapon_parts_01.png" />
+    <None Include="assets\armourmod\itemtypes\wearable\item-offhand-buckler-metal.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -164,5 +205,7 @@
     <Folder Include="assets\armourmod\recipes\" />
     <Folder Include="assets\armourmod\recipes\grid\" />
     <Folder Include="assets\armourmod\lang\" />
+    <Folder Include="assets\bunnyviking\shapes\item\armament\shield\" />
+    <Folder Include="assets\bunnyviking\textures\item\armament\shield\" />
   </ItemGroup>
 </Project>
\ No newline at end of file

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
@@ -50,8 +50,8 @@
 		scale: 2
 	},
 	tpHandTransform: {
-		translation: { x: -0.6, y: -1.2, z: -0.7 },
-		rotation: { x: -14, y: 180, z: 53 },
+		translation: { x: -1.05, y: -1, z: -0.9 },
+		rotation: { x: -80, y: 171, z: 96 },
 		scale: 0.55
 	},
 	guiTransform:{
@@ -70,6 +70,7 @@
 	thirdPersonTransform: {
 		translation: { x: -0.005, y: 0.18, z: 0.0009 },
 		rotation: { x: 0, y: 0, z: 0 },
+        origin: { x: 0.5, y: 0.55, z: 0.45 },
 		scale: 1.1
 	}
 }

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler-metal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler-metal.json
@@ -1,24 +1,24 @@
 {
-	code: "buckler-wood",
+	code: "buckler-metal",
 	class: "ItemArmour",
 	storageFlags: 257,
 	heldRightTpIdleAnimation: "holdinglanternrighthand",
 	heldLeftTpIdleAnimation: "holdinglanternlefthand",
 	attributes: 
 	{			
-		BluntProtection:0.13,
-		PiercingProtection:0.1,
-		SlashingProtection:0.1,
-		CrushingProtection:0.05,
-		FireProtection:0.01
+		BluntProtection:0.14,
+		PiercingProtection:0.10,
+		SlashingProtection:0.15,
+		CrushingProtection:0.09,
+		FireProtection:0.19
 	},	
 	shape: {
-		 base: "item/armour/buckler" 
+		 base: "bunnyviking:item/armament/shield/shield_buckler" 
 	},
-	durability: 50,
+	durability: 150,
 	creativeinventory: { "general": ["*"], "items": ["*"], "clothing": ["*"] },
 	textures: { 
-			aged:{ base: "game:block/wood/debarked/aged"},			
+			"shield_buckler":{ base: "bunnyviking:/item/armament/shield/shield_buckler"},			
 		 	},	
 	fpHandTransform: {
 		translation: { x: 0, y: -0.05, z: -0.6 },
@@ -42,10 +42,6 @@
 		rotation: { x: 0, y: -1, z: 90 },
 		origin: { x: 0.39, y: 0.25, z: 0.5 },
 		scale: 2.8
-	},
-	combustibleProps: {
-		burnTemperature: 600,
-		burnDuration: 12,
 	},	
-	materialDensity: 600
+	materialDensity: 850
 }
\ No newline at end of file

--- a/ArmourMod/modinfo.json
+++ b/ArmourMod/modinfo.json
@@ -1,11 +1,11 @@
 {
   "type": "code",
   "name": "Basic Armour Mod",
-  "description" : "Leather, Plate, Scale & More",
+  "description" : "Vests of Leather, Plate, Scale & Now Shields!",
   "authors": ["Melchior", "Bunnyviking"],
   "version": "0.1.9",
   "dependencies": { 
-	"game": "1.9.9",
+	"game": "1.10.*",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"