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

Allow adding an xml to an existing dialogue that had a null asset (#868)

Browse Source 
## Bug fixes

- If `pathToExistingDialogue` points to a dialogue object that has a
null asset, it will now set its asset to yours instead of erroring.
- We now search in the body for `pathToExistingDialogue`. You no longer
have to put the root object at the beginning of the path.
This commit is contained in:
Noah Pilarski 2024-06-04 05:13:56 -04:00 committed by GitHub
commit df7cbae490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
NewHorizons/Builder/Props/DialogueBuilder.cs
View File

@ -35,7 +35,7 @@ namespace NewHorizons.Builder.Props
}
else
{
return (AddToExistingDialogue(info, xml), null);
return (AddToExistingDialogue(go, info, xml, dialogueName), null);
}
}
@ -70,9 +70,11 @@ namespace NewHorizons.Builder.Props
return (dialogue, remoteTrigger);
}
private static CharacterDialogueTree AddToExistingDialogue(DialogueInfo info, string xml)
private static CharacterDialogueTree AddToExistingDialogue(GameObject go, DialogueInfo info, string xml, string dialogueName)
{
var existingDialogue = SearchUtilities.Find(info.pathToExistingDialogue)?.GetComponent<CharacterDialogueTree>();
var dialogueObject = go.FindChild(info.pathToExistingDialogue);
if (dialogueObject == null) dialogueObject = SearchUtilities.Find(info.pathToExistingDialogue);
var existingDialogue = dialogueObject != null ? dialogueObject.GetComponent<CharacterDialogueTree>() : null;
if (existingDialogue == null)
{
@ -80,7 +82,29 @@ namespace NewHorizons.Builder.Props
return null;
}
var existingText = existingDialogue._xmlCharacterDialogueAsset.text;
var existingAsset = existingDialogue._xmlCharacterDialogueAsset;
if (existingAsset == null)
{
var dialogueDoc = new XmlDocument();
dialogueDoc.LoadXml(xml);
var xmlNode = dialogueDoc.SelectSingleNode("DialogueTree");
AddTranslation(xmlNode);
xml = xmlNode.OuterXml;
var text = new TextAsset(xml)
{
// Text assets need a name to be used with VoiceMod
name = dialogueName
};
existingDialogue.SetTextXml(text);
FixDialogueNextFrame(existingDialogue);
return existingDialogue;
}
var existingText = existingAsset.text;
var existingDialogueDoc = new XmlDocument();
existingDialogueDoc.LoadXml(existingText);
@ -517,14 +541,16 @@ namespace NewHorizons.Builder.Props
public static void HandleUnityCreatedDialogue(CharacterDialogueTree dialogue)
{
var text = dialogue._xmlCharacterDialogueAsset.text;
var asset = dialogue._xmlCharacterDialogueAsset;
if (asset == null) return;
var text = asset.text;
var dialogueDoc = new XmlDocument();
dialogueDoc.LoadXml(text);
var xmlNode = dialogueDoc.SelectSingleNode("DialogueTree");
AddTranslation(xmlNode, null);
var newTextAsset = new TextAsset(dialogueDoc.OuterXml)
{
name = dialogue._xmlCharacterDialogueAsset.name
name = asset.name
};
dialogue.SetTextXml(newTextAsset);