v1.1.0

alphanin9 · Oct 14, 2024 · 1899f40 · 1899f40
1 parent b867ccb
commit 1899f40
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 273 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,6 +47,7 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
           $packagingDir = "./_packaging"
+          $pdbDir = "./_pdb"
 
           # Create the necessary directories
           New-Item -ItemType directory -Path $packagingDir/red4ext
@@ -55,9 +56,11 @@ jobs:
           New-Item -ItemType directory -Path $packagingDir/red4ext/plugins/NewGamePlus/redscript
           New-Item -ItemType directory -Path $packagingDir/red4ext/plugins/NewGamePlus/tweaks
 
+          New-Item -ItemType directory -Path $pdbDir/red4ext/plugins/NewGamePlus
+
           # Copy the build artifacts
           Copy-Item -Path ./x64/Release/NewGamePlus.dll -Destination $packagingDir/red4ext/plugins/NewGamePlus
-          Copy-Item -Path ./x64/Release/NewGamePlus.pdb -Destination $packagingDir/red4ext/plugins/NewGamePlus
+          Copy-Item -Path ./x64/Release/NewGamePlus.pdb -Destination $pdbDir/red4ext/plugins/NewGamePlus
 
           # Copy over Redscript/tweaks
           Copy-Item -Path ./scripting/* -Destination $packagingDir/red4ext/plugins/NewGamePlus/redscript -Recurse
@@ -73,6 +76,7 @@ jobs:
           
           # Create the ZIP file.
           7z a NewGamePlus_${env:NGPLUS_VERSION}.zip $packagingDir/*
+          7z a NewGamePlus_${env:NGPLUS_VERSION}_pdb.zip $pdbDir/*
     - name: Generate hash for .zip
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
@@ -92,3 +96,4 @@ jobs:
           - ${{env.NGPLUS_SHA256}}
         files: | 
           NewGamePlus_${{env.NGPLUS_VERSION }}.zip
+          NewGamePlus_${{env.NGPLUS_VERSION }}_pdb.zip
diff --git a/NewGamePlus.rc b/NewGamePlus.rc
diff --git a/SaveDataParser.vcxproj b/SaveDataParser.vcxproj
@@ -223,7 +223,12 @@
     <ClInclude Include="src\hooking\hooking.hpp" />
     <ClInclude Include="src\parsing\cursorDef.hpp" />
     <ClInclude Include="src\parsing\definitions\compression\compressionHeader.hpp" />
+    <ClInclude Include="src\parsing\definitions\fileInfo.hpp" />
+    <ClInclude Include="src\parsing\definitions\nodeEntry.hpp" />
+    <ClInclude Include="src\parsing\definitions\nodeParsers\defaultNodeData.hpp" />
+    <ClInclude Include="src\parsing\definitions\nodeParsers\interfaceNodeData.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\inventory\inventoryNode.hpp" />
+    <ClInclude Include="src\parsing\definitions\nodeParsers\parserHelper.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\persistency\helpers\nativePersistencyReader.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\persistency\persistencySystemNode.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\quest\factsDBNode.hpp" />
@@ -233,7 +238,6 @@
     <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\classDefinitions\craftBook.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\classDefinitions\equipmentSystem.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\classDefinitions\playerDevelopmentData.hpp" />
-    <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\nativeScriptableReader.hpp" />
     <ClInclude Include="src\parsing\definitions\nodeParsers\stats\statsSystemNode.hpp" />
     <ClInclude Include="src\parsing\definitions\package\packageReader.hpp" />
     <ClInclude Include="src\parsing\fileReader.hpp" />

diff --git a/SaveDataParser.vcxproj.filters b/SaveDataParser.vcxproj.filters
@@ -131,9 +131,6 @@
     <ClInclude Include="src\parsing\definitions\rttiHelpers\rttiValueReaderNative.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\nativeScriptableReader.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\parsing\definitions\nodeParsers\scriptable\helpers\classDefinitions\playerDevelopmentData.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -227,6 +224,21 @@
     <ClInclude Include="src\redscript_api\dataReaders\equipmentExViewManager\viewManagerReader.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\parsing\definitions\nodeParsers\defaultNodeData.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\parsing\definitions\nodeParsers\interfaceNodeData.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\parsing\definitions\nodeParsers\parserHelper.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\parsing\definitions\nodeEntry.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\parsing\definitions\fileInfo.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="NewGamePlus.rc">

diff --git a/src/filesystem/fs_util.cpp b/src/filesystem/fs_util.cpp
@@ -168,7 +168,6 @@ bool HasValidPointOfNoReturnSave()
     {
         if (IsValidForNewGamePlus(i))
         {
-            PluginContext::Spew("Has valid point of no return savegame file!");
             return true;
         }
     }

diff --git a/src/main.cpp b/src/main.cpp
@@ -14,19 +14,22 @@
 #include "hooking/hooking.hpp"
 #include "util/migration/migration.hpp"
 
-RED4EXT_C_EXPORT bool RED4EXT_CALL Main(RED4ext::PluginHandle aHandle, RED4ext::EMainReason aReason, const RED4ext::Sdk* aSdk)
+using namespace Red;
+
+RED4EXT_C_EXPORT bool RED4EXT_CALL Main(PluginHandle aHandle, EMainReason aReason, const Sdk* aSdk)
 {
 	switch (aReason)
 	{
-	case RED4ext::EMainReason::Load:
+	case EMainReason::Load:
 	{
 		PluginContext::m_redPlugin = aHandle;
 		PluginContext::m_redSdk = aSdk;
 
-		Red::TypeInfoRegistrar::RegisterDiscovered();
+		TypeInfoRegistrar::RegisterDiscovered();
 
-		constexpr auto loadDependenciesFromPluginFolder = true;
-		if constexpr (loadDependenciesFromPluginFolder) {
+		constexpr auto c_loadDependenciesFromPluginFolder = true;
+        if constexpr (c_loadDependenciesFromPluginFolder)
+        {
 			if (!ArchiveXL::RegisterArchive(aHandle, L"NewGamePlus.archive")) {
                 PluginContext::Error("Failed to load archive from the plugin's folder, quitting...");
 				return false;
@@ -62,7 +65,7 @@ RED4EXT_C_EXPORT bool RED4EXT_CALL Main(RED4ext::PluginHandle aHandle, RED4ext::
             });
 		break;
 	}
-	case RED4ext::EMainReason::Unload:
+	case EMainReason::Unload:
 	{
 		if (!hooking::DetachHooking()) {
 			return false;
@@ -75,11 +78,11 @@ RED4EXT_C_EXPORT bool RED4EXT_CALL Main(RED4ext::PluginHandle aHandle, RED4ext::
 	return true;
 }
 
-RED4EXT_C_EXPORT void RED4EXT_CALL Query(RED4ext::PluginInfo* aInfo)
+RED4EXT_C_EXPORT void RED4EXT_CALL Query(PluginInfo* aInfo)
 {
 	aInfo->name = L"New Game+";
 	aInfo->author = L"not_alphanine";
-    aInfo->version = RED4EXT_SEMVER_EX(1, 0, 5, RED4EXT_V0_SEMVER_PRERELEASE_TYPE_NONE, 0); // Set your version here.
+    aInfo->version = RED4EXT_SEMVER_EX(1, 1, 0, RED4EXT_V0_SEMVER_PRERELEASE_TYPE_NONE, 0); // Set your version here.
 	aInfo->runtime = RED4EXT_RUNTIME_INDEPENDENT;
 	aInfo->sdk = RED4EXT_SDK_LATEST;
 }

diff --git a/src/parsing/definitions/nodeParsers/scriptable/helpers/nativeScriptableReader.hpp b/src/parsing/definitions/nodeParsers/scriptable/helpers/nativeScriptableReader.hpp