tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Climbable localization fixes (#3645)

Browse Source 
* Working on climable

* Continue

* Fixed typo

* Fixed rest of climbable

* Fixed localisation

* Update climbable-component.ftl
This commit is contained in:
Alex Evgrashin
2021-03-15 21:02:56 +03:00
committed by GitHub
parent fb6df4cc7c
commit 2aa60467b7
2 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs
View File

@@ -71,27 +71,27 @@ namespace Content.Server.GameObjects.Components.Movement
{
if (!ActionBlockerSystem.CanInteract(user))
{
reason = Loc.GetString("You can't do that!");
reason = Loc.GetString("comp-climbable-cant-interact");
return false;
}
if (!user.HasComponent<ClimbingComponent>() ||
!user.TryGetComponent(out IBody body))
{
reason = Loc.GetString("You are incapable of climbing!");
reason = Loc.GetString("comp-climbable-cant-climb");
return false;
}
if (body.GetPartsOfType(BodyPartType.Leg).Count == 0 ||
body.GetPartsOfType(BodyPartType.Foot).Count == 0)
{
reason = Loc.GetString("You are unable to climb!");
reason = Loc.GetString("comp-climbable-cant-climb");
return false;
}
if (!user.InRangeUnobstructed(target, Range))
{
reason = Loc.GetString("You can't reach there!");
reason = Loc.GetString("comp-climbable-cant-reach");
return false;
}
@@ -111,13 +111,13 @@ namespace Content.Server.GameObjects.Components.Movement
{
if (!ActionBlockerSystem.CanInteract(user))
{
reason = Loc.GetString("You can't do that!");
reason = Loc.GetString("comp-climbable-cant-interact");
return false;
}
if (target == null || !dragged.HasComponent<ClimbingComponent>())
{
reason = Loc.GetString("You can't do that!");
reason = Loc.GetString("comp-climbable-cant-climb");
return false;
}
@@ -126,7 +126,7 @@ namespace Content.Server.GameObjects.Components.Movement
if (!user.InRangeUnobstructed(target, Range, predicate: Ignored) ||
!user.InRangeUnobstructed(dragged, Range, predicate: Ignored))
{
reason = Loc.GetString("You can't reach there!");
reason = Loc.GetString("comp-climbable-cant-reach");
return false;
}
@@ -183,11 +183,11 @@ namespace Content.Server.GameObjects.Components.Movement
// we may potentially need additional logic since we're forcing a player onto a climbable
// there's also the cases where the user might collide with the person they are forcing onto the climbable that i haven't accounted for
var othersMessage = Loc.GetString("{0:theName} forces {1:theName} onto {2:theName}!", user,
entityToMove, Owner);
var othersMessage = Loc.GetString("comp-climbable-user-climbs-force-other",
("user", user), ("moved-user", entityToMove), ("climbable", Owner));
user.PopupMessageOtherClients(othersMessage);
var selfMessage = Loc.GetString("You force {0:theName} onto {1:theName}!", entityToMove, Owner);
var selfMessage = Loc.GetString("comp-climbable-user-climbs-force", ("moved-user", entityToMove), ("climbable", Owner));
user.PopupMessage(selfMessage);
}
}
@@ -229,10 +229,10 @@ namespace Content.Server.GameObjects.Components.Movement
climbMode.TryMoveTo(userPos, endPoint);
var othersMessage = Loc.GetString("{0:theName} jumps onto {1:theName}!", user, Owner);
var othersMessage = Loc.GetString("comp-climbable-user-climbs-other", ("user", user), ("climbable", Owner));
user.PopupMessageOtherClients(othersMessage);
var selfMessage = Loc.GetString("You jump onto {0:theName}!", Owner);
var selfMessage = Loc.GetString("comp-climbable-user-climbs", ("climbable", Owner));
user.PopupMessage(selfMessage);
}
}
@@ -250,7 +250,7 @@ namespace Content.Server.GameObjects.Components.Movement
data.Visibility = VerbVisibility.Invisible;
}
data.Text = Loc.GetString("Vault");
data.Text = Loc.GetString("comp-climbable-verb-climb");
}
protected override void Activate(IEntity user, ClimbableComponent component)