Prevent Squadmate Dead Voicelines from playing when non-soldiers are killed #1504
Conversation
BlackDog86
force-pushed
the
1501-Stop-Crying-About-MimicBeacons
branch
3 times, most recently
from
949acea to
2f6017a
Compare
BlackDog86
force-pushed
the
1501-Stop-Crying-About-MimicBeacons
branch
from
98d5b1c to
82da090
Compare
There was a problem hiding this comment.
@BlackDog86 - have you tested this now? you mention you were going to in the first post.
| /// (i.e. we want to play squadmate dead lines for mind controlled XCom units that die while on the other team's side) | ||
| if(DeadUnit.IsSoldier()) | ||
| { | ||
| if(!DeadUnit.IsMindControlled() || DeadUnit.IsMindControlled() && DeadUnit.GetTeam() != eTeam_XCom) |
There was a problem hiding this comment.
Does this mind control check catch 3rd parties that get mind controlled? e.g. a raider faction unit gets mind controlled by advent. Or do they not count as Soldiers?
There was a problem hiding this comment.
Yeah that's one of the main things I needed to test - not completed yet. I should have time later in the week to look at it :)
There was a problem hiding this comment.
All of the factions I could find (including MOCX) have isSoldier = false on the character template so this should be fine. I haven't been able to test what happens if someone creates an enemy unit with bIsSoldier = true but I suspect this would break a whole bunch of other stuff so I think it's fine here.
|
Safe to merge |
2 participants
Fixes #1501 - Currently untested, will report back once testing is finished.