(UNTESTED) use JsonConvert.SerializeObject

This commit is contained in:
JohnCorby 2022-12-04 00:48:08 -08:00
parent 19a4cedb7d
commit 5d39a45040
2 changed files with 13 additions and 29 deletions

View File

@ -2,6 +2,7 @@ using NewHorizons.Builder.Props;
using NewHorizons.External.Configs;
using NewHorizons.External.Modules;
using NewHorizons.Utility.DebugUtilities;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@ -528,30 +529,9 @@ namespace NewHorizons.Utility.DebugMenu
.GroupBy(conversation => conversation.planetConfig.name)
.Select(allConversationsOnBody =>
allConversationsOnBody.Key +
"\n[" +
allConversationsOnBody.Select(conversation =>
"\t{\n" +
$"\t\t\"position\": {conversation.conversation.position},\n" +
$"\t\t\"normal\": {conversation.conversation.normal},\n" +
(conversation.conversation.parentPath == default ? "" : $"\t\t\"parentPath\": \"{conversation.conversation.parentPath}\",\n") +
(conversation.conversation.location == NomaiTextInfo.NomaiTextLocation.UNSPECIFIED ? "" : $"\t\t\"location\": {conversation.conversation.location},\n") +
(conversation.conversation.rotation == default ? "" : $"\t\t\"rotation\": {conversation.conversation.rotation},\n") +
(conversation.conversation.rename == default ? "" : $"\t\t\"rename\": \"{conversation.conversation.rename}\",\n") +
(conversation.conversation.seed == default ? "" : $"\t\t\"seed\": {conversation.conversation.seed},\n") +
(conversation.conversation.type == NomaiTextInfo.NomaiTextType.Wall ? "" : $"\t\t\"type\": \"{conversation.conversation.type}\",\n") +
$"\t\t\"xmlFile\": \"{conversation.conversation.xmlFile}\",\n" +
"\t\t\"arcInfo\": [\n" +
string.Join(",\n", conversation.spirals.Select(spiral =>
"\t\t\t{" +
$"\"position\": {spiral.spiral.position}, " +
$"\"zRotation\": {spiral.spiral.zRotation}, " +
(spiral.spiral.mirror == default ? "" : $"\"mirror\": {spiral.spiral.mirror}, ") +
(spiral.spiral.type == NomaiTextArcInfo.NomaiTextArcType.Adult ? "" : $"\"type\": \"{spiral.spiral.type}\", ") +
(spiral.spiral.variation == -1 ? "" : $"\"variation\": {spiral.spiral.variation}") +
"}"
)) +
"\t\t]"
)
"\n[\n" +
string.Join(",\n", allConversationsOnBody.Select(conversation => "\t"+ JsonConvert.SerializeObject(conversation.conversation, DebugMenu.jsonSettings))) +
"\n]"
);
foreach(string json in conversationsJSON)

View File

@ -1,4 +1,6 @@
using NewHorizons.External.Configs;
using NewHorizons.External.Modules;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@ -35,14 +37,16 @@ namespace NewHorizons.Utility.DebugMenu
{
}
private string GetEntryPositionsJSON()
private string GetEntryPositionsJSON()
{
return string.Join(",\n",
return string.Join(",\n",
Resources
.FindObjectsOfTypeAll<ShipLogEntryCard>()
.Select(go =>
"{ \"id\": \"" +go.name+ "\", \"position\": {\"x\": "+go.transform.localPosition.x+", \"y\": "+go.transform.localPosition.y+" } "
)
.Select(go => JsonConvert.SerializeObject(new ShipLogModule.EntryPositionInfo
{
id = go.name,
position = new MVector2(go.transform.localPosition.x, go.transform.localPosition.y)
}, DebugMenu.jsonSettings))
);
}