Merge #557 'fix-carry-out' into beta

X2CommunityCore · Jun 20, 2019 · 836e435 · 836e435
2 parents 6d545a2 + 4048a2d
commit 836e435
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -217,6 +217,7 @@ All notable changes to Vanilla 'War Of The Chosen' Behaviour will be documented
  their damage with psi flyovers (Psi Bomb, mod abilities) (#326)
 - Fix `X2AbilityToHitCalc_StandardAim` discarding unfavorable (for XCOM) changes
  to hit results from effects (#426)
+- Allow soldiers to be carried out from multiple missions in a campaign (#557)
 - Fix patrol logic when corners of a patrol zone lie outside of the map edges and
  a pod tries to patrol to any of them (#508)
 - Make disorient reapply to disoriented units so that things like flashbangs can

diff --git a/X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_Unit.uc b/X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_Unit.uc
@@ -2314,6 +2314,14 @@ function OnBeginTacticalPlay(XComGameState NewGameState)
  }
 
  bRequiresVisibilityUpdate = true;
+
+ // Start Issue #557
+ //
+ // Reset the body recovered flag. A unit that was previously carried to evac while KO'd/bleeding
+ // out will have this flag set, and this flag prevents units from being carried. If this unit
+ // gets KO'd again, they won't be able to be picked up if this flag is still set.
+ bBodyRecovered = false;
+ // End Issue #557
 }
 
 function ApplyFirstTimeStatModifiers()