Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

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;
}