diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
index 149e78ec1..75afd33df 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
@@ -178,7 +178,7 @@ namespace Barotrauma
{
if (GameMain.NetworkMember != null && Character.controlled == this)
{
- string chatMessage = TextManager.Get("Self_CauseOfDeath." + causeOfDeath.ToString());
+ string chatMessage = TextManager.Get("Self_CauseOfDeathDescription." + causeOfDeath.ToString());
if (GameMain.Client != null) chatMessage += " Your chat messages will only be visible to other dead players.";
GameMain.NetworkMember.AddChatMessage(chatMessage, ChatMessageType.Dead);
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
index bf0d37f18..99ff5e4d7 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs
@@ -88,7 +88,7 @@ namespace Barotrauma
Character character = characterInfo.Character;
if (character == null || character.IsDead)
{
- statusText = TextManager.Get("CauseOfDeath." + characterInfo.CauseOfDeath.ToString());
+ statusText = TextManager.Get("CauseOfDeathDescription." + characterInfo.CauseOfDeath.ToString());
statusColor = Color.DarkRed;
}
else
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
index 8b987f5c5..db8c9848d 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
@@ -8,11 +8,30 @@ namespace Barotrauma.Items.Components
{
partial class StatusHUD : ItemComponent
{
- private static readonly string[] BleedingTexts = { "Minor bleeding", "Bleeding", "Bleeding heavily", "Catastrophic Bleeding" };
+ private static readonly string[] BleedingTexts =
+ {
+ TextManager.Get("MinorBleeding"),
+ TextManager.Get("Bleeding"),
+ TextManager.Get("HeavyBleeding"),
+ TextManager.Get("CatastrophicBleeding")
+ };
- private static readonly string[] HealthTexts = { "No visible injuries", "Minor injuries", "Injured", "Major injuries", "Critically injured" };
+ private static readonly string[] HealthTexts =
+ {
+ TextManager.Get("NoInjuries"),
+ TextManager.Get("MinorInjuries"),
+ TextManager.Get("Injuries"),
+ TextManager.Get("MajorInjuries"),
+ TextManager.Get("CriticalInjuries")
+ };
- private static readonly string[] OxygenTexts = { "Oxygen level normal", "Gasping for air", "Signs of oxygen deprivation", "Not breathing" };
+ private static readonly string[] OxygenTexts =
+ {
+ TextManager.Get("OxygenNormal"),
+ TextManager.Get("OxygenReduced"),
+ TextManager.Get("OxygenLow"),
+ TextManager.Get("NotBreathing")
+ };
[Serialize(500.0f, false)]
public float Range
@@ -126,20 +145,20 @@ namespace Barotrauma.Items.Components
if (target.IsDead)
{
- texts.Add("Deceased");
- texts.Add("Cause of Death: " + target.CauseOfDeath.ToString());
+ texts.Add(TextManager.Get("Deceased"));
+ texts.Add(TextManager.Get("CauseOfDeath") + ": " + TextManager.Get("CauseOfDeath." + target.CauseOfDeath.ToString()));
}
else
{
- if (target.IsUnconscious) texts.Add("Unconscious");
- if (target.Stun > 0.01f) texts.Add("Stunned");
+ if (target.IsUnconscious) texts.Add(TextManager.Get("Unconscious"));
+ if (target.Stun > 0.01f) texts.Add(TextManager.Get("Stunned"));
int healthTextIndex = target.Health > 95.0f ? 0 :
MathHelper.Clamp((int)Math.Ceiling((1.0f - (target.Health / 200.0f + 0.5f)) * HealthTexts.Length), 0, HealthTexts.Length - 1);
texts.Add(HealthTexts[healthTextIndex]);
- int oxygenTextIndex = MathHelper.Clamp((int)Math.Floor((1.0f - (target.Oxygen / 200.0f + 0.5f)) * OxygenTexts.Length), 0, OxygenTexts.Length - 1);
+ int oxygenTextIndex = MathHelper.Clamp((int)Math.Floor((1.0f - (target.Oxygen / 100.0f)) * OxygenTexts.Length), 0, OxygenTexts.Length - 1);
texts.Add(OxygenTexts[oxygenTextIndex]);
if (target.Bleeding > 0.0f)
@@ -150,13 +169,13 @@ namespace Barotrauma.Items.Components
if (target.huskInfection != null)
{
- if (target.huskInfection.State != HuskInfection.InfectionState.Transition)
+ if (target.huskInfection.State == HuskInfection.InfectionState.Transition)
{
- texts.Add("Velonaceps calyx infection");
+ texts.Add(TextManager.Get("HuskInfectionTransition"));
}
- else if (target.huskInfection.State != HuskInfection.InfectionState.Active)
+ else if (target.huskInfection.State == HuskInfection.InfectionState.Active)
{
- texts.Add("Advanced Velonaceps calyx infection");
+ texts.Add(TextManager.Get("HuskInfectionActive"));
}
}
}
diff --git a/Barotrauma/BarotraumaShared/Content/Texts.xml b/Barotrauma/BarotraumaShared/Content/Texts.xml
index c1a2be692..cd3156417 100644
--- a/Barotrauma/BarotraumaShared/Content/Texts.xml
+++ b/Barotrauma/BarotraumaShared/Content/Texts.xml
@@ -52,8 +52,7 @@
Running out of oxygen!
Water pressure increasing!
Grabbing
- Stun
-
+ Stun
OK
@@ -135,6 +134,7 @@
Crew
Store
Hire
+ Hire
Location
No-one available for hire.
Mission
@@ -280,28 +280,61 @@
[traitorname] was a traitor! [Genderpronounpossessive] task was to assassinate [targetname]. The task failed - [genderpronoun] was successfully detained.
- Succumbed to their injuries
- Bled out
- Drowned
- Suffocated
- Crushed by water pressure
- Burned to death
- Taken over by a parasite
- Disconnected
+ Cause of death
+ Damage
+ Bloodloss
+ Drowning
+ Suffocation
+ Pressure
+ Burn
+ Husk infection
+ Braindead
+
+ Succumbed to their injuries
+ Bled out
+ Drowned
+ Suffocated
+ Crushed by water pressure
+ Burned to death
+ Taken over by a parasite
+ Disconnected
- You have succumbed to your injuries.
- You have bled out.
- You have drowned.
- You have suffocated.
- You have been crushed by water pressure.
- You have burned to death.
- The parasite has taken over your body.
- You were disconnected from the server.
+ You have succumbed to your injuries.
+ You have bled out.
+ You have drowned.
+ You have suffocated.
+ You have been crushed by water pressure.
+ You have burned to death.
+ The parasite has taken over your body.
+ You were disconnected from the server.
Give in
Let go of your character and enter spectator mode (other players will no longer be able to revive you)
"The character can no longer be revived if you give in."
+
+ Deceased
+ Unconscious
+ Stunned
+ Velonaceps calyx infection
+ Advanced Velonaceps calyx infection
+
+ Minor bleeding
+ Bleeding
+ Heavy bleeding
+ Catastrophic bleeding
+
+ No visible injuries
+ Minor injuries
+ Injured
+ Major injuries
+ Critically injured
+
+ Oxygen level normal
+ Gasping for air
+ Signs of oxygen deprivation
+ Not breathing
+
Your throat feels sore
Your feel feverish