mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-19 12:40:56 +00:00
Code Issues Projects Releases Wiki Activity

change s to z cuz game spells it that way lol

Browse Source
This commit is contained in:
JohnCorby 2022-06-08 14:00:37 -07:00
parent 4f06530958
commit d07f228b62
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QSB/DeathSync/Necronomicon.cs
View File

@ -7,12 +7,12 @@ namespace QSB.DeathSync;
public static class Necronomicon
{
public static string GetPhrase(DeathType deathType, int index)
=> QSBLocalisation.Current.DeathMessages.ContainsKey(deathType)
? QSBLocalisation.Current.DeathMessages[deathType][index]
=> QSBLocalization.Current.DeathMessages.ContainsKey(deathType)
? QSBLocalization.Current.DeathMessages[deathType][index]
: null;
public static int GetRandomIndex(DeathType deathType)
=> QSBLocalisation.Current.DeathMessages.ContainsKey(deathType)
? new Random().Next(0, QSBLocalisation.Current.DeathMessages[deathType].Length)
=> QSBLocalization.Current.DeathMessages.ContainsKey(deathType)
? new Random().Next(0, QSBLocalization.Current.DeathMessages[deathType].Length)
: -1;
}

2
QSB/Localisation/QSBLocalisation.cs → QSB/Localisation/QSBLocalization.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
namespace QSB.Localisation;
public static class QSBLocalisation
public static class QSBLocalization
{
private readonly static List<Translation> _translations = new();
public static Translation Current;

52
QSB/Menus/MenuManager.cs
View File

@ -68,7 +68,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
QSBCore.MenuApi.RegisterStartupPopup(UpdateChangelog);
}
QSBLocalisation.LanguageChanged += OnLanguageChanged;
QSBLocalization.LanguageChanged += OnLanguageChanged;
if (QSBCore.DebugSettings.AutoStart)
{
@ -123,18 +123,18 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
return;
}
HostButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalisation.Current.MainMenuHost;
ConnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalisation.Current.MainMenuConnect;
var text = QSBCore.DebugSettings.UseKcpTransport ? QSBLocalisation.Current.PublicIPAddress : QSBLocalisation.Current.ProductUserID;
ConnectPopup.SetUpPopup(text, InputLibrary.menuConfirm, InputLibrary.cancel, new ScreenPrompt(QSBLocalisation.Current.Connect), new ScreenPrompt(QSBLocalisation.Current.Cancel), false);
HostButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalization.Current.MainMenuHost;
ConnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalization.Current.MainMenuConnect;
var text = QSBCore.DebugSettings.UseKcpTransport ? QSBLocalization.Current.PublicIPAddress : QSBLocalization.Current.ProductUserID;
ConnectPopup.SetUpPopup(text, InputLibrary.menuConfirm, InputLibrary.cancel, new ScreenPrompt(QSBLocalization.Current.Connect), new ScreenPrompt(QSBLocalization.Current.Cancel), false);
ConnectPopup.SetInputFieldPlaceholderText(text);
HostGameTypePopup.SetUpPopup(QSBLocalisation.Current.HostExistingOrNew,
HostGameTypePopup.SetUpPopup(QSBLocalization.Current.HostExistingOrNew,
InputLibrary.menuConfirm,
InputLibrary.confirm2,
InputLibrary.cancel,
new ScreenPrompt(QSBLocalisation.Current.ExistingSave),
new ScreenPrompt(QSBLocalisation.Current.NewSave),
new ScreenPrompt(QSBLocalisation.Current.Cancel));
new ScreenPrompt(QSBLocalization.Current.ExistingSave),
new ScreenPrompt(QSBLocalization.Current.NewSave),
new ScreenPrompt(QSBLocalization.Current.Cancel));
}
private void Update()
@ -266,8 +266,8 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
private void CreateCommonPopups()
{
var text = QSBCore.DebugSettings.UseKcpTransport ? QSBLocalisation.Current.PublicIPAddress : QSBLocalisation.Current.ProductUserID;
ConnectPopup = QSBCore.MenuApi.MakeInputFieldPopup(text, text, QSBLocalisation.Current.Connect, QSBLocalisation.Current.Cancel);
var text = QSBCore.DebugSettings.UseKcpTransport ? QSBLocalization.Current.PublicIPAddress : QSBLocalization.Current.ProductUserID;
ConnectPopup = QSBCore.MenuApi.MakeInputFieldPopup(text, text, QSBLocalization.Current.Connect, QSBLocalization.Current.Cancel);
ConnectPopup.CloseMenuOnOk(false);
ConnectPopup.OnPopupConfirm += () =>
{
@ -289,7 +289,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
TwoButtonInfoPopup.OnPopupConfirm += () => OnCloseInfoPopup(true);
TwoButtonInfoPopup.OnPopupCancel += () => OnCloseInfoPopup(false);
HostGameTypePopup = CreateThreeChoicePopup(QSBLocalisation.Current.HostExistingOrNew, QSBLocalisation.Current.ExistingSave, QSBLocalisation.Current.NewSave, QSBLocalisation.Current.Cancel);
HostGameTypePopup = CreateThreeChoicePopup(QSBLocalization.Current.HostExistingOrNew, QSBLocalization.Current.ExistingSave, QSBLocalization.Current.NewSave, QSBLocalization.Current.Cancel);
HostGameTypePopup.OnPopupConfirm1 += () => Host(false);
HostGameTypePopup.OnPopupConfirm2 += () => Host(true);
}
@ -313,10 +313,10 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
{
CreateCommonPopups();
DisconnectPopup = QSBCore.MenuApi.MakeTwoChoicePopup(QSBLocalisation.Current.DisconnectAreYouSure, QSBLocalisation.Current.Yes, QSBLocalisation.Current.No);
DisconnectPopup = QSBCore.MenuApi.MakeTwoChoicePopup(QSBLocalization.Current.DisconnectAreYouSure, QSBLocalization.Current.Yes, QSBLocalization.Current.No);
DisconnectPopup.OnPopupConfirm += Disconnect;
DisconnectButton = QSBCore.MenuApi.PauseMenu_MakeMenuOpenButton(QSBLocalisation.Current.PauseMenuDisconnect, DisconnectPopup);
DisconnectButton = QSBCore.MenuApi.PauseMenu_MakeMenuOpenButton(QSBLocalization.Current.PauseMenuDisconnect, DisconnectPopup);
QuitButton = FindObjectOfType<PauseMenuManager>()._exitToMainMenuAction.gameObject;
@ -332,8 +332,8 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
}
var text = QSBCore.IsHost
? QSBLocalisation.Current.PauseMenuStopHosting
: QSBLocalisation.Current.PauseMenuDisconnect;
? QSBLocalization.Current.PauseMenuStopHosting
: QSBLocalization.Current.PauseMenuDisconnect;
DisconnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = text;
var popupText = QSBCore.IsHost
@ -352,10 +352,10 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
{
CreateCommonPopups();
HostButton = QSBCore.MenuApi.TitleScreen_MakeSimpleButton(QSBLocalisation.Current.MainMenuHost, _titleButtonIndex);
HostButton = QSBCore.MenuApi.TitleScreen_MakeSimpleButton(QSBLocalization.Current.MainMenuHost, _titleButtonIndex);
HostButton.onClick.AddListener(PreHost);
ConnectButton = QSBCore.MenuApi.TitleScreen_MakeMenuOpenButton(QSBLocalisation.Current.MainMenuConnect, _titleButtonIndex + 1, ConnectPopup);
ConnectButton = QSBCore.MenuApi.TitleScreen_MakeMenuOpenButton(QSBLocalization.Current.MainMenuConnect, _titleButtonIndex + 1, ConnectPopup);
ResumeGameButton = GameObject.Find("MainMenuLayoutGroup/Button-ResumeGame");
NewGameButton = GameObject.Find("MainMenuLayoutGroup/Button-NewGame");
@ -461,9 +461,9 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
Delay.RunWhen(() => TimeLoop._initialized, QSBNetworkManager.singleton.StartHost);
};
OpenInfoPopup(string.Format(QSBLocalisation.Current.CopyProductUserIDToClipboard, productUserId)
, QSBLocalisation.Current.Yes
, QSBLocalisation.Current.No);
OpenInfoPopup(string.Format(QSBLocalization.Current.CopyProductUserIDToClipboard, productUserId)
, QSBLocalization.Current.Yes
, QSBLocalization.Current.No);
}
else
{
@ -486,7 +486,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
SetButtonActive(ResumeGameButton, false);
SetButtonActive(NewGameButton, false);
_loadingText = ConnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>();
_loadingText.text = QSBLocalisation.Current.Connecting;
_loadingText.text = QSBLocalization.Current.Connecting;
Locator.GetMenuInputModule().DisableInputs();
QSBNetworkManager.singleton.networkAddress = address;
@ -516,7 +516,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
}
};
OpenInfoPopup(string.Format(QSBLocalisation.Current.ServerRefusedConnection, reason), QSBLocalisation.Current.OK);
OpenInfoPopup(string.Format(QSBLocalization.Current.ServerRefusedConnection, reason), QSBLocalization.Current.OK);
}
private void OnDisconnected(string error)
@ -536,7 +536,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
}
};
OpenInfoPopup(string.Format(QSBLocalisation.Current.ClientDisconnectWithError, error), QSBLocalisation.Current.OK);
OpenInfoPopup(string.Format(QSBLocalization.Current.ClientDisconnectWithError, error), QSBLocalization.Current.OK);
}
SetButtonActive(DisconnectButton, false);
@ -547,12 +547,12 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
SetButtonActive(NewGameButton, true);
if (ConnectButton)
{
ConnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalisation.Current.MainMenuConnect;
ConnectButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalization.Current.MainMenuConnect;
}
if (HostButton)
{
HostButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalisation.Current.MainMenuHost;
HostButton.transform.GetChild(0).GetChild(1).GetComponent<Text>().text = QSBLocalization.Current.MainMenuHost;
}
_loadingText = null;

14
QSB/Player/Messages/PlayerJoinMessage.cs
View File

@ -74,28 +74,28 @@ public class PlayerJoinMessage : QSBMessage
if (QSBVersion != QSBCore.QSBVersion)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong QSB version. (Client:{QSBVersion}, Server:{QSBCore.QSBVersion})", MessageType.Error);
new PlayerKickMessage(From, string.Format(QSBLocalisation.Current.QSBVersionMismatch, QSBVersion, QSBCore.QSBVersion)).Send();
new PlayerKickMessage(From, string.Format(QSBLocalization.Current.QSBVersionMismatch, QSBVersion, QSBCore.QSBVersion)).Send();
return;
}
if (GameVersion != QSBCore.GameVersion)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong game version. (Client:{GameVersion}, Server:{QSBCore.GameVersion})", MessageType.Error);
new PlayerKickMessage(From, string.Format(QSBLocalisation.Current.OWVersionMismatch, GameVersion, QSBCore.GameVersion)).Send();
new PlayerKickMessage(From, string.Format(QSBLocalization.Current.OWVersionMismatch, GameVersion, QSBCore.GameVersion)).Send();
return;
}
if (DlcInstalled != QSBCore.DLCInstalled)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong DLC installation state. (Client:{DlcInstalled}, Server:{QSBCore.DLCInstalled})", MessageType.Error);
new PlayerKickMessage(From, string.Format(QSBLocalisation.Current.DLCMismatch, DlcInstalled, QSBCore.DLCInstalled)).Send();
new PlayerKickMessage(From, string.Format(QSBLocalization.Current.DLCMismatch, DlcInstalled, QSBCore.DLCInstalled)).Send();
return;
}
if (QSBPlayerManager.PlayerList.Any(x => x.EyeState >= EyeState.Observatory))
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting too late into eye scene.", MessageType.Error);
new PlayerKickMessage(From, QSBLocalisation.Current.GameProgressLimit).Send();
new PlayerKickMessage(From, QSBLocalization.Current.GameProgressLimit).Send();
return;
}
@ -105,20 +105,20 @@ public class PlayerJoinMessage : QSBMessage
if (!AddonHashes.SequenceEqual(addonHashes))
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with addon mismatch. (Client:{AddonHashes.Join()}, Server:{addonHashes.Join()})", MessageType.Error);
new PlayerKickMessage(From, string.Format(QSBLocalisation.Current.AddonMismatch, AddonHashes.Length, addonHashes.Length)).Send();
new PlayerKickMessage(From, string.Format(QSBLocalization.Current.AddonMismatch, AddonHashes.Length, addonHashes.Length)).Send();
return;
}
if (FirstIncompatibleMod != "" && !QSBCore.IncompatibleModsAllowed)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with incompatible mod. (First mod found was {FirstIncompatibleMod})");
new PlayerKickMessage(From, string.Format(QSBLocalisation.Current.IncompatibleMod, FirstIncompatibleMod)).Send();
new PlayerKickMessage(From, string.Format(QSBLocalization.Current.IncompatibleMod, FirstIncompatibleMod)).Send();
}
}
var player = QSBPlayerManager.GetPlayer(From);
player.Name = PlayerName;
DebugLog.ToAll(string.Format(QSBLocalisation.Current.PlayerJoinedTheGame, player.Name), MessageType.Info);
DebugLog.ToAll(string.Format(QSBLocalization.Current.PlayerJoinedTheGame, player.Name), MessageType.Info);
DebugLog.DebugWrite($"{player} joined. qsbVersion:{QSBVersion}, gameVersion:{GameVersion}, dlcInstalled:{DlcInstalled}", MessageType.Info);
}

6
QSB/Player/Messages/PlayerKickMessage.cs
View File

@ -47,15 +47,15 @@ internal class PlayerKickMessage : QSBMessage<string>
{
if (QSBPlayerManager.PlayerExists(PlayerId))
{
DebugLog.ToAll(string.Format(QSBLocalisation.Current.PlayerWasKicked, QSBPlayerManager.GetPlayer(PlayerId).Name));
DebugLog.ToAll(string.Format(QSBLocalization.Current.PlayerWasKicked, QSBPlayerManager.GetPlayer(PlayerId).Name));
return;
}
DebugLog.ToAll(string.Format(QSBLocalisation.Current.PlayerWasKicked, PlayerId));
DebugLog.ToAll(string.Format(QSBLocalization.Current.PlayerWasKicked, PlayerId));
return;
}
DebugLog.ToAll(string.Format(QSBLocalisation.Current.KickedFromServer, Data));
DebugLog.ToAll(string.Format(QSBLocalization.Current.KickedFromServer, Data));
MenuManager.Instance.OnKicked(Data);
}
}

2
QSB/QSBCore.cs
View File

@ -130,7 +130,7 @@ public class QSBCore : ModBehaviour
QSBPatchManager.Init();
DeterministicManager.Init();
QSBLocalisation.Init();
QSBLocalization.Init();
var components = typeof(IAddComponentOnStart).GetDerivedTypes()
.Select(x => gameObject.AddComponent(x))

2
QSB/RespawnSync/RespawnHUDMarker.cs
View File

@ -12,7 +12,7 @@ public class RespawnHUDMarker : HUDDistanceMarker
{
_markerRadius = 0.2f;
_markerTarget = transform;
_markerLabel = QSBLocalisation.Current.RespawnPlayer;
_markerLabel = QSBLocalization.Current.RespawnPlayer;
_isReady = true;
base.InitCanvasMarker();

2
QSB/RespawnSync/ShipRecoveryPoint.cs
View File

@ -16,7 +16,7 @@ internal class ShipRecoveryPoint : MonoBehaviour
private int _respawnIndex;
private bool _wearingSuit;
private static readonly UITextType _respawnPlayerText = UIHelper.AddToUITable(QSBLocalisation.Current.RespawnPlayer);
private static readonly UITextType _respawnPlayerText = UIHelper.AddToUITable(QSBLocalization.Current.RespawnPlayer);
private void Awake()
{