diff --git a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs index 4d3e44cab..27e402dfc 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs @@ -651,8 +651,9 @@ public void HideBubble() { } public override void SkipLine() { - if (noSkip1stFrame) return; CheckExists(); + if (lateStartWaiting) + LateStartSetText(); if (GlobalControls.isInFight && EnemyEncounter.script.GetVar("playerskipdocommand").Boolean || UnitaleUtil.IsOverworld && (EventManager.instance.script != null && EventManager.instance.script.GetVar("playerskipdocommand").Boolean || GlobalControls.isInShop && GameObject.Find("Canvas").GetComponent().script.GetVar("playerskipdocommand").Boolean)) diff --git a/Assets/Scripts/Text/TextManager.cs b/Assets/Scripts/Text/TextManager.cs index 69447c15f..eef9c4f77 100644 --- a/Assets/Scripts/Text/TextManager.cs +++ b/Assets/Scripts/Text/TextManager.cs @@ -112,7 +112,6 @@ public float rotation { //public string[] mugshotsPath; //public bool overworld; [MoonSharpHidden] public bool skipNowIfBlocked = false; - internal bool noSkip1stFrame = true; [MoonSharpHidden] public bool lateStartWaiting = false; // Lua text objects will use a late start public TextManager() { @@ -457,7 +456,7 @@ [MoonSharpHidden] public void DoSkipFromPlayer() { } public virtual void SkipLine() { - if (noSkip1stFrame) return; + if (lateStartWaiting) return; foreach (LetterData d in letters) d.image.enabled = true; currentCharacter = textQueue[currentLine].Text.Length; @@ -599,7 +598,6 @@ private void MoveLetter(string currentText, int letterIndex) { } protected virtual void SpawnText() { - noSkip1stFrame = true; string currentText = textQueue[currentLine].Text; letters.Clear(); if (currentText.Length > 1 && GetAutoLineBreak()) @@ -878,8 +876,6 @@ protected virtual void Update() { } } } - - noSkip1stFrame = false; } private void HandleShowLettersOnce(ref bool soundPlayed, ref int lastLetter) {