Overhauled GetEndMessage() to also include detaining

This commit is contained in:
Alex Noir
2017-12-02 16:15:50 +03:00
parent deefcafe02
commit 0740ca84bc
@@ -72,35 +72,51 @@ namespace Barotrauma
string endMessage = ""; string endMessage = "";
if (targetCharacter.IsDead && !traitorCharacter.IsDead) endMessage = traitorCharacter.Name + " was a traitor! ";
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "His" : "Her";
endMessage += " task was to assassinate " + targetCharacter.Name;
if (targetCharacter.IsDead) //Partial or complete mission success
{ {
endMessage = traitorCharacter.Name + " was a traitor! "; endMessage += ". The task was successful";
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "His" : "Her"; if (traitorCharacter.IsDead)
endMessage += " task was to assassinate " + targetCharacter.Name + ". The task was successful."; {
endMessage += ", but luckily the bastard didn't make it out alive either.";
}
else if (traitorCharacter.LockHands)
{
endMessage += ", but ";
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "he" : "she";
endMessage += " was successfuly detained.";
}
else
endMessage += ".";
} }
else if (targetCharacter.IsDead && traitorCharacter.IsDead) else //Partial or complete failure
{ {
endMessage = traitorCharacter.Name + " was a traitor! "; if (traitorCharacter.IsDead)
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "His" : "Her"; {
endMessage += " task was to assassinate " + targetCharacter.Name + ". The task was successful, but luckily the bastard didn't make it out alive either."; endMessage += ", but ";
} endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "he" : "she";
else if (traitorCharacter.IsDead) endMessage += " got " + ((traitorCharacter.Info.Gender == Gender.Male) ? "himself" : "herself");
{ endMessage += " killed before completing it.";
endMessage = traitorCharacter.Name + " was a traitor! "; }
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "His" : "Her"; else
endMessage += " task was to assassinate " + targetCharacter.Name + ", but "; {
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "he" : "she"; endMessage += ". The task was unsuccessful";
endMessage += " got " + ((traitorCharacter.Info.Gender == Gender.Male) ? "himself" : "herself"); if (traitorCharacter.LockHands)
endMessage += " killed before completing it."; {
} endMessage += " - ";
else endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "he" : "she";
{ endMessage += " was successfuly detained";
endMessage = traitorCharacter.Name + " was a traitor! "; }
endMessage += (traitorCharacter.Info.Gender == Gender.Male) ? "His" : "Her"; if (Submarine.MainSub.AtEndPosition)
endMessage += " task was to assassinate " + targetCharacter.Name + ". "; {
endMessage += (Submarine.MainSub.AtEndPosition) ? endMessage += (traitorCharacter.LockHands ? " and " : " - ");
"The task was unsuccessful - the submarine has reached its destination." : endMessage += "the submarine has reached its destination";
"The task was unsuccessful."; }
endMessage += ".";
}
} }
return endMessage; return endMessage;