Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed old Loc.GetString() use instances (#4155)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Galactic Chimp
2021-06-21 02:13:54 +02:00
committed by GitHub
parent 4a46fbe6dd
commit 392b820796
523 changed files with 3082 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Construction/Components/ConstructionComponent.Verbs.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.ActionBlocker;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction.Events;
using Content.Shared.Notification.Managers;
using Content.Shared.Verbs;
@@ -28,7 +28,7 @@ namespace Content.Server.Construction.Components
}
data.CategoryData = VerbCategories.Construction;
data.Text = Loc.GetString("Begin deconstructing");
data.Text = Loc.GetString("deconstructible-verb-get-data-text");
data.IconTexture = "/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png";
}
@@ -38,11 +38,11 @@ namespace Content.Server.Construction.Components
if (component.Target == null)
{
// Maybe check, but on the flip-side a better solution might be to not make it undeconstructible in the first place, no?
component.Owner.PopupMessage(user, Loc.GetString("There is no way to deconstruct this."));
component.Owner.PopupMessage(user, Loc.GetString("deconstructible-verb-activate-no-target-text"));
}
else
{
component.Owner.PopupMessage(user, Loc.GetString("Examine to see instructions."));
component.Owner.PopupMessage(user, Loc.GetString("deconstructible-verb-activate-text"));
}
}
}

2
Content.Server/Construction/Components/ConstructionComponent.cs
View File

@@ -536,7 +536,7 @@ namespace Content.Server.Construction.Components
void IExamine.Examine(FormattedMessage message, bool inDetailsRange)
{
if(Target != null)
message.AddMarkup(Loc.GetString("To create {0}...\n", Target.Name));
message.AddMarkup(Loc.GetString("construction-component-to-create-header",("targetName", Target.Name)) + "\n");
if (Edge == null && TargetNextEdge != null)
{

24
Content.Server/Construction/Components/MachineBoardComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using Content.Shared.Examine;
using Content.Shared.Stacks;
@@ -53,25 +53,37 @@ namespace Content.Server.Construction.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("Requires:\n"));
message.AddMarkup(Loc.GetString("machine-board-component-on-examine-label") + "\n");
foreach (var (part, amount) in Requirements)
{
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(part.ToString())));
message.AddMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
("amount", amount),
("requiredElement", Loc.GetString(part.ToString())))
+ "\n");
}
foreach (var (material, amount) in MaterialRequirements)
{
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(material.Name)));
message.AddMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
("amount", amount),
("requiredElement", Loc.GetString(material.Name)))
+ "\n");
}
foreach (var (_, info) in ComponentRequirements)
{
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", info.Amount, Loc.GetString(info.ExamineName)));
message.AddMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
("amount", info.Amount),
("requiredElement", Loc.GetString(info.ExamineName)))
+ "\n");
}
foreach (var (_, info) in TagRequirements)
{
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", info.Amount, Loc.GetString(info.ExamineName)));
message.AddMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
("amount", info.Amount),
("requiredElement", Loc.GetString(info.ExamineName)))
+ "\n");
}
}
}

6
Content.Server/Construction/Components/MachinePartComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Content.Shared.Examine;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
@@ -38,8 +38,8 @@ namespace Content.Server.Construction.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("[color=white]Rating:[/color] [color=cyan]{0}[/color]\n", Rating));
message.AddMarkup(Loc.GetString("[color=white]Type:[/color] [color=cyan]{0}[/color]\n", PartType));
message.AddMarkup(Loc.GetString("machine-part-component-on-examine-rating-text", ("rating", Rating)) + "\n");
message.AddMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type", PartType)) + "\n");
}
}
}

26
Content.Server/Construction/Conditions/MachineFrameComplete.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Content.Server.Construction.Components;
using Content.Shared.Construction;
using JetBrains.Annotations;
@@ -31,20 +31,23 @@ namespace Content.Server.Construction.Conditions
if (!machineFrame.HasBoard)
{
message.AddMarkup(Loc.GetString("Insert [color=cyan]any machine circuit board[/color]."));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-insert-circuit-board-message"));
return true;
}
if (machineFrame.IsComplete) return false;
message.AddMarkup(Loc.GetString("Requires:\n"));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-requirement-label") + "\n");
foreach (var (part, required) in machineFrame.Requirements)
{
var amount = required - machineFrame.Progress[part];
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(part.ToString())));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
("amount", amount),
("elementName", Loc.GetString(part.ToString())))
+ "\n");
}
foreach (var (material, required) in machineFrame.MaterialRequirements)
@@ -53,7 +56,10 @@ namespace Content.Server.Construction.Conditions
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(material.ToString())));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
("amount", amount),
("elementName", Loc.GetString(material.ToString())))
+ "\n");
}
foreach (var (compName, info) in machineFrame.ComponentRequirements)
@@ -62,7 +68,10 @@ namespace Content.Server.Construction.Conditions
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", info.Amount, Loc.GetString(info.ExamineName)));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
("amount", info.Amount),
("elementName", Loc.GetString(info.ExamineName)))
+ "\n");
}
foreach (var (tagName, info) in machineFrame.TagRequirements)
@@ -71,7 +80,10 @@ namespace Content.Server.Construction.Conditions
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", info.Amount, Loc.GetString(info.ExamineName)));
message.AddMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
("amount", info.Amount),
("elementName", Loc.GetString(info.ExamineName)))
+ "\n");
}
return true;

2
Content.Server/Construction/Conditions/ToiletLidClosed.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Construction.Conditions
if (!entity.TryGetComponent(out ToiletComponent? toilet)) return false;
if (!toilet.LidOpen) return false;
message.AddMarkup(Loc.GetString("Use a [color=yellow]crowbar[/color] to close the lid.\n"));
message.AddMarkup(Loc.GetString("construction-condition-toilet-lid-closed") + "\n");
return true;
}
}

6
Content.Server/Construction/Conditions/WirePanel.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components;
using Content.Server.Wires.Components;
using Content.Shared.Construction;
@@ -30,10 +30,10 @@ namespace Content.Server.Construction.Conditions
switch (Open)
{
case true when !wires.IsPanelOpen:
message.AddMarkup(Loc.GetString("First, open the maintenance panel.\n"));
message.AddMarkup(Loc.GetString("construction-condition-wire-panel-open") + "\n");
return true;
case false when wires.IsPanelOpen:
message.AddMarkup(Loc.GetString("First, close the maintenance panel.\n"));
message.AddMarkup(Loc.GetString("construction-condition-wire-panel-close") + "\n");
return true;
}

6
Content.Server/Construction/ConstructionSystem.cs
View File

@@ -98,7 +98,7 @@ namespace Content.Server.Construction
if (existed)
{
user.PopupMessageCursor(Loc.GetString("You can't start another construction now!"));
user.PopupMessageCursor(Loc.GetString("construction-system-construct-cannot-start-another-construction"));
return null;
}
@@ -222,7 +222,7 @@ namespace Content.Server.Construction
if (failed)
{
user.PopupMessageCursor(Loc.GetString("You don't have the materials to build that!"));
user.PopupMessageCursor(Loc.GetString("construction-system-construct-no-materials"));
FailCleanup();
return null;
}
@@ -374,7 +374,7 @@ namespace Content.Server.Construction
{
if (!set.Add(ev.Ack))
{
user.PopupMessageCursor(Loc.GetString("You are already building that!"));
user.PopupMessageCursor(Loc.GetString("construction-system-already-building"));
return;
}
}