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

10
Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
View File

@@ -108,13 +108,13 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(user, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(user, Loc.GetString("ammo-box-component-try-insert-ammo-wrong-caliber"));
return false;
}
if (AmmoLeft >= Capacity)
{
Owner.PopupMessage(user, Loc.GetString("No room"));
Owner.PopupMessage(user, Loc.GetString("ammo-box-component-try-insert-ammo-no-room"));
return false;
}
@@ -228,7 +228,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
return;
}
data.Text = Loc.GetString("Dump 10");
data.Text = Loc.GetString("dump-vert-get-data-text");
data.Visibility = component.AmmoLeft > 0 ? VerbVisibility.Visible : VerbVisibility.Disabled;
data.IconTexture = "/Textures/Interface/VerbIcons/eject.svg.192dpi.png";
}
@@ -241,8 +241,8 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("\nIt's a [color=white]{0}[/color] ammo box.", _caliber));
message.AddMarkup(Loc.GetString("\nIt has [color=white]{0}[/color] out of [color=white]{1}[/color] ammo left.", AmmoLeft, _capacity));
message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-caliber-description", ("caliber", _caliber)));
message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-remaining-ammo-description", ("ammoLeft",AmmoLeft),("capacity", _capacity)));
}
}
}

4
Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Shared.Examine;
using Content.Shared.Weapons.Ranged.Barrels.Components;
using Robust.Server.GameObjects;
@@ -154,7 +154,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
var text = Loc.GetString("It's [color=white]{0}[/color] ammo.", Caliber);
var text = Loc.GetString("ammo-component-on-examine",("caliber", Caliber));
message.AddMarkup(text);
}
}

6
Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
View File

@@ -99,13 +99,13 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(user, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(user, Loc.GetString("ranged-magazine-component-try-insert-ammo-wrong-caliber"));
return false;
}
if (ShotsLeft >= Capacity)
{
Owner.PopupMessage(user, Loc.GetString("Magazine is full"));
Owner.PopupMessage(user, Loc.GetString("ranged-magazine-component-try-insert-ammo-is-full "));
return false;
}
@@ -168,7 +168,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
var text = Loc.GetString("It's a [color=white]{0}[/color] magazine of [color=white]{1}[/color] caliber.", MagazineType, Caliber);
var text = Loc.GetString("ranged-magazine-component-on-examine", ("magazineType", MagazineType),("caliber", Caliber));
message.AddMarkup(text);
}
}

4
Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
View File

@@ -77,13 +77,13 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(user, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(user, Loc.GetString("speed-loader-component-try-insert-ammo-wrong-caliber"));
return false;
}
if (AmmoLeft >= Capacity)
{
Owner.PopupMessage(user, Loc.GetString("No room"));
Owner.PopupMessage(user, Loc.GetString("speed-loader-component-try-insert-ammo-no-room"));
return false;
}

16
Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
View File

@@ -218,7 +218,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
BoltOpen = true;
if (Owner.TryGetContainer(out var container))
{
Owner.PopupMessage(container.Owner, Loc.GetString("Bolt opened"));
Owner.PopupMessage(container.Owner, Loc.GetString("bolt-action-barrel-component-bolt-opened"));
}
return;
}
@@ -243,13 +243,13 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(user, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(user, Loc.GetString("bolt-action-barrel-component-try-insert-bullet-wrong-caliber"));
return false;
}
if (!BoltOpen)
{
Owner.PopupMessage(user, Loc.GetString("Bolt isn't open"));
Owner.PopupMessage(user, Loc.GetString("bolt-action-barrel-component-try-insert-bullet-bolt-closed"));
return false;
}
@@ -278,7 +278,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return true;
}
Owner.PopupMessage(user, Loc.GetString("No room"));
Owner.PopupMessage(user, Loc.GetString("bolt-action-barrel-component-try-insert-bullet-no-room"));
return false;
}
@@ -288,7 +288,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (BoltOpen)
{
BoltOpen = false;
Owner.PopupMessage(eventArgs.User, Loc.GetString("Bolt closed"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("bolt-action-barrel-component-bolt-closed"));
return true;
}
@@ -346,7 +346,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
base.Examine(message, inDetailsRange);
message.AddMarkup(Loc.GetString("\nIt uses [color=white]{0}[/color] ammo.", _caliber));
message.AddMarkup("\n" + Loc.GetString("bolt-action-barrel-component-on-examine", ("caliber",_caliber)));
}
[Verb]
@@ -360,7 +360,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Open bolt");
data.Text = Loc.GetString("open-bolt-verb-get-data-text");
data.Visibility = component.BoltOpen ? VerbVisibility.Invisible : VerbVisibility.Visible;
}
@@ -381,7 +381,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Close bolt");
data.Text = Loc.GetString("close-bolt-verb-get-data-text");
data.Visibility = component.BoltOpen ? VerbVisibility.Visible : VerbVisibility.Invisible;
}

