Commit: d46f62d2b3166fd3e1b8c3ce2b915852b91d46c4 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Revision: d46f62d2b3166fd3e1b8c3ce2b915852b91d46c4 (tree)
• Zeit: 2019-07-25 10:21:26
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

feature progress on buckler shields

Ändern Zusammenfassung

• modified: ArmourMod/Armour/DamageFilter.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/Armour/ItemArmour.cs
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler.json

Diff

--- a/ArmourMod/Armour/DamageFilter.cs
+++ b/ArmourMod/Armour/DamageFilter.cs
@@ -13,7 +13,7 @@ namespace ArmourMod
 			slashingPercent = slash;
 			crushingPercent = crush;
 			firePercent = fire;
-			encumberancePercent = 0;
+			encumberanceMultiplier = 1f;
 		}
 
 		public DamageFilter(float blunt, float pierce, float slash, float crush, float fire, float encP)
@@ -23,7 +23,7 @@ namespace ArmourMod
 			slashingPercent = slash;
 			crushingPercent = crush;
 			firePercent = fire;
-			encumberancePercent = encP;
+			encumberanceMultiplier = encP;
 		}
 
 		public float bluntPercent;
@@ -31,7 +31,7 @@ namespace ArmourMod
 		public float slashingPercent;
 		public float crushingPercent;
 		public float firePercent;
-		public float encumberancePercent;
+		public float encumberanceMultiplier;
 
 		//TODO:Threshold values;
 
@@ -43,7 +43,7 @@ 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( );
+			var encumberance = armourInSlot.Itemstack.ItemAttributes["Encumberance"].AsFloat(1F);
 
 			return new DamageFilter(blunt, piercing, slashing, crushing, flame, encumberance);
 		}

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -23,6 +23,9 @@ namespace ArmourMod
 		//Pre-compute values;
 		private DamageFilter finalFilter;
 
+		private const string armourEncumberanceKey = "ArmourEncumberance";
+
+
 		internal ArmourModConfig CachedConfiguration 
 		{
 			get 
@@ -267,10 +270,10 @@ namespace ArmourMod
 					{						
 					DamageFilter dmgFilt = DamageFilter.ConstructFilter( watchedSlot );
 					#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 );
+						Logger.VerboseDebug( "Armour Filter Props: B{0} P{1} S{2} C{3} F{4} E{5}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent, dmgFilt.encumberanceMultiplier );
 					#endif
 					DamageFilters[(EnumCharacterDressType)slotId] = dmgFilt;
-					RecomputeDamageFilterPercents( );											
+					RecomputeDamageFilterProps( );											
 					} 
 				}
 			} else if (watchedSlot.StorageType == EnumItemStorageFlags.Outfit){
@@ -279,7 +282,7 @@ namespace ArmourMod
 				Logger.VerboseDebug( "Removed a AF item from SlotId:{0}",slotId );
 				#endif
 				DamageFilters.Remove((EnumCharacterDressType)slotId);
-				RecomputeDamageFilterPercents( );
+				RecomputeDamageFilterProps( );
 			}
 		}
 
@@ -302,10 +305,10 @@ namespace ArmourMod
 						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);
+							Logger.VerboseDebug("Armour Filter Props: B{0} P{1} S{2} C{3} F{4} E{5}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent, dmgFilt.encumberanceMultiplier);
 							#endif
 							DamageFilters[EnumCharacterDressType.Arm] = dmgFilt;
-							RecomputeDamageFilterPercents( );
+							RecomputeDamageFilterProps( );
 						}
 					}
 				} else {
@@ -314,7 +317,7 @@ namespace ArmourMod
 					Logger.VerboseDebug("Removed a AF from SlotId:{0}", slotId);
 					#endif
 					DamageFilters.Remove(EnumCharacterDressType.Arm);
-					RecomputeDamageFilterPercents( );
+					RecomputeDamageFilterProps( );
 				}
 			}
 		}
@@ -348,7 +351,9 @@ namespace ArmourMod
 		/// <param name="byPlayer">By player.</param>
 		private void HandlePlayerSpawn(IClientPlayer byPlayer)
 		{			
+			#if DEBUG
 			Logger.VerboseDebug("Handling Spawn for: {0}", byPlayer.PlayerName);
+			#endif
 
 			if (byPlayer.Entity != null && byPlayer.Entity is EntityArmourPlayer) {
 				EntityArmourPlayer targetPlayer =  byPlayer.Entity as EntityArmourPlayer;//CHECK: Cast from - not actual instance?
@@ -392,10 +397,10 @@ namespace ArmourMod
 
 
 		private void HandlePlayerDespawn(IClientPlayer byPlayer)
-		{
-			//Unlink watcher event
+		{			
+			#if DEBUG
 			Logger.VerboseDebug("Handling Despawn for: {0}", byPlayer.PlayerName);
-
+			#endif
 		}
 
 
@@ -424,7 +429,7 @@ namespace ArmourMod
 							DamageFilter dmgFilt = DamageFilter.ConstructFilter( itemSlot);
 							
 							#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 );
+								CoreAPI.World.Logger.VerboseDebug( "Armour Filter Props: B{0} P{1} S{2} C{3} F{4} E{5}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent, dmgFilt.encumberanceMultiplier );
 							#endif
 
 								DamageFilters.Add((EnumCharacterDressType)slotId,dmgFilt);							
@@ -435,11 +440,11 @@ namespace ArmourMod
 			}
 
 			if ( DamageFilters.Count > 0 ) {
-				RecomputeDamageFilterPercents( );
+				RecomputeDamageFilterProps( );
 			}
 		}
 
-		private void RecomputeDamageFilterPercents()
+		private void RecomputeDamageFilterProps()
 		{
 			if (DamageFilters != null && DamageFilters.Count > 0)
 			{				
@@ -461,7 +466,17 @@ namespace ArmourMod
 			
 			finalFilter.firePercent = DamageFilters.Sum( df => df.Value.firePercent );
 			finalFilter.firePercent = Math.Abs( finalFilter.firePercent );
-			finalFilter.firePercent = Math.Min( 0.95F, finalFilter.firePercent );			
+			finalFilter.firePercent = Math.Min( 0.95F, finalFilter.firePercent );		
+						
+			finalFilter.encumberanceMultiplier = DamageFilters.Min(df => df.Value.encumberanceMultiplier);
+			//Encumberance needs direct application / removal here;
+			if (finalFilter.encumberanceMultiplier > 0 && finalFilter.encumberanceMultiplier < 1.0) {
+				this.SetWalkSpeedModifier(armourEncumberanceKey, finalFilter.encumberanceMultiplier, false);
+					Logger.VerboseDebug("New Walk Speed Mult: {0}", this.GetWalkSpeedMultiplier( ));
+			} else {
+				this.RemoveWalkSpeedModifier(armourEncumberanceKey);
+			}
+
 			}
 		}
 

--- a/ArmourMod/Armour/ItemArmour.cs
+++ b/ArmourMod/Armour/ItemArmour.cs
@@ -18,9 +18,15 @@ namespace ArmourMod
 			//base.GetHeldItemInfo(stack, dsc, world, withDebugInfo);
 
 			if (this.Durability > 1) {
-				dsc.AppendLine(Lang.Get("Durability: {0} / {1}", new object[] {
-			stack.Attributes.GetInt ("durability", this.Durability),
-			this.Durability}));
+
+				int defDur = stack.Attributes.GetInt("durability", this.Durability);
+
+				//byte greenComponent = (byte)(255 * (float)this.Durability / (float)defDur);
+				//byte redComponent = (byte)(0xff - greenComponent);
+
+				//dsc.Append($"<font color='#{greenComponent:X2}{redComponent:X2}00'>");
+				dsc.AppendLine(Lang.Get("Durability: {0} / {1}", new object[] { defDur, this.Durability}));
+				//dsc.Append("</font>\n");
 			}
 
 			//Display Protection values & Weight / dissadvantages
@@ -29,23 +35,18 @@ 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( );
+			var encumberance = stack.ItemAttributes["Encumberance"].AsFloat(1F );
 
-			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");
+			dsc.AppendFormat($"Blunt {blunt:P1}\n Piercing {piercing:P1}\n Slashing {slashing:P1}\n Crushing {crushing:P1}\n Flame {flame:P1}\n Encumberance {encumberance:N2}X\n");
 
 			EnumCharacterDressType dresstype;
 			string strdress = stack.ItemAttributes["clothescategory"].AsString( );
 
-			if (!Enum.TryParse(strdress, true, out dresstype)) {
-				dsc.AppendLine(Lang.Get("Cloth Category: Unknown"));
-			} else {
+			if (Enum.TryParse(strdress, true, out dresstype)) {
 				dsc.AppendLine(Lang.Get("Cloth Category: {0}", Lang.Get("clothcategory-" + stack.ItemAttributes["clothescategory"].AsString( ))));
 			}
-		}
-
-		//IDEA: Shackles = "Armour" that has high encumberance - and 'sticks' to player; needs specific key to remove
-		//TODO: Shackle & Key item, (Closed) Shackle ItemArmour
 
+		}
 	}
 }
 

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
@@ -56,7 +56,8 @@
 			PiercingProtection:0.3,
 			SlashingProtection:0.3,
 			CrushingProtection:0.3,
-			FireProtection:0.14
+			FireProtection:0.14,
+			Encumberance:0.90
 		},
 		"*-lamellar": {		
 			clothescategory: "upperbodyover",			
@@ -65,7 +66,8 @@
 			PiercingProtection:0.35,
 			SlashingProtection:0.35,
 			CrushingProtection:0.35,
-			FireProtection:0.14
+			FireProtection:0.14,
+			Encumberance:0.87
 		},
 		"*-platechest": {	
 			clothescategory: "upperbodyover",				
@@ -74,7 +76,8 @@
 			PiercingProtection:0.3,
 			SlashingProtection:0.37,
 			CrushingProtection:0.31,
-			FireProtection:0.2
+			FireProtection:0.2,
+			Encumberance:0.85
 		},
 		"*-scale": {
 			clothescategory: "upperbodyover",					
@@ -83,7 +86,8 @@
 			PiercingProtection:0.26,
 			SlashingProtection:0.27,
 			CrushingProtection:0.25,
-			FireProtection:0.1
+			FireProtection:0.1,
+			Encumberance:0.90
 		},
 		"*-chain": {		
 			clothescategory: "upperbodyover",			
@@ -92,21 +96,24 @@
 			PiercingProtection:0.25,
 			SlashingProtection:0.25,
 			CrushingProtection:0.2,
-			FireProtection:0.05
+			FireProtection:0.05,
+			Encumberance:0.95
 		},
 		"*-studdedleather": {	
 			clothescategory: "upperbodyover",		
 			inCharacterCreationDialog: false,
 			SlashingProtection:0.17,
 			BluntProtection:0.2,
-			FireProtection:0.19
+			FireProtection:0.19,
+			Encumberance:0.98
 		},
 		"*-leather": {		
 			clothescategory: "upperbodyover",	
 			inCharacterCreationDialog: false,
 			BluntProtection:0.12,
 			SlashingProtection:0.15,
-			FireProtection:0.2
+			FireProtection:0.2,
+			Encumberance:0.99
 		},
 		"*":{
 			clothescategory: "upperbodyover",

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler.json
@@ -19,12 +19,12 @@
 	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
+		translation: { x: 0, y: -0.05, z: -0.6 },
+		rotation: { x: -100, y: -180, z: 90 },
+		origin: { x: 0.5, y: 0, z: 0.5 },
+		scale: 0.8
 	},
 	guiTransform: {
 		translation: { x: 0, y: 1, z: 0 },
@@ -34,7 +34,7 @@
 	},
 	tpHandTransform: {
 		translation: { x: 0, y: -0.05, z: -0.6 },
-		rotation: { x: -65, y: -180, z: 90 },
+		rotation: { x: -90, y: -180, z: 90 },
 		origin: { x: 0.5, y: 0, z: 0.5 },
 		scale: 0.8
 	},