From c99c9cc3652fb6c0b86c9857587d7bbfd12bec64 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 2 Oct 2021 20:58:44 -0500 Subject: [PATCH] include metal FootMetalSound oversight, include correction for mangled entries where a given varname and a given assetname match --- .../scripts/pre40/T3Dpre4ProjectImporter.tscript | 2 +- .../projectImporter/scripts/projectImporter.tscript | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript index 8382fa7ca..119ba6066 100644 --- a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript +++ b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript @@ -945,7 +945,7 @@ $rigidEntriesList = $rigidEntriesList SPC "waterWakeSound waterWakeSoundAsset"; T3Dpre4ProjectImporter::genProcessor("RigidShapeData",$rigidEntriesList); $PlayerEntriesList = "shapeFP shapeFPAsset shapeNameFP shapeFPAsset"; -$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset"; +$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset FootMetalSound FootMetal"; $PlayerEntriesList = $PlayerEntriesList SPC "FootSnowSound FootSnowAsset FootShallowSound FootShallowSplashAsset"; $PlayerEntriesList = $PlayerEntriesList SPC "FootWadingSound FootWadingAsset FootUnderwaterSound FootUnderWaterAsset"; $PlayerEntriesList = $PlayerEntriesList SPC "FootBubblesSound FootBubblesAsset movingBubblesSound MoveBubblesAsset"; diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript index eca0e0b07..cfdd7c8bf 100644 --- a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript +++ b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript @@ -515,7 +515,7 @@ function testFilenameExtensions(%filename) } function processLegacyField(%line, %originalFieldName, %newFieldName) -{ +{ if(!strIsMatchExpr("*"@%originalFieldName@"=*;*", %line) && !strIsMatchExpr("*"@%originalFieldName@"[*=*;*", %line) && !strIsMatchExpr("*"@%originalFieldName@" *=*;*", %line)) @@ -603,10 +603,10 @@ function processLegacyField(%line, %originalFieldName, %newFieldName) if(!strIsMatchExpr("*\"*\"*", %originalValue)) %assetId = "\"" @ %assetId @ "\""; - //if (%assetId.getStatusString() $= "Ok") - %outLine = strReplace(%outLine, %value, %assetId); - //else - // error("Asset assignment failure:", %assetId, getStatusString()); + %firstPart = getToken(%outLine, "=", 0); + %secondPart = getToken(%outLine, "=", 1); + %secondPart = strReplace(%secondPart, %value, %assetId); + %outLine = %firstPart @ "=" @ %secondPart; } }