Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix subtitles duplicated on configs reload

Browse Source
This commit is contained in:
Damián Garro 2022-05-27 03:20:14 -03:00
parent 90a7c8b2e8
commit 81fad1f507
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NewHorizons/Handlers/SubtitlesHandler.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using NewHorizons.Utility; using NewHorizons.Utility;
@ -19,9 +21,9 @@ namespace NewHorizons.Handlers
public float fade = 1; public float fade = 1;
public bool fadingAway = true; public bool fadingAway = true;
public static List<Sprite> possibleSubtitles = new List<Sprite>(); public List<Sprite> possibleSubtitles = new List<Sprite>();
public static bool eoteSubtitleHasBeenInserted = false; public bool eoteSubtitleHasBeenInserted = false;
public static Sprite eoteSprite; public Sprite eoteSprite;
public int subtitleIndex; public int subtitleIndex;
public System.Random randomizer; public System.Random randomizer;
@ -29,7 +31,7 @@ namespace NewHorizons.Handlers
public static readonly int PAUSE_TIMER_MAX = 50; public static readonly int PAUSE_TIMER_MAX = 50;
public int pauseTimer = PAUSE_TIMER_MAX; public int pauseTimer = PAUSE_TIMER_MAX;
public static void CheckForEOTE() public void CheckForEOTE()
{ {
if (!eoteSubtitleHasBeenInserted) if (!eoteSubtitleHasBeenInserted)
{ {
@ -57,21 +59,30 @@ namespace NewHorizons.Handlers
CheckForEOTE(); CheckForEOTE();
image.sprite = null; // Just in case. I don't know how not having the dlc changes the subtitle game object image.sprite = null; // Just in case. I don't know how not having the dlc changes the subtitle game object
AddSubtitles();
} }
public static void AddSubtitle(IModBehaviour mod, string filepath) private void AddSubtitles()
{
foreach (var mod in Main.MountedAddons.Where(mod => File.Exists($"{mod.ModHelper.Manifest.ModFolderPath}subtitle.png")))
{
AddSubtitle(mod, "subtitle.png");
}
}
public void AddSubtitle(IModBehaviour mod, string filepath)
{ {
Logger.Log($"Adding subtitle for {mod.ModHelper.Manifest.Name}"); Logger.Log($"Adding subtitle for {mod.ModHelper.Manifest.Name}");
var tex = ImageUtilities.GetTexture(mod, filepath); var tex = ImageUtilities.GetTexture(mod, filepath);
if (tex == null) return; if (tex == null) return;
// var sprite = Sprite.Create(tex, new Rect(0.0f, 0.0f, tex.width, tex.height), new Vector2(0.5f, 0.5f), 100.0f);
var sprite = Sprite.Create(tex, new Rect(0.0f, 0.0f, tex.width, SUBTITLE_HEIGHT), new Vector2(0.5f, 0.5f), 100.0f); var sprite = Sprite.Create(tex, new Rect(0.0f, 0.0f, tex.width, SUBTITLE_HEIGHT), new Vector2(0.5f, 0.5f), 100.0f);
AddSubtitle(sprite); AddSubtitle(sprite);
} }
public static void AddSubtitle(Sprite sprite) public void AddSubtitle(Sprite sprite)
{ {
possibleSubtitles.Add(sprite); possibleSubtitles.Add(sprite);
} }

4
NewHorizons/Main.cs
View File

@ -342,10 +342,6 @@ namespace NewHorizons
{ {
LoadTranslations(folder, mod); LoadTranslations(folder, mod);
} }
if (File.Exists($"{mod.ModHelper.Manifest.ModFolderPath}subtitle.png"))
{
SubtitlesHandler.AddSubtitle(mod, "subtitle.png");
}
} }
catch (Exception ex) catch (Exception ex)
{ {