6
Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
View File

@@ -208,7 +208,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("pump-barrel-component-try-insert-bullet-wrong-caliber"));
return false;
}
@@ -225,7 +225,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return true;
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("No room"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("pump-barrel-component-try-insert-bullet-no-room"));
return false;
}
@@ -245,7 +245,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
base.Examine(message, inDetailsRange);
message.AddMarkup(Loc.GetString("\nIt uses [color=white]{0}[/color] ammo.", _caliber));
message.AddMarkup("\n" + Loc.GetString("pump-barrel-component-on-examine",("caliber", _caliber)));
}
}
}

8
Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
View File

@@ -149,7 +149,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(user, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(user, Loc.GetString("revolver-barrel-component-try-inser-bullet-wrong-caliber"));
return false;
}
@@ -175,7 +175,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
}
}
Owner.PopupMessage(user, Loc.GetString("Ammo full"));
Owner.PopupMessage(user, Loc.GetString("revolver-barrel-component-try-inser-bullet-ammo-full"));
return false;
}
@@ -289,7 +289,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Spin");
data.Text = Loc.GetString("spin-revolver-verb-get-data-text");
if (component.Capacity <= 1)
{
data.Visibility = VerbVisibility.Invisible;
@@ -303,7 +303,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
protected override void Activate(IEntity user, RevolverBarrelComponent component)
{
component.Spin();
component.Owner.PopupMessage(user, Loc.GetString("Spun the cylinder"));
component.Owner.PopupMessage(user, Loc.GetString("spin-revolver-verb-on-activate"));
}
}
}

4
Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
View File

@@ -305,12 +305,12 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (component.PowerCell == null)
{
data.Text = Loc.GetString("No cell");
data.Text = Loc.GetString("eject-cell-verb-get-data-text-no-cell");
data.Visibility = VerbVisibility.Disabled;
}
else
{
data.Text = Loc.GetString("Eject cell");
data.Text = Loc.GetString("eject-cell-verb-get-data-text");
data.IconTexture = "/Textures/Interface/VerbIcons/eject.svg.192dpi.png";
}
}

34
Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
View File

