etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_1'

This commit is contained in:
minenice55 2024-01-14 12:52:25 -05:00
parent aec5b0b5b4 4fa9294fdd
commit 062bb16b23
1 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Assets/Scripts/Games/FirstContact/FirstContact.cs
View File

@ -37,6 +37,7 @@ namespace HeavenStudio.Games.Loaders
{ {
new Param("spaceNum", new EntityTypes.Integer(0, 12, 0), "Amount of spaces", "Spaces to add before the untranslated icon"), new Param("spaceNum", new EntityTypes.Integer(0, 12, 0), "Amount of spaces", "Spaces to add before the untranslated icon"),
new Param("dotdotdot", false, "Has ellipses?", "Will the man symbol be proceeded by a <...>?"), new Param("dotdotdot", false, "Has ellipses?", "Will the man symbol be proceeded by a <...>?"),
new Param("newline", false, "New line?", "Should this text start a new line?"),
new Param("dialogue", "", "Dialogue", "What should this sound translate to?") new Param("dialogue", "", "Dialogue", "What should this sound translate to?")
}, },
priority = 1 priority = 1
@ -130,7 +131,7 @@ namespace HeavenStudio.Games
string onOutDialogue = "YOU SUCK AT CHARTING"; string onOutDialogue = "YOU SUCK AT CHARTING";
string callDiagBuffer = ""; string callDiagBuffer = "";
string respDiagBuffer = ""; string respDiagBuffer = "";
List<string> callDiagList = new List<string>(); List<(string, bool)> callDiagList = new();
int callDiagIndex = 0; int callDiagIndex = 0;
private struct QueuedInterval private struct QueuedInterval
{ {
@ -416,7 +417,7 @@ namespace HeavenStudio.Games
var input = inputs[i]; var input = inputs[i];
double relativeBeat = input.beat - intervalBeat; double relativeBeat = input.beat - intervalBeat;
ScheduleInput(beat, length + relativeBeat, InputAction_Press, AlienTapping, AlienOnMiss, AlienEmpty); ScheduleInput(beat, length + relativeBeat, InputAction_Press, AlienTapping, AlienOnMiss, AlienEmpty);
callDiagList.Add(input["dialogue"]); callDiagList.Add((input["dialogue"], input["newline"]));
} }
BeatAction.New(this, new List<BeatAction.Action>() BeatAction.New(this, new List<BeatAction.Action>()
{ {
@ -481,26 +482,45 @@ namespace HeavenStudio.Games
alienText.text = callDiagBuffer; alienText.text = callDiagBuffer;
} }
string GetMessageFromCallDialogue(int callDiagIndex = 0)
{
StringBuilder sb = new StringBuilder();
for (int i = callDiagIndex; i < callDiagList.Count; i++)
{
(string s, bool showNewline) = callDiagList[i];
if (showNewline && callDiagIndex != i)
{
break;
}
sb.Append(s);
}
return sb.ToString();
}
void UpdateTranslateTextbox() void UpdateTranslateTextbox()
{ {
if (callDiagIndex == 0 && !hasMissed && !noHitOnce) if (callDiagIndex == 0 && !hasMissed && !noHitOnce)
{ {
// shift the textbox to centre the message ResetTranslateTextbox();
StringBuilder sb = new StringBuilder();
foreach (string s in callDiagList)
{
sb.Append(s);
}
string fullMsg = sb.ToString();
// many hardcoded values there'll be a better way to do this
Vector2 size = translateText.GetPreferredValues(fullMsg, 10.95f, 2);
translateText.rectTransform.anchoredPosition = new Vector2(Mathf.Max((10.95f/2f) + (-size.x / 2 - 0.25f), -0.25f), Mathf.Max((2.11f / 2f) + (-size.y / 2) + 0.2f, 0.2f));
} }
translateText.text = respDiagBuffer; translateText.text = respDiagBuffer;
translateFailText.text = respDiagBuffer; translateFailText.text = respDiagBuffer;
} }
void ResetTranslateTextbox(bool destroyText = false)
{
// shift the textbox to centre the message
string message = GetMessageFromCallDialogue(callDiagIndex);
// many hardcoded values there'll be a better way to do this
Vector2 size = translateText.GetPreferredValues(message, 10.95f, 2);
translateText.rectTransform.anchoredPosition = new Vector2(Mathf.Max((10.95f / 2f) + (-size.x / 2 - 0.25f), -0.25f), Mathf.Max((2.11f / 2f) + (-size.y / 2) + 0.2f, 0.2f));
if (destroyText)
{
respDiagBuffer = "";
translateText.text = "";
}
}
public void MissionControlDisplay(double beat, bool stay, float length) public void MissionControlDisplay(double beat, bool stay, float length)
{ {
missionControl.SetActive(true); missionControl.SetActive(true);
@ -599,7 +619,12 @@ namespace HeavenStudio.Games
} }
else else
{ {
respDiagBuffer += callDiagList[callDiagIndex]; (string dialogue, bool showNewline) = callDiagList[callDiagIndex];
if (showNewline)
{
ResetTranslateTextbox(true);
}
respDiagBuffer += dialogue;
translateTextbox.SetActive(true); translateTextbox.SetActive(true);
UpdateTranslateTextbox(); UpdateTranslateTextbox();
callDiagIndex++; callDiagIndex++;