Skip to content

Commit 326b7f0

Browse files
committed
Fix issues with ent file export which uses project files
1 parent 67364a7 commit 326b7f0

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

Scripts/Export_Ent_w_Rig.wscript

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@ function FindEntRigs(fileName) {
288288
for (let app of json["Data"]["RootChunk"]["appearances"]) {
289289
var appfileName = app["appearanceResource"]["DepotPath"];
290290
//Logger.Info(appfileName);
291-
var appfile = wkit.GetFileFromBase(appfileName.toString());
291+
var appfileNameStr = appfileName.toString();
292+
if (wkit.FileExistsInProject(appfileNameStr)) {
293+
var appfile = wkit.GetFileFromProject(appfileNameStr, OpenAs.GameFile);
294+
}
295+
else {
296+
var appfile = wkit.GetFileFromBase(appfileNameStr);
297+
}
292298
var appjson = TypeHelper.JsonParse(wkit.GameFileToJson(appfile));
293299
for (let appApp of appjson["Data"]["RootChunk"]["appearances"]) {
294300
for (let appcomp of appApp["Data"]["components"]) {

Scripts/Export_Vehicle_Ent.wscript

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,13 @@ function FindEntRigs(fileName) {
240240
for (let app of json["Data"]["RootChunk"]["appearances"]) {
241241
var appfileName = app["appearanceResource"]["DepotPath"];
242242
//Logger.Info(appfileName);
243-
var appfile = wkit.GetFileFromBase(appfileName.toString());
243+
var appfileNameStr = appfileName.toString();
244+
if (wkit.FileExistsInProject(appfileNameStr)) {
245+
var appfile = wkit.GetFileFromProject(appfileNameStr, OpenAs.GameFile);
246+
}
247+
else {
248+
var appfile = wkit.GetFileFromBase(appfileNameStr);
249+
}
244250
var appjson = TypeHelper.JsonParse(wkit.GameFileToJson(appfile));
245251
for (let appApp of appjson["Data"]["RootChunk"]["appearances"]) {
246252
for (let appcomp of appApp["Data"]["components"]) {

Scripts/hook_global.wscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ globalThis.onImportFromJson = function (jsonText) {
210210
// json["Data"]["RootChunk"]["cookingPlatform"] = "PLATFORM_PS5";
211211

212212
return {
213-
jsonText: TypeHelper.JsonStringify(json, 2)
213+
jsonText: TypeHelper.JsonStringify(json)
214214
}
215215
}
216216

0 commit comments

Comments
 (0)