Commit: cf244e8fdd98e6feed4158121370f24665bbe65c - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: cf244e8fdd98e6feed4158121370f24665bbe65c (tree)
• l'heure: 2019-05-17 08:56:46
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

* EntityArmourPlayer.cs: Armour item decay code added
* clothes-head-potmetal.json,
* clothes-upperbodyover-vest.json: durability added

Change Summary

• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json

Modification

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 
 using Vintagestory.API.Common;
-using Vintagestory .API.Client;
+using Vintagestory.API.Client;
+using Vintagestory.API.Server;
             
 namespace ArmourMod
 {
@@ -11,6 +12,7 @@ namespace ArmourMod
 	{
 		protected ICoreAPI CoreAPI;
 		protected ICoreClientAPI ClientAPI;
+		protected ICoreServerAPI ServerAPI;
 		protected ILogger Logger;
 
 		//Damage Filter list: BY Inventory SLOT#
@@ -39,6 +41,11 @@ namespace ArmourMod
 				this.RenderableWornArmours = new Dictionary<EnumCharacterDressType, Item>(); // BEFORE RENDERER GETS THERE!
 				Logger.VerboseDebug("Renderable Worn Armours Dict assigned");
 			}
+
+			if (CoreAPI.Side.IsServer( )) {
+				this.ServerAPI = api as ICoreServerAPI;
+
+			}
 		}
 
 		public override void OnEntityLoaded()
@@ -121,7 +128,7 @@ namespace ArmourMod
 		public override void Revive()
 		{
 			base.Revive();
-			base.Api.World.Logger.VerboseDebug( "Respawned, alive again..." );
+			Logger.VerboseDebug( "Respawned, alive again..." );
 		}
 
 		/// <summary>
@@ -132,49 +139,62 @@ namespace ArmourMod
 		/// <param name="damage">Damage.</param>
 		public override bool ReceiveDamage(DamageSource damageSource, float damage)
 		{
-			float beforeDamage = damage;
-			//TODO: evaluate postion vector of strike to determine WHEN position of armour offers protection
+			if (damageSource.Type != EnumDamageType.Heal) 
+			{
+				float beforeDamage = damage;
+				//TODO: evaluate postion vector of strike to determine WHEN position of armour offers protection
 
-			if (DamageFilters.Count > 0) {
-				//Evaluate damge type
-				//Reduce by any applicable filter(s)
-				//Pass along
+				if (DamageFilters.Count > 0) {
+					//Evaluate damge type
+					//Reduce by any applicable filter(s)
+					//Pass along
 
-				#if DEBUG
-				Logger.VerboseDebug("{0} has Damage Filters#{1}", this.PlayerUID, DamageFilters.Count);
-				#endif
+					#if DEBUG
+					Logger.VerboseDebug("{0} has Damage Filters#{1}", this.PlayerUID, DamageFilters.Count);
+					#endif
 
-				switch (damageSource.Type) {
+					switch (damageSource.Type) {
 
-				case EnumDamageType.BluntAttack:
-					damage -= damage * bluntPercentReduction;
-					break;
+					case EnumDamageType.BluntAttack:
+						damage -= damage * bluntPercentReduction;
+						break;
 
-				case EnumDamageType.PiercingAttack:
-					damage -= damage * piercingPercentReduction;
-					break;
+					case EnumDamageType.PiercingAttack:
+						damage -= damage * piercingPercentReduction;
+						break;
 
-				case EnumDamageType.SlashingAttack:
-					damage -= damage * slashingPercentReduction;
-					break;
+					case EnumDamageType.SlashingAttack:
+						damage -= damage * slashingPercentReduction;
+						break;
 
-				case EnumDamageType.Crushing:
-					damage -= damage * crushingPercentReduction;
-					break;
+					case EnumDamageType.Crushing:
+						damage -= damage * crushingPercentReduction;
+						break;
 
-				case EnumDamageType.Fire:
-					damage -= damage * firePercentReduction;
-					break;
+					case EnumDamageType.Fire:
+						damage -= damage * firePercentReduction;
+						break;
 
-				default:
+					default:
 
-					break;
+						break;
+					}
 				}
-			}
 
-			#if DEBUG
-			Logger.VerboseDebug("Reduced: {0} Dmg from {2}; [{1}]", damage, damageSource.Type.ToString( ), beforeDamage);
-			#endif
+				#if DEBUG
+				Logger.VerboseDebug("Reduced: {0} Dmg from {2}; [{1}]", damage, damageSource.Type.ToString( ), beforeDamage);
+				#endif
+
+				//All worn Armours adsorb damage themselves... 
+				List<int> slotsList = this.DamageFilters.Keys.ToList();
+
+				foreach (var slotId in slotsList) {
+					ItemSlot slot = this.GearInventory[slotId];
+					Item armourItem = slot.Itemstack.Item;
+
+					armourItem.DamageItem(ServerAPI.World, damageSource.SourceEntity, slot, 1);
+				}				
+			}
 
 			return base.ReceiveDamage(damageSource, damage);
 		}

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
@@ -13,6 +13,7 @@
 	shapeByType:{
 		"*-potmetal": { base: "bunnyviking:item/armament/armour/helmpot" },
 	},
+	durability: 20,		
 	texturesByType: {
 		"*-potmetal":{ 
 			dummy:{ base: "bunnyviking:item/armament/armour/transparent"},

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
@@ -25,6 +25,15 @@
 		"*-chain": { base: "bunnyviking:item/armament/armour/armourchain" },
 		"*-studdedleather": { base: "bunnyviking:item/armament/armour/armourstuddedleather" }		
 	},
+	durabilitybytype: {
+		"*-leather": 20,
+		"*-coatofplates": 20,
+		"*-lamellar": 20,
+		"*-platechest": 20,
+		"*-scale": 20,
+		"*-chain": 20,
+		"*-studdedleather": 20		
+	},
 	texturesByType: {
 		"*-leather":{ 
 			dummy:{ base: "bunnyviking:item/armament/armour/transparent"},