Commit: 2bd9552a7bf848f28deca99f374fc64ad0572781 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Revision: 2bd9552a7bf848f28deca99f374fc64ad0572781 (tree)
• Zeit: 2019-05-18 08:58:18
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

Re-release cleanup of messages
attempt to fix item names / desc.
Version incriment

Ändern Zusammenfassung

• modified: ArmourMod/Armour/ArmourModHookin.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/ArmourMod.csproj
• modified: ArmourMod/assets/armourmod/lang/en.json
• modified: ArmourMod/modinfo.json

Diff

--- a/ArmourMod/Armour/ArmourModHookin.cs
+++ b/ArmourMod/Armour/ArmourModHookin.cs
@@ -189,10 +189,11 @@ namespace ArmourMod
 
 			//BRUTE FORCE SEARCH!
 			var armourItemsBrute = ClientApi.World.Items.Where( itm => itm.Code != null && itm.Code.BeginsWith( _domain, "clothes" ));
+			#if DEBUG
 			ClientApi.Logger.VerboseDebug( "****************************************************** " );
 			ClientApi.Logger.VerboseDebug( "Known Armour variants: {0}", armourItemsBrute.Count() );
 			ClientApi.Logger.VerboseDebug( "****************************************************** " );
-
+			#endif
 
 			foreach(var armourItem in armourItemsBrute)
 			{		
@@ -240,7 +241,9 @@ namespace ArmourMod
 
 						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 {
@@ -248,7 +251,9 @@ namespace ArmourMod
 				}
 
 				Armoury.Add(armourItem.Code,new ArmourModelData(armourMeshRef, textureId, fudge_transform, fudge_transform.Origin));
+				#if DEBUG
 				ClientApi.Logger.VerboseDebug( "Add Armoury entry: {0}", armourItem.Code.ToShortString() );
+				#endif
 			}
 
 			return Armoury;

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -63,9 +63,11 @@ namespace ArmourMod
 		public override void OnEntityLoaded()
 		{
 			base.OnEntityLoaded();
+			#if DEBUG
 			Logger.VerboseDebug( "OnEntityLoaded - EntityArmourPlayer" );
 
 			Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), base.GearInventory == null );
