diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs index 38e2ebfb5..442936431 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs @@ -205,7 +205,7 @@ namespace Barotrauma { grabHoldButton = new GUIButton( new Rectangle(character.SelectedCharacter.Inventory.SlotPositions[0].ToPoint() + new Point(320, -60), new Point(130, 20)), - "Grabbing: " + (character.AnimController.GrabLimb == LimbType.Torso ? "Torso" : "Hands"), ""); + TextManager.Get("Grabbing") + ": " + TextManager.Get(character.AnimController.GrabLimb == LimbType.None ? "Hands" : character.AnimController.GrabLimb.ToString()), ""); grabHoldButton.OnClicked = (button, userData) => { @@ -223,7 +223,7 @@ namespace Barotrauma GameMain.Client.CreateEntityEvent(Character.Controlled, new object[] { NetEntityEvent.Type.Control }); } - grabHoldButton.Text = "Grabbing: " + (Character.Controlled.AnimController.GrabLimb == LimbType.Torso ? "Torso" : "Hands"); + grabHoldButton.Text = TextManager.Get("Grabbing") + ": " + TextManager.Get(character.AnimController.GrabLimb == LimbType.None ? "Hands" : character.AnimController.GrabLimb.ToString()); return true; }; } diff --git a/Barotrauma/BarotraumaShared/Content/Texts.xml b/Barotrauma/BarotraumaShared/Content/Texts.xml index db5d66ef1..718861ee7 100644 --- a/Barotrauma/BarotraumaShared/Content/Texts.xml +++ b/Barotrauma/BarotraumaShared/Content/Texts.xml @@ -53,11 +53,30 @@ Water pressure increasing! Grabbing Stun + OK Unconscious Injured + + + Left hand + Right hand + Hands + Left arm + Right arm + Left leg + Right leg + Left foot + Right foot + Head + Torso + Tail + Legs + Right thigh + Left thigh + Waist Yes diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs index 52f1b34cc..8a9ec6738 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs @@ -1034,7 +1034,8 @@ namespace Barotrauma { Limb targetLimb = target.AnimController.GetLimb(GrabLimb); - if (targetLimb == null || targetLimb.IsSevered) + //grab hands if GrabLimb is not specified (or torso if the character has no hands) + if (GrabLimb == LimbType.None || targetLimb.IsSevered) { targetLimb = target.AnimController.GetLimb(LimbType.Torso); if (i == 0)