@@ -235,7 +235,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (Owner.TryGetContainer(out var container))
{
Owner.PopupMessage(container.Owner, Loc.GetString("Bolt open"));
Owner.PopupMessage(container.Owner, Loc.GetString("server-magazine-barrel-component-cycle-bolt-open"));
}
BoltOpen = true;
return;
@@ -275,7 +275,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
SoundSystem.Play(Filter.Pvs(Owner), _soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-5));
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("Bolt closed"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-use-entity-bolt-closed"));
BoltOpen = false;
return true;
}
@@ -347,7 +347,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
if (MagNeedsOpenBolt && !BoltOpen)
{
Owner.PopupMessage(user, Loc.GetString("Bolt needs to be open"));
Owner.PopupMessage(user, Loc.GetString("server-magazine-barrel-component-remove-magazine-bolt-closed"));
return;
}
@@ -373,19 +373,19 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
if ((MagazineTypes & magazineComponent.MagazineType) == 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong magazine type"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-wrong-magazine-type"));
return false;
}
if (magazineComponent.Caliber != _caliber)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-wrong-caliber"));
return false;
}
if (_magNeedsOpenBolt && !BoltOpen)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Need to open bolt first"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-bolt-closed"));
return false;
}
@@ -395,14 +395,14 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
SoundSystem.Play(Filter.Pvs(Owner), _soundMagInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2));
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("Magazine inserted"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-success"));
_magazineContainer.Insert(eventArgs.Using);
Dirty();
UpdateAppearance();
return true;
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("Already holding a magazine"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-already-holding-magazine"));
return false;
}
@@ -411,26 +411,26 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
if (!BoltOpen)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Cannot insert ammo while bolt is closed"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-ammo-bolt-closed"));
return false;
}
if (ammoComponent.Caliber != _caliber)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-wrong-caliber"));
return false;
}
if (_chamberContainer.ContainedEntity == null)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Ammo inserted"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-ammo-success"));
_chamberContainer.Insert(eventArgs.Using);
Dirty();
UpdateAppearance();
return true;
}
Owner.PopupMessage(eventArgs.User, Loc.GetString("Chamber full"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-ammo-full"));
return false;
}
@@ -441,11 +441,11 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
base.Examine(message, inDetailsRange);
message.AddMarkup(Loc.GetString("\nIt uses [color=white]{0}[/color] ammo.", Caliber));
message.AddMarkup("\n" + Loc.GetString("server-magazine-barrel-component-on-examine", ("caliber",Caliber)));
foreach (var magazineType in GetMagazineTypes())
{
message.AddMarkup(Loc.GetString("\nIt accepts [color=white]{0}[/color] magazines.", magazineType));
message.AddMarkup("\n" + Loc.GetString("server-magazine-barrel-component-on-examine-magazine-type",("magazineType", magazineType)));
}
}
@@ -460,7 +460,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Eject magazine");
data.Text = Loc.GetString("eject-magazine-verb-get-data-text");
data.IconTexture = "/Textures/Interface/VerbIcons/eject.svg.192dpi.png";
if (component.MagNeedsOpenBolt)
{
@@ -490,7 +490,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Open bolt");
data.Text = Loc.GetString("open-bolt-verb-get-data-text");
data.Visibility = component.BoltOpen ? VerbVisibility.Invisible : VerbVisibility.Visible;
}
@@ -511,7 +511,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return;
}
data.Text = Loc.GetString("Close bolt");
data.Text = Loc.GetString("close-bolt-verb-get-data-text");
data.Visibility = component.BoltOpen ? VerbVisibility.Visible : VerbVisibility.Invisible;
}

6
Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
View File

@@ -429,9 +429,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
{
var fireRateMessage = Loc.GetString(FireRateSelector switch
{
FireRateSelector.Safety => "Its safety is enabled.",
FireRateSelector.Single => "It's in single fire mode.",
FireRateSelector.Automatic => "It's in automatic fire mode.",
FireRateSelector.Safety => "server-ranged-barrel-component-on-examine-fire-rate-safety-description",
FireRateSelector.Single => "server-ranged-barrel-component-on-examine-fire-rate-single-description",
FireRateSelector.Automatic => "server-ranged-barrel-component-on-examine-fire-rate-automatic-description",
_ => throw new IndexOutOfRangeException()
});

4
Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Server.Atmos;
using Content.Server.CombatMode;
using Content.Server.Hands.Components;
@@ -176,7 +176,7 @@ namespace Content.Server.Weapon.Ranged
stun.Paralyze(3f);
}
user.PopupMessage(Loc.GetString("The gun blows up in your face!"));
user.PopupMessage(Loc.GetString("server-ranged-weapon-component-try-fire-clumsy"));
Owner.Delete();
return;