Merge #461 (cannonfodder1:ConfigMinDamage)

Author: robojumper

CHANGELOG.md

@@ -119,6 +119,8 @@ All notable changes to Vanilla 'War Of The Chosen' Behaviour will be documented
   applied to targets (#89)
 - Added ability to prevent multi-part missions counting as separate missions
   for will loss purposes (#44)
+- Added option to mitigate all weapon damage using armor instead of always taking at
+  least 1 damage (#321)
 
 ### Modding Exposures
 - Deprivatise variables to protected in XComIdleAnimationStateMachine to allow

X2WOTCCommunityHighlander/Config/XComGameCore.ini

@@ -15,4 +15,10 @@
 +PlayerTurnOrder=eTeam_Two
 
 [XComGame.X2AbilityToHitCalc_StandardAim]
-;+CritUpgradesThatDontUseEffects="MyFancyTemplateName" ;For modders to use to specify upgrades in their mods that use Issue #237 functionality
+;+CritUpgradesThatDontUseEffects="MyFancyTemplateName" ;For modders to use to specify upgrades in their mods that use Issue #237 functionality
+
+; Issue 321
+; Set to false/commented out (vanilla behaviour) if you want to still damage the target by 1 even if armor is more than incoming damage
+; Set to true/uncomment it if you want damage that is less than target armor to be completely neutralized
+[XComGame.X2Effect_ApplyWeaponDamage]
+;+NO_MINIMUM_DAMAGE=true

X2WOTCCommunityHighlander/Src/XComGame/Classes/X2Effect_ApplyWeaponDamage.uc

@@ -19,6 +19,9 @@ var bool    bIgnoreArmor;
 var bool	bBypassSustainEffects;
 var array<name> HideVisualizationOfResultsAdditional;
 
+// Issue #321
+var config bool NO_MINIMUM_DAMAGE;
+
 // These values are extra amount an ability may add or apply directly
 var WeaponDamageValue EffectDamageValue;
 var int EnvironmentalDamageAmount;
@@ -1036,7 +1039,8 @@ simulated function int CalculateDamageAmount(const out EffectAppliedData ApplyEf
 				ArmorMitigation -= ArmorPiercing;				
 				if (ArmorMitigation < 0)
 					ArmorMitigation = 0;
-				if (ArmorMitigation >= WeaponDamage)
+				// Issue #321
+				if (ArmorMitigation >= WeaponDamage && !default.NO_MINIMUM_DAMAGE)
 					ArmorMitigation = WeaponDamage - 1;
 				if (ArmorMitigation < 0)    //  WeaponDamage could have been 0
 					ArmorMitigation = 0;