Commit: 5659a45368acee180fff4193a7150722b28d25ed - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: 5659a45368acee180fff4193a7150722b28d25ed (tree)
• l'heure: 2019-07-24 11:37:45
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

New feature; Buckler support,
Experimental workaround for rendering issue,
Initial buckler model added,
version bump

Change Summary

• modified: ArmourMod/Armour/AmourMeshRenderer.cs
• modified: ArmourMod/Armour/ArmourModHookin.cs
• modified: ArmourMod/Armour/DamageFilter.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/Armour/ItemArmour.cs
• modified: ArmourMod/ArmourMod.csproj
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
• add: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-offhand-shields.json
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
• add: ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler.json
• add: ArmourMod/assets/armourmod/shapes/item/armour/buckler.json
• modified: ArmourMod/modinfo.json

Modification

--- a/ArmourMod/Armour/AmourMeshRenderer.cs
+++ b/ArmourMod/Armour/AmourMeshRenderer.cs
@@ -92,6 +92,10 @@ namespace ArmourMod
 				if ( rpi.CameraType == EnumCameraMode.FirstPerson ) return;
 			}
 
+			//HACK: don't render if local client has old/bad position data
+			//armouredPlayer.Pos.Dirty ||
+			if ( (armouredPlayer.Pos.X == 0d && armouredPlayer.Pos.Y == 0d &&armouredPlayer.Pos.Z == 0d) ) return;
+
 			foreach(var wornItemTuple in armouredPlayer.RenderableWornArmours) {
 
 				if ( !Armoury.ContainsKey( wornItemTuple.Value.Code ) ) {
@@ -137,7 +141,7 @@ namespace ArmourMod
 
 					rpi.CurrentActiveShader.BindTexture2D( "tex2d", armourData.Armour_TextureId, 0 );
 				} else {
-					
+
 					//IStandardShaderProgram PreparedStandardShader(int posX, int posY, int posZ);
 					prog = rpi.PreparedStandardShader( (int)armouredPlayer.Pos.X, (int)armouredPlayer.Pos.Y, (int)armouredPlayer.Pos.Z );
 					prog.Tex2D = armourData.Armour_TextureId;

--- a/ArmourMod/Armour/ArmourModHookin.cs
+++ b/ArmourMod/Armour/ArmourModHookin.cs
@@ -181,20 +181,17 @@ namespace ArmourMod
 
 			//armourmod:clothes-upperbodyover-vest-leather
 			//armourmod:item-clothes-upperbodyover-vest-leather
-			//var armourLocations = ClientApi.Assets.GetLocations( "itemtypes/wearable", _domain );
 			var armourAssets = ClientApi.World.AssetManager.GetMany("itemtypes/wearable",_domain,true);
-			//ClientApi.Assets.GetMany
 
-
-			//BRUTE FORCE SEARCH!
-			var armourItemsBrute = ClientApi.World.Items.Where( itm => itm.Code != null && itm.Code.BeginsWith( _domain, "clothes" ));
+			//Still BRUTE FORCE Search....
+			var renderableArmourItems = ClientApi.World.Items.Where( itm => itm.Code != null && itm.Code.BeginsWith( _domain, "clothes" ) && itm.StorageFlags == EnumItemStorageFlags.Outfit );
 			#if DEBUG
 			ClientApi.Logger.VerboseDebug( "****************************************************** " );
-			ClientApi.Logger.VerboseDebug( "Known Armour variants: {0}", armourItemsBrute.Count() );
+			ClientApi.Logger.VerboseDebug( "Renderable Armour count: {0}", renderableArmourItems.Count() );
 			ClientApi.Logger.VerboseDebug( "****************************************************** " );
 			#endif
 
-			foreach(var armourItem in armourItemsBrute)
+			foreach(var armourItem in renderableArmourItems)
 			{		
 				if ( armourItem.IsMissing || armourItem.Attributes == null ) {
 					ClientApi.Logger.Error( "Armour item MISSING / NULL ATTRIBUTES {0} !", armourItem.Code.ToShortString( ) );
@@ -224,25 +221,27 @@ namespace ArmourMod
 				//Manual fetch by JSON parsing....
 
 				if ( armourAssets != null && armourAssets.Count > 0 ) {				
-					string partialName = armourItem.Code.GetName( ).Substring(0, armourItem.Code.GetName( ).LastIndexOf( "-" ) );
+					string partialName = armourItem.Code.GetName( ).Substring(0, armourItem.Code.GetName( ).LastIndexOf("-", StringComparison.Ordinal));
 
-					var originAsset = armourAssets.Single( armA => armA.Name.StartsWith( partialName ) );
+					var originAsset = armourAssets.Single( armA => armA.Name.StartsWith(partialName, StringComparison.Ordinal));
 
 					//System.Diagnostics.Debugger.Break();
-					JObject originalJson = JObject.Parse(originAsset.ToText());	
+					JObject originalJson = JObject.Parse(originAsset.ToText());
 
-					if ( originalJson.HasValues ) {
+					if (originalJson.HasValues) {
 						var tpJsonNode = originalJson[_thirdPersonKey];
 						//Token.C.SelectToken( @"$.thirdPersonTransform" );
 						//if ( tpJsonNode != null )
 						//	ClientApi.Logger.VerboseDebug("TP SPAM:"+ tpJsonNode.ToString( ) );
 
 
-						ModelTransform configuredTransform = new JsonObject( tpJsonNode ).AsObject<ModelTransform>( );
+						ModelTransform configuredTransform = new JsonObject(tpJsonNode).AsObject<ModelTransform>( );
 						fudge_transform = configuredTransform;
 						#if DEBUG
 						ClientApi.Logger.VerboseDebug( "[{0}] Using JSON Transform parameters = {1}", armourItem.Code.ToShortString( ),configuredTransform.Translation.ToString() );
 						#endif
+					} else {
+						ClientApi.Logger.Warning("Could not load JSON Transform ");
 					}
 
 				} else {

--- a/ArmourMod/Armour/DamageFilter.cs
+++ b/ArmourMod/Armour/DamageFilter.cs
@@ -13,6 +13,17 @@ namespace ArmourMod
 			slashingPercent = slash;
 			crushingPercent = crush;
 			firePercent = fire;
+			encumberancePercent = 0;
+		}
+
+		public DamageFilter(float blunt, float pierce, float slash, float crush, float fire, float encP)
+		{
+			bluntPercent = blunt;
+			piercingPercent = pierce;
+			slashingPercent = slash;
+			crushingPercent = crush;
+			firePercent = fire;
+			encumberancePercent = encP;
 		}
 
 		public float bluntPercent;
@@ -20,6 +31,7 @@ namespace ArmourMod
 		public float slashingPercent;
 		public float crushingPercent;
 		public float firePercent;
+		public float encumberancePercent;
 
 		//TODO:Threshold values;
 
@@ -31,8 +43,9 @@ namespace ArmourMod
 			var slashing = armourInSlot.Itemstack.ItemAttributes["SlashingProtection"].AsFloat( );
 			var crushing = armourInSlot.Itemstack.ItemAttributes["CrushingProtection"].AsFloat( );
 			var flame = armourInSlot.Itemstack.ItemAttributes["FireProtection"].AsFloat( );
+			var encumberance = armourInSlot.Itemstack.ItemAttributes["Encumberance"].AsFloat( );
 
-			return new DamageFilter(blunt, piercing, slashing, crushing, flame);
+			return new DamageFilter(blunt, piercing, slashing, crushing, flame, encumberance);
 		}
 	}
 }

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -77,10 +77,9 @@ namespace ArmourMod
 				Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), this.GearInventory == null );
 				#endif
 
