Cool_Tools/whack
1
0
Fork 0
mirror of https://github.com/Raymonf/whack.git synced 2024-12-18 18:45:54 +01:00
Code Releases Activity

use EnglishMessageUSA instead of JapaneseMessage

Browse Source
This commit is contained in:
Raymonf 2022-11-08 00:35:12 -05:00
parent 3cfb5fbc63
commit dedc8f9fa6
No known key found for this signature in database
GPG Key ID: 438459BF619B037A
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
WTT/WTT/TableImporter.cs
View File

@ -74,8 +74,10 @@ public class TableImporter
throw new InvalidDataException($"key '{key}' is invalid"); throw new InvalidDataException($"key '{key}' is invalid");
if (strings.ContainsKey(key)) if (strings.ContainsKey(key))
throw new DuplicateKeyException($"duplicate key '{key}' found for file {tomlPath} ({asset.FilePath})"); throw new DuplicateKeyException($"duplicate key '{key}' found for file {tomlPath} ({asset.FilePath})");
var exists = value.HasKey("JapaneseMessage") && value["JapaneseMessage"].IsString;
strings.Add(key, exists ? value["JapaneseMessage"].AsString.Value : null); // we now output the boolean false for null values since toml doesn't have null
var exists = value.HasKey("EnglishMessageUSA") && value["EnglishMessageUSA"].IsString;
strings.Add(key, exists ? value["EnglishMessageUSA"].AsString.Value : null);
} }
} }
@ -94,13 +96,6 @@ public class TableImporter
continue; continue;
} }
// index of JapaneseMessage
var jpnIndex = entry.StructType.Value.Value switch
{
"MessageData" => 0,
"CharaMessageData" => 3,
_ => throw new Exception($"Unhandled type '{entry.StructType}'")
};
// index of EnglishMessageUSA // index of EnglishMessageUSA
var engIndex = entry.StructType.Value.Value switch var engIndex = entry.StructType.Value.Value switch
{ {
@ -109,8 +104,7 @@ public class TableImporter
_ => throw new Exception($"Unhandled type '{entry.StructType}'") _ => throw new Exception($"Unhandled type '{entry.StructType}'")
}; };
// set the string as the english string if it isn't the same as the japanese string if (strings[name] != null)
if (strings[name] != null && ((FString)entry.Value[jpnIndex].RawValue).Value != strings[name])
{ {
entry.Value[engIndex].SetObject(FString.FromString(strings[name])); entry.Value[engIndex].SetObject(FString.FromString(strings[name]));
} }