+			#endif
 
 			if ( CoreAPI.Side.IsClient() ) {								
 
@@ -83,8 +85,9 @@ namespace ArmourMod
 		public override void OnEntitySpawn()
 		{
 			base.OnEntitySpawn();
-
+			#if DEBUG
 			Logger.VerboseDebug( "OnEntitySpawn - EntityArmourPlayer" );
+			#endif
 
 			if ( CoreAPI.Side.IsServer() ) {
 				//Attach to Inventory events
@@ -138,7 +141,10 @@ namespace ArmourMod
 		public override void Revive()
 		{
 			base.Revive();
+			#if DEBUG
 			Logger.VerboseDebug( "Respawned, alive again..." );
+			#endif
+
 		}
 
 		/// <summary>
@@ -248,9 +254,9 @@ namespace ArmourMod
 
 		protected void ClientDelayHook(IClientPlayer byPlayer)
 		{
-			#if DEBUG
+#if DEBUG
 			Logger.Debug("ClientDelayHook: Checking gearInv is null? {0}", base.GearInventory == null);
-			#endif
+#endif
 
 			//CoreAPI.Event.UnregisterCallback(client_callback);
 			base.GearInventory.SlotModified += ClientWatchSlotModified;
@@ -260,29 +266,32 @@ namespace ArmourMod
 		private void ServerWatchSlotModified (int slotId)
 		{
 			var watchedSlot = base.GearInventory[slotId];
-
+			#if DEBUG
 			Logger.VerboseDebug( "WatchSlotModified:{0}", slotId );
-
+			#endif
 			if ( !watchedSlot.Empty ) {
 				
 				if ( watchedSlot.StorageType == EnumItemStorageFlags.Outfit && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {
-
+					#if DEBUG
 					Logger.VerboseDebug( "Equiped a clothing item:{0}", watchedSlot.Itemstack.Item.Code.ToString() );
+					#endif
 					//replace / add damage filter when applicable armor item in slot (which ever that is?)
 
 					if (CheckIfClothesIsArmour(watchedSlot)) 
-					{
+					{						
 					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 );
-
+					#endif
 					DamageFilters[(EnumCharacterDressType)slotId] = dmgFilt;
 					RecomputeDamageFilterPercents( );											
 					} 
 				}
 			} 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 );
+				#endif
 				DamageFilters.Remove((EnumCharacterDressType)slotId);
 				RecomputeDamageFilterPercents( );
 			}
@@ -290,7 +299,9 @@ namespace ArmourMod
 
 		private void ClientWatchSlotModified (int slotId)
 		{
+			#if DEBUG
 			Logger.VerboseDebug( "(Client) WatchSlotModified:{0}", slotId );
+			#endif
 			var watchedSlot = base.GearInventory[slotId];
 
 			if ( !watchedSlot.Empty ) {
@@ -332,15 +343,15 @@ namespace ArmourMod
 
 							if ( CheckIfClothesIsArmour(itemSlot) ) 
 							{
-							#if DEBUG
+#if DEBUG
 							CoreAPI.World.Logger.VerboseDebug( "DF: Consider clothing item:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
-							#endif
+#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);							
 							} 
@@ -383,14 +394,14 @@ namespace ArmourMod
 		private void WearArmorModel(int slotId, Item wornArmour)
 		{		
 			if ( !RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
-				#if DEBUG
+#if DEBUG
 				Logger.VerboseDebug( "Wearing: {0}", wornArmour.Code.ToString( ) );
-				#endif
+#endif
 				RenderableWornArmours.Add( (EnumCharacterDressType)slotId, wornArmour );
 			} else {
-				#if DEBUG
+#if DEBUG
 				Logger.VerboseDebug( "Duplicate of SlotId {0} worn Armour: {1}",slotId ,wornArmour.Code.ToString( ) );
-				#endif
+#endif
 			}
 		}
 
@@ -398,14 +409,14 @@ namespace ArmourMod
 		{
 			if ( RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
 				var armourItem = RenderableWornArmours[(EnumCharacterDressType)slotId];
-				#if DEBUG
+#if DEBUG
 				Logger.VerboseDebug( "UN-Wearing: {0}", armourItem.Code.ToString( ) );
-				#endif
+#endif
 				RenderableWornArmours.Remove( (EnumCharacterDressType)slotId );
 			} else {
-				#if DEBUG
+#if DEBUG
 				Logger.VerboseDebug( "Non-armour removed, slotID{0}", slotId );
-				#endif
+#endif
 			}
 		}
 
@@ -425,9 +436,9 @@ namespace ArmourMod
 
 							if ( CheckIfClothesIsArmour(itemSlot) ) 
 							{
-								#if DEBUG
+#if DEBUG
 								Logger.VerboseDebug( "Now wearing armour:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
-								#endif
+#endif
 
 								if (RenderableWornArmours.ContainsKey(( EnumCharacterDressType )slotId)) {
 									Logger.Warning("DUPLICATE assignment; Armour in slot: {0} named: {1}", slotId, itemSlot.Itemstack.Item.Code.ToString( ));

--- a/ArmourMod/ArmourMod.csproj
+++ b/ArmourMod/ArmourMod.csproj
@@ -28,12 +28,19 @@
     </CustomCommands>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
+    <DebugType></DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="7z -tzip a Armour_${ProjectConfig}.zip" workingdir="${TargetDir}" />
+        <Command type="AfterClean" command="rm -f *.zip" workingdir="${TargetDir}" />
+      </CustomCommands>
+    </CustomCommands>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -133,10 +140,12 @@
     <None Include="assets\armourmod\recipes\grid\vests.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="assets\armourmod\lang\en.json" />
     <None Include="assets\armourmod\recipes\grid\helmets.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\armourmod\lang\en.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="assets\armourmod\" />

--- a/ArmourMod/assets/armourmod/lang/en.json
+++ b/ArmourMod/assets/armourmod/lang/en.json
@@ -1,15 +1,10 @@
-{
-	"item:clothes-head-potmetal": "Metal Pot Helm",   
-	"item:clothes-upperbodyover-vest-studdedleather": "Studded Leather Vest",   
-	"item:clothes-upperbodyover-vest-scale": "Scale Mail Vest",   
-	"item:clothes-upperbodyover-vest-platechest": "Plate Armour Vest",   
-	"item:clothes-upperbodyover-vest-leather": "Leather Vest",   
-	"item:clothes-upperbodyover-vest-lamellar": "Lamellar Armour Vest",   
-	"item:clothes-upperbodyover-vest-coatofplates": "Coat'o'Plates Armour Vest",   
-	"item:clothes-upperbodyover-vest-chain": "Chainmail"  ,
-
-	"armourmod:item-clothes-upperbodyover-vest-leather": "2Leather Vest",
-	"armourmod:clothes-upperbodyover-vest-leather": "3Leather Vest",
-	"armourmod:item-upperbodyover-vest-leather": "4Leather Vest",
-
+{	
+	"item-armourmod:clothes-head-potmetal": "Metal Pot Helm",   
+	"item-armourmod:clothes-upperbodyover-vest-studdedleather": "Studded Leather Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-scale": "Scale Mail Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-platechest": "Plate Armour Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-leather": "Leather Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-lamellar": "Lamellar Armour Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-coatofplates": "Coat'o'Plates Armour Vest",   
+	"item-armourmod:clothes-upperbodyover-vest-chain": "Chainmail",  
 }
\ 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.2",
+  "version": "0.1.3",
   "dependencies": { 
 	"game": "1.9.3",
 	"survival": ""