-				this.GearInventory.SlotModified += ServerWatchSlotModified;
-				//this.LeftHandItemSlot.//Check also for shields
+				this.GearInventory.SlotModified += ServerGearSlotModified;
 
-				//base.GearInventory.SlotNotified += WatchSlotNotified;
+				this.LeftHandItemSlot.Inventory.SlotModified += ServerOffhandSlotModified;
 
 				//Walk Inventory FIRST TIME ONLY
 				PopulateDamageFilters();
@@ -213,9 +212,9 @@ namespace ArmourMod
 			return base.ReceiveDamage(damageSource, damage);
 		}
 
-		public static bool CheckIfClothesIsArmour(ItemSlot possibleArmour)
+		public static bool CheckIfItemHasDamageFilter(ItemSlot possibleArmour)
 		{
-			if (possibleArmour.Itemstack != null && possibleArmour.Itemstack.Item.Code.BeginsWith("armourmod", "clothes")) {
+			if (possibleArmour.Itemstack != null && possibleArmour.Itemstack.Item.Code.Domain == ArmourModHookin._domain) {
 
 				if (possibleArmour.Itemstack.ItemAttributes.Exists
 					 && (
@@ -234,12 +233,13 @@ namespace ArmourMod
 
 		public static bool CheckForCustomMesh(ItemSlot possibleArmour)
 		{
-			if (possibleArmour.Itemstack != null && possibleArmour.Itemstack.Item.Code.BeginsWith("armourmod", "clothes")) {
+			if (possibleArmour.Itemstack != null && possibleArmour.Itemstack.Item.Code.BeginsWith(ArmourModHookin._domain, "clothes")) {
 
 				if (possibleArmour.Itemstack.ItemAttributes.Exists) {
 					//shape: { base: "entity/humanoid/seraph" },
 
-					if (possibleArmour.Itemstack.Item.Shape != null) {
+					if (possibleArmour.Itemstack.Item.StorageFlags == EnumItemStorageFlags.Outfit
+					    && possibleArmour.Itemstack.Item.Shape != null) {
 						return possibleArmour.Itemstack.Item.Shape.Base.BeginsWith("game", "seraph") == false;
 					}
 				}
@@ -248,21 +248,22 @@ namespace ArmourMod
 			return false;
 		}
 
-		private void ServerWatchSlotModified (int slotId)
+		private void ServerGearSlotModified (int slotId)
 		{
 			var watchedSlot = this.GearInventory[slotId];
 			#if DEBUG
-			Logger.VerboseDebug( "WatchSlotModified:{0}", slotId );
+			Logger.VerboseDebug( "GearSlotModified:{0}", slotId );
 			#endif
 			if ( !watchedSlot.Empty ) {
 				
-				if ( watchedSlot.StorageType == EnumItemStorageFlags.Outfit && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {
+				if ( (watchedSlot.StorageType.HasFlag( EnumItemStorageFlags.Outfit) || watchedSlot.StorageType.HasFlag(EnumItemStorageFlags.Offhand) )
+				    && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {
 					#if DEBUG
-					Logger.VerboseDebug( "Equiped a clothing item:{0}", watchedSlot.Itemstack.Item.Code.ToString() );
+					Logger.VerboseDebug( "Equiped a AF this: {0}", watchedSlot.Itemstack.Item.Code.ToString() );
 					#endif
 					//replace / add damage filter when applicable armor item in slot (which ever that is?)
 
-					if (CheckIfClothesIsArmour(watchedSlot)) 
+					if (CheckIfItemHasDamageFilter(watchedSlot)) 
 					{						
 					DamageFilter dmgFilt = DamageFilter.ConstructFilter( watchedSlot );
 					#if DEBUG
@@ -275,13 +276,49 @@ namespace ArmourMod
 			} else if (watchedSlot.StorageType == EnumItemStorageFlags.Outfit){
 				//Clear out filters for what was in slot# X here - if applicable
 				#if DEBUG
-				Logger.VerboseDebug( "Removed a clothing item from SlotId:{0}",slotId );
+				Logger.VerboseDebug( "Removed a AF item from SlotId:{0}",slotId );
 				#endif
 				DamageFilters.Remove((EnumCharacterDressType)slotId);
 				RecomputeDamageFilterPercents( );
 			}
 		}
 
+
+		private void ServerOffhandSlotModified(int slotId)
+		{						
+			if (slotId == (int)EnumCharacterDressType.Arm) {
+				var handSlot = this.LeftHandItemSlot;
+				#if DEBUG
+				Logger.VerboseDebug("OffhandSlotModified:{0}", slotId);
+				#endif
+				if (!handSlot.Empty) {
+
+					if (handSlot.StorageType.HasFlag(EnumItemStorageFlags.Offhand) && handSlot.Itemstack.Class == EnumItemClass.Item) {
+						#if DEBUG
+						Logger.VerboseDebug("Equiped this: {0}", handSlot.Itemstack.Item.Code.ToString( ));
+						#endif
+
+
+						if (CheckIfItemHasDamageFilter(handSlot)) {
+							DamageFilter dmgFilt = DamageFilter.ConstructFilter(handSlot);
+							#if DEBUG
+							Logger.VerboseDebug("Armour Filter Props: B{0} P{1} S{2} C{3} F{4}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent);
+							#endif
+							DamageFilters[EnumCharacterDressType.Arm] = dmgFilt;
+							RecomputeDamageFilterPercents( );
+						}
+					}
+				} else {
+					//Clear out filters for what was in slot# 10  
+					#if DEBUG
+					Logger.VerboseDebug("Removed a AF from SlotId:{0}", slotId);
+					#endif
+					DamageFilters.Remove(EnumCharacterDressType.Arm);
+					RecomputeDamageFilterPercents( );
+				}
+			}
+		}
+
 		protected void ClientWatchSlotModified (int slotId)
 		{
 			#if DEBUG
@@ -293,7 +330,7 @@ namespace ArmourMod
 			if ( !watchedSlot.Empty ) {
 
 				if ( watchedSlot.StorageType == EnumItemStorageFlags.Outfit && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {					
-					if (CheckIfClothesIsArmour(watchedSlot) && CheckForCustomMesh(watchedSlot))  
+					if (CheckIfItemHasDamageFilter(watchedSlot) && CheckForCustomMesh(watchedSlot))  
 					{						
 						WearArmorModel( slotId, watchedSlot.Itemstack.Item );
 					} 
@@ -362,32 +399,35 @@ namespace ArmourMod
 		}
 
 
-
+		/// <summary>
+		/// Populates the damage filters.
+		/// </summary>
+		/// <remarks>Server side</remarks>
 		private void PopulateDamageFilters()
 		{
 			DamageFilters = new Dictionary<EnumCharacterDressType, DamageFilter>( Enum.GetNames(typeof(EnumCharacterDressType)).Length );
 
 			if ( this.GearInventory.Count > 0 ) {
-				foreach(var itemSlot in this.GearInventory ) {
+				foreach(ItemSlot itemSlot in this.GearInventory ) {
 
-					EnumCharacterDressType slotId = (EnumCharacterDressType)this.GearInventory.GetSlotId( itemSlot );
+					int slotId = this.GearInventory.GetSlotId( itemSlot );
 					if ( !itemSlot.Empty ) {
 
-						if ( itemSlot.StorageType == EnumItemStorageFlags.Outfit && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
+						if ( (itemSlot.StorageType.HasFlag(EnumItemStorageFlags.Outfit) || itemSlot.StorageType.HasFlag(EnumItemStorageFlags.Offhand) ) && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
 
-							if ( CheckIfClothesIsArmour(itemSlot) ) 
+							if ( CheckIfItemHasDamageFilter(itemSlot) ) 
 							{
-#if DEBUG
-							CoreAPI.World.Logger.VerboseDebug( "DF: Consider clothing item:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
-#endif
+							#if DEBUG
+							CoreAPI.World.Logger.VerboseDebug( "DF: Consider item:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
+							#endif
 
 							DamageFilter dmgFilt = DamageFilter.ConstructFilter( itemSlot);
 							
-#if DEBUG
+							#if DEBUG
 							CoreAPI.World.Logger.VerboseDebug( "Armour Filter Props: B{0} P{1} S{2} C{3} F{4}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent );
-#endif
+							#endif
 
-							DamageFilters.Add(slotId,dmgFilt);							
+								DamageFilters.Add((EnumCharacterDressType)slotId,dmgFilt);							
 							} 
 						}
 					}	
@@ -426,16 +466,18 @@ namespace ArmourMod
 		}
 
 		private void WearArmorModel(int slotId, Item wornArmour)
-		{		
-			if ( !RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
-#if DEBUG
-				Logger.VerboseDebug( "Wearing: {0}", wornArmour.Code.ToString( ) );
-#endif
-				RenderableWornArmours.Add( (EnumCharacterDressType)slotId, wornArmour );
-			} else {
-#if DEBUG
-				Logger.VerboseDebug( "Duplicate of SlotId {0} worn Armour: {1}",slotId ,wornArmour.Code.ToString( ) );
-#endif
+		{
+			if (wornArmour.StorageFlags == EnumItemStorageFlags.Outfit) {
+				if (!RenderableWornArmours.ContainsKey(( EnumCharacterDressType )slotId)) {
+					#if DEBUG
+					Logger.VerboseDebug("Marking Renderable: {0}", wornArmour.Code.ToString( ));
+					#endif
+					RenderableWornArmours.Add(( EnumCharacterDressType )slotId, wornArmour);
+				} else {
+					#if DEBUG
+					Logger.VerboseDebug("Duplicate of SlotId {0} Renderable: {1}", slotId, wornArmour.Code.ToString( ));
+					#endif
+				}
 			}
 		}
 
@@ -443,14 +485,14 @@ namespace ArmourMod
 		{
 			if ( RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
 				var armourItem = RenderableWornArmours[(EnumCharacterDressType)slotId];
-#if DEBUG
-				Logger.VerboseDebug( "UN-Wearing: {0}", armourItem.Code.ToString( ) );
-#endif
+				#if DEBUG
+				Logger.VerboseDebug( "UN-Marking Renderable: {0}", armourItem.Code.ToString( ) );
+				#endif
 				RenderableWornArmours.Remove( (EnumCharacterDressType)slotId );
 			} else {
-#if DEBUG
-				Logger.VerboseDebug( "Non-armour removed, slotID{0}", slotId );
-#endif
+				#if DEBUG
+				Logger.VerboseDebug( "Non-Renderable removed, slotID{0}", slotId );
+				#endif
 			}
 		}
 
@@ -468,7 +510,7 @@ namespace ArmourMod
 
 						if ( itemSlot.StorageType == EnumItemStorageFlags.Outfit && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
 
-							if ( CheckIfClothesIsArmour(itemSlot) ) 
+							if ( CheckIfItemHasDamageFilter(itemSlot) ) 
 							{ 
 								#if DEBUG
 								Logger.VerboseDebug( "{0} is wearing armour: {1}", targetPlayer.Player.PlayerName, itemSlot.Itemstack.Item.Code.ToString( ) );

--- a/ArmourMod/Armour/ItemArmour.cs
+++ b/ArmourMod/Armour/ItemArmour.cs
@@ -29,13 +29,9 @@ namespace ArmourMod
 			var slashing = stack.ItemAttributes["SlashingProtection"].AsFloat( );
 			var crushing = stack.ItemAttributes["CrushingProtection"].AsFloat( );
 			var flame = stack.ItemAttributes["FireProtection"].AsFloat( );
+			var encumberance = stack.ItemAttributes["Encumberance"].AsFloat( );
 
-			dsc.AppendFormat("Protection:\n Blunt {0:P1}\n Piercing {1:P1}\n Slashing {2:P1}\n Crushing {3:P1}\n Flame {4:P1}\n",
-							 blunt,
-							 piercing,
-							 slashing,
-							 crushing,
-							 flame);
+			dsc.AppendFormat($"Blunt {blunt:P1}\n Piercing {piercing:P1}\n Slashing {slashing:P1}\n Crushing {crushing:P1}\n Flame {flame:P1}\n Encumberance {encumberance:P1}\n");
 
 			EnumCharacterDressType dresstype;
 			string strdress = stack.ItemAttributes["clothescategory"].AsString( );

--- a/ArmourMod/ArmourMod.csproj
+++ b/ArmourMod/ArmourMod.csproj
@@ -147,6 +147,12 @@
     <None Include="assets\armourmod\lang\en.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\armourmod\shapes\item\armour\buckler.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\armourmod\itemtypes\wearable\item-offhand-buckler.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="assets\armourmod\" />

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
@@ -30,7 +30,8 @@
 			BluntProtection:0.2,
 			PiercingProtection:0.3,
 			SlashingProtection:0.3,
-			CrushingProtection:0.1
+			CrushingProtection:0.1,
+			FireProtection:0.11
 		},
 		"*":{
 			clothescategory: "head",

--- /dev/null
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-offhand-shields.json
@@ -0,0 +1,82 @@
+{
+	code: "clothes-offhand-buckler",
+	class: "ItemArmour",
+	storageFlags: 257,
+	
+	heldRightTpIdleAnimation: "holdinglanternrighthand",
+	heldLeftTpIdleAnimation: "holdinglanternlefthand",
+	
+	variantgroups: [
+		{ code: "metal", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "iron" ] },
+	],
+	
+	shape: { base: "armourmod:item/armament/armour/buckler" },
+
+	textures: {
+		"metal": { base: "block/metal/ingot/{metal}" },
+		"handle": { base: "item/tool/material/wood" } 
+	},
+	
+	durabilitybytype: {		
+		"clothes-offhand-buckler-gold": 175,
+		"clothes-offhand-buckler-silver": 175,
+		"clothes-offhand-buckler-copper": 350,
+		"clothes-offhand-buckler-tinbronze": 500,
+		"clothes-offhand-buckler-bismuthbronze": 600,
+		"clothes-offhand-buckler-blackbronze": 700,
+		"clothes-offhand-buckler-iron": 1200,
+		"clothes-offhand-buckler-steel": 1800,
+	},
+
+	attributesByType: {		
+		"*-copper": {							
+			BluntProtection:0.1,
+			PiercingProtection:0.1,
+			SlashingProtection:0.1,
+			CrushingProtection:0.1
+		},
+		"*-tinbronze": {							
+			BluntProtection:0.12,
+			PiercingProtection:0.12,
+			SlashingProtection:0.12,
+			CrushingProtection:0.12
+		},
+		"*-bismuthbronze": {							
+			BluntProtection:0.13,
+			PiercingProtection:0.13,
+			SlashingProtection:0.13,
+			CrushingProtection:0.13
+		},
+		"*-blackbronze": {							
+			BluntProtection:0.15,
+			PiercingProtection:0.15,
+			SlashingProtection:0.15,
+			CrushingProtection:0.15
+		},
+		"*-iron": {							
+			BluntProtection:0.2,
+			PiercingProtection:0.2,
+			SlashingProtection:0.2,
+			CrushingProtection:0.2
+		},
+	},
+
+	fpHandTransform: {
+		translation: { x: 0.3, y: -0.1, z: 0 },
+		rotation: { x: 0, y: -45, z: 0 },
+		scale: 1.18
+	},
+	guiTransform: {
+		origin: { x: 0.5, y: 0.3, z: 0.5 },
+		scale: 1.5
+	},
+	tpHandTransform: {
+		translation: { x: -0.59, y: -0.89, z: -0.83 },
+		rotation: { x: 0, y: -8, z: -96 },
+		scale: 0.55
+	},
+	groundTransform: {
+		origin: { x: 0.5, y: 0, z: 0.5 },
+		scale: 2
+	}	
+}

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
@@ -55,7 +55,8 @@
 			BluntProtection:0.3,
 			PiercingProtection:0.3,
 			SlashingProtection:0.3,
-			CrushingProtection:0.3
+			CrushingProtection:0.3,
+			FireProtection:0.14
 		},
 		"*-lamellar": {		
 			clothescategory: "upperbodyover",			
@@ -63,7 +64,8 @@
 			BluntProtection:0.35,
 			PiercingProtection:0.35,
 			SlashingProtection:0.35,
-			CrushingProtection:0.35
+			CrushingProtection:0.35,
+			FireProtection:0.14
 		},
 		"*-platechest": {	
 			clothescategory: "upperbodyover",				
@@ -71,7 +73,8 @@
 			BluntProtection:0.32,
 			PiercingProtection:0.3,
 			SlashingProtection:0.37,
-			CrushingProtection:0.31
+			CrushingProtection:0.31,
+			FireProtection:0.2
 		},
 		"*-scale": {
 			clothescategory: "upperbodyover",					
@@ -79,7 +82,8 @@
 			BluntProtection:0.27,
 			PiercingProtection:0.26,
 			SlashingProtection:0.27,
-			CrushingProtection:0.25
+			CrushingProtection:0.25,
+			FireProtection:0.1
 		},
 		"*-chain": {		
 			clothescategory: "upperbodyover",			
@@ -87,13 +91,15 @@
 			BluntProtection:0.2,
 			PiercingProtection:0.25,
 			SlashingProtection:0.25,
-			CrushingProtection:0.2
+			CrushingProtection:0.2,
+			FireProtection:0.05
 		},
 		"*-studdedleather": {	
 			clothescategory: "upperbodyover",		
 			inCharacterCreationDialog: false,
 			SlashingProtection:0.17,
-			BluntProtection:0.2
+			BluntProtection:0.2,
+			FireProtection:0.19
 		},
 		"*-leather": {		
 			clothescategory: "upperbodyover",	

--- /dev/null
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler.json
@@ -0,0 +1,51 @@
+{
+	code: "buckler-wood",
+	class: "ItemArmour",
+	storageFlags: 257,
+	heldRightTpIdleAnimation: "holdinglanternrighthand",
+	heldLeftTpIdleAnimation: "holdinglanternlefthand",
+	attributes: 
+	{			
+		BluntProtection:0.13,
+		PiercingProtection:0.1,
+		SlashingProtection:0.1,
+		CrushingProtection:0.05,
+		FireProtection:0.01
+	},	
+	shape: {
+		 base: "item/armour/buckler" 
+	},
+	durability: 50,
+	creativeinventory: { "general": ["*"], "items": ["*"], "clothing": ["*"] },
+	textures: { 
+			aged:{ base: "game:block/wood/debarked/aged"},			
+		 	},
+	
+	fpHandTransform: {
+		translation: { x: 0, y: 0, z: 0 },
+		rotation: { x: 17, y: 38, z: -33 },
+		scale: 1.5
+	},
+	guiTransform: {
+		translation: { x: 0, y: 1, z: 0 },
+		rotation: { x: 2, y: 0, z: 0 },
+		origin: { x: 0.45, y: 0.55, z: 0.5 },
+		scale: 1.6
+	},
+	tpHandTransform: {
+		translation: { x: 0, y: -0.05, z: -0.6 },
+		rotation: { x: -65, y: -180, z: 90 },
+		origin: { x: 0.5, y: 0, z: 0.5 },
+		scale: 0.8
+	},
+	groundTransform: {
+		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
+}
\ No newline at end of file

--- /dev/null
+++ b/ArmourMod/assets/armourmod/shapes/item/armour/buckler.json
@@ -0,0 +1,71 @@
+{
+	"editor": {
+		"allAngles": false,
+		"singleTexture": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textures": {
+		"aged": "block/wood/debarked/aged"
+	},
+	"elements": [
+		{
+			"name": "Handle",
+			"from": [ 8.0, 7.0, 8.0 ], 
+			"to": [ 8.75, 12.0, 8.75 ], 
+			"rotationOrigin": [ 8.0, 7.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#aged", "uv": [ 0.0, 0.0, 5.0, 0.5 ], "rotation": 90 },
+				"east": { "texture": "#aged", "uv": [ 0.0, 0.0, 5.0, 0.5 ], "rotation": 90 },
+				"south": { "texture": "#aged", "uv": [ 0.0, 0.0, 5.0, 0.5 ], "rotation": 90 },
+				"west": { "texture": "#aged", "uv": [ 0.0, 0.0, 5.0, 0.5 ], "rotation": 90 },
+				"up": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+				"down": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] }
+			},
+			"children": [
+				{
+					"name": "Handle1",
+					"from": [ 0.0, 0.0, -2.25 ], 
+					"to": [ 0.75, 0.75, 0.0 ], 
+					"rotationOrigin": [ 0.0, 0.0, -2.0 ],
+					"faces": {
+						"north": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"east": { "texture": "#aged", "uv": [ 0.0, 0.0, 2.0, 0.5 ] },
+						"south": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"west": { "texture": "#aged", "uv": [ 0.0, 0.0, 2.0, 0.5 ] },
+						"up": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
+						"down": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }
+					}
+				},
+				{
+					"name": "Handle2",
+					"from": [ 0.0, 4.25, -2.25 ], 
+					"to": [ 0.75, 5.0, 0.0 ], 
+					"rotationOrigin": [ 0.0, 4.0, -2.0 ],
+					"faces": {
+						"north": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"east": { "texture": "#aged", "uv": [ 0.0, 0.0, 2.0, 0.5 ] },
+						"south": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+						"west": { "texture": "#aged", "uv": [ 0.0, 0.0, 2.0, 0.5 ] },
+						"up": { "texture": "#aged", "uv": [ 0.5, 0.0, 1.0, 2.0 ] },
+						"down": { "texture": "#aged", "uv": [ 0.0, 0.0, 0.5, 2.0 ] }
+					}
+				},
+				{
+					"name": "Face",
+					"from": [ -4.0, -2.0, -2.0 ], 
+					"to": [ 5.0, 7.0, -1.0 ], 
+					"rotationOrigin": [ 0.5, 2.5, 0.0 ],
+					"rotationZ": -45.0,
+					"faces": {
+						"north": { "texture": "#aged", "uv": [ 1.0, 0.0, 10.0, 9.0 ] },
+						"east": { "texture": "#aged", "uv": [ 4.0, 5.5, 13.0, 6.5 ], "rotation": 90 },
+						"south": { "texture": "#aged", "uv": [ 1.0, 0.0, 10.0, 9.0 ] },
+						"west": { "texture": "#aged", "uv": [ 4.0, 4.0, 13.0, 5.0 ], "rotation": 90 },
+						"up": { "texture": "#aged", "uv": [ 7.0, 14.5, 16.0, 15.5 ] },
+						"down": { "texture": "#aged", "uv": [ 7.0, 15.0, 16.0, 16.0 ] }
+					}
+				}
+			]
+		}
+	]}
\ No newline at end of file

--- a/ArmourMod/modinfo.json
+++ b/ArmourMod/modinfo.json
@@ -3,7 +3,7 @@
   "name": "Basic Armour Mod",
   "description" : "Leather, Plate, Scale & More",
   "authors": ["Melchior", "Bunnyviking"],
-  "version": "0.1.8",
+  "version": "0.1.9",
   "dependencies": { 
 	"game": "1.9.9",
 	"survival": ""