From 9588bd4e4f8cf26fbdac29f19eb44f6ce9939347 Mon Sep 17 00:00:00 2001 From: Katy Fox Date: Tue, 26 Sep 2023 18:04:42 -0400 Subject: [PATCH] add new web translations, reload handling --- PassengerJobs/Generation/PassengerJobGenerator.cs | 8 +++----- PassengerJobs/LocalizationKeys.cs | 2 +- PassengerJobs/PJMain.cs | 4 +--- PassengerJobs/Platforms/PlatformController.cs | 10 ++++++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/PassengerJobs/Generation/PassengerJobGenerator.cs b/PassengerJobs/Generation/PassengerJobGenerator.cs index 6a5c3de..c924438 100644 --- a/PassengerJobs/Generation/PassengerJobGenerator.cs +++ b/PassengerJobs/Generation/PassengerJobGenerator.cs @@ -30,14 +30,12 @@ private static void HandleGameUnloading() { foreach (var instance in _instances.Values) { - foreach (var platform in instance.PlatformControllers) - { - Destroy(platform); - } - Destroy(instance); } + _instances.Clear(); + + PlatformController.HandleGameUnloading(); } public static float GetBonusPayment(float basePayment) diff --git a/PassengerJobs/LocalizationKeys.cs b/PassengerJobs/LocalizationKeys.cs index 8b6ff95..54ea6fd 100644 --- a/PassengerJobs/LocalizationKeys.cs +++ b/PassengerJobs/LocalizationKeys.cs @@ -43,7 +43,7 @@ static LocalizationKeyExtensions() .Cast() .ToDictionary( k => k, - k => $"pj/{Enum.GetName(typeof(LocalizationKey), k).ToLower()}" + k => $"passjobs/{Enum.GetName(typeof(LocalizationKey), k).ToLower()}" ); } diff --git a/PassengerJobs/PJMain.cs b/PassengerJobs/PJMain.cs index 2e1ca41..e75913d 100644 --- a/PassengerJobs/PJMain.cs +++ b/PassengerJobs/PJMain.cs @@ -29,9 +29,7 @@ public static bool Load(UnityModManager.ModEntry modEntry) ModEntry = modEntry; Translations = new TranslationInjector("cc.foxden.passenger_jobs"); - - string fallbackCsv = Path.Combine(ModEntry.Path, "translations.csv"); - Translations.AddTranslationsFromWebCsv("https://foxden.cc/static/derail_valley/pj_translations.csv", fallbackCsv); + Translations.AddTranslationsFromWebCsv("https://docs.google.com/spreadsheets/d/1sQ26qpB6czqGC0ObV6Y7OfwIEqPtGm1SBCLYvp47PSY/export?format=csv"); BundleLoader.Initialize(); diff --git a/PassengerJobs/Platforms/PlatformController.cs b/PassengerJobs/Platforms/PlatformController.cs index 9692a86..d819dad 100644 --- a/PassengerJobs/Platforms/PlatformController.cs +++ b/PassengerJobs/Platforms/PlatformController.cs @@ -27,6 +27,16 @@ public static PlatformController GetControllerForTrack(Track platform) return _trackToControllerMap[platform.ID.ToString()]; } + public static void HandleGameUnloading() + { + foreach (var platform in _trackToControllerMap.Values) + { + Destroy(platform); + } + + _trackToControllerMap.Clear(); + } + public WarehouseMachine Warehouse { get; private set; } = null!; public Track Track = null!; public SignPrinter[] Signs { get; private set; } = Array.Empty();