提交: 719bfd0cacfa7bd9dd4a3a0533b18264062cf01b - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• 修订版: 719bfd0cacfa7bd9dd4a3a0533b18264062cf01b (tree)
• 时间: 2019-06-12 09:16:48
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Fixed Environmental damage from throwing exception
Prevent heals from decaying armour
Change for possible null-ref by using self as damage source for item decay

更改概述

• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/Armour/ItemArmour.cs
• modified: ArmourMod/modinfo.json

差异

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -185,12 +185,20 @@ namespace ArmourMod
 		/// <param name="damage">Damage.</param>
 		public override bool ReceiveDamage(DamageSource damageSource, float damage)
 		{
-			if (damageSource.Type != EnumDamageType.Heal) 
+			if 
+				(
+			    damageSource.Type == EnumDamageType.BluntAttack || 
+			    damageSource.Type == EnumDamageType.PiercingAttack ||
+				damageSource.Type == EnumDamageType.SlashingAttack ||
+				damageSource.Type == EnumDamageType.Crushing ||
+				damageSource.Type == EnumDamageType.Fire
+				)			   
 			{
 				float beforeDamage = damage;
 				//TODO: evaluate postion vector of strike to determine WHEN position of armour offers protection
 
-				if (DamageFilters.Count > 0) {
+				if (DamageFilters  != null && DamageFilters.Count > 0) 
+				{
 					//Evaluate damge type
 					//Reduce by any applicable filter(s)
 					//Pass along
@@ -223,23 +231,31 @@ namespace ArmourMod
 
 					default:
 
+						if (damageSource.Source == EnumDamageSource.Player) {
+							#if DEBUG
+							Logger.Warning("Player did unhandled type of damage {0}", damageSource.Type );
+							#endif
+						}
+
 						break;
 					}
-				}
 
-				#if DEBUG
-				Logger.VerboseDebug("Reduced: {0} Dmg from {2}; [{1}]", damage, damageSource.Type.ToString( ), beforeDamage);
-				#endif
+					if (damage > 0) {
+						#if DEBUG
+						Logger.VerboseDebug("Reduced: {0} Dmg from {2}; [{1}]", damage, damageSource.Type.ToString( ), beforeDamage);
+						#endif
 
-				//All worn Armours adsorb damage themselves... 
-				List<EnumCharacterDressType> slotsList = this.DamageFilters.Keys.ToList();
+						//All worn Armours adsorb damage themselves... 
+						List<EnumCharacterDressType> slotsList = this.DamageFilters.Keys.ToList( );
 
-				foreach (var slotId in slotsList) {
-					ItemSlot slot = this.GearInventory[(int)slotId];
-					Item armourItem = slot.Itemstack.Item;
+						foreach (var slotId in slotsList) {
+							ItemSlot slot = this.GearInventory[( int )slotId];
+							Item armourItem = slot.Itemstack.Item;
 
-					armourItem.DamageItem(ServerAPI.World, damageSource.SourceEntity, slot, 1);
-				}				
+							armourItem.DamageItem(ServerAPI.World, this, slot, 1);
+						}
+					}
+				}
 			}
 
 			return base.ReceiveDamage(damageSource, damage);

--- a/ArmourMod/Armour/ItemArmour.cs
+++ b/ArmourMod/Armour/ItemArmour.cs
@@ -23,14 +23,14 @@ namespace ArmourMod
 			this.Durability}));
 			}
 
-			//Display Protection values
+			//Display Protection values & Weight / dissadvantages
 			var blunt = stack.ItemAttributes["BluntProtection"].AsFloat( );
 			var piercing = stack.ItemAttributes["PiercingProtection"].AsFloat( );
 			var slashing = stack.ItemAttributes["SlashingProtection"].AsFloat( );
 			var crushing = stack.ItemAttributes["CrushingProtection"].AsFloat( );
 			var flame = stack.ItemAttributes["FireProtection"].AsFloat( );
 
-			dsc.AppendFormat("Protection:\n Blunt {0:P1}\n Piercing {1:P1}\n Slashing {2:P1}\n Crushing {3:P1}\n Flame {4:P1}",
+			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,
@@ -46,6 +46,10 @@ namespace ArmourMod
 				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/modinfo.json
+++ b/ArmourMod/modinfo.json
@@ -3,9 +3,9 @@
   "name": "Basic Armour Mod",
   "description" : "Leather, Plate, Scale & More",
   "authors": ["Melchior", "Bunnyviking"],
-  "version": "0.1.7",
+  "version": "0.1.8",
   "dependencies": { 
-	"game": "1.9.7",
+	"game": "1.9.9",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"