Exp Fix

Author: serpentiem

Kyrie/Kyrie.cpp

@@ -23,7 +23,7 @@ import Window;
 
 using namespace Windows;
 
-#define debug true
+#define debug false
 
 uint32 DllMain
 (

Mary/Exp.ixx

@@ -2,6 +2,8 @@ module;
 #include <string.h> // snprintf
 
 #include "../Core/RapidJSON.h"
+
+#include <initializer_list>
 export module Exp;
 
 import Core;
@@ -50,71 +52,58 @@ export struct ExpData
 
 		return *this;
 	}
+
+	ExpData & operator=(const std::initializer_list<int> &)
+	{
+		Log("Reset");
+
+		SetMemory
+		(
+			this,
+			0,
+			sizeof(*this)
+		);
+
+		return *this;
+	}
 };
 
-export ExpData expDataDante                  = {};
+export ExpData missionExpDataDante           = {};
+export ExpData sessionExpDataDante           = {};
 export ExpData savedExpDataDante[SAVE_COUNT] = {};
 
-export ExpData expDataVergil                  = {};
+export ExpData missionExpDataVergil           = {};
+export ExpData sessionExpDataVergil           = {};
 export ExpData savedExpDataVergil[SAVE_COUNT] = {};
 
 
 
-void CopySavedToActive()
-{
-	auto saveIndex = g_saveIndex;
-	if (saveIndex >= SAVE_COUNT)
-	{
-		return;
-	}
-
-	expDataDante  = savedExpDataDante [saveIndex];
-	expDataVergil = savedExpDataVergil[saveIndex];
-}
 
 
+namespaceStart(Exp);
 
-void CopyActiveToSaved()
+export void InitSession()
 {
-	auto saveIndex = g_saveIndex;
-	if (saveIndex >= SAVE_COUNT)
-	{
-		return;
-	}
+	LogFunction();
 
-	savedExpDataDante [saveIndex] = expDataDante;
-	savedExpDataVergil[saveIndex] = expDataVergil;
+	sessionExpDataDante  = {};
+	sessionExpDataVergil = {};
 }
 
-
-
-
-void ResetExpData()
+export void SceneMissionStart()
 {
 	LogFunction();
 
-	SetMemory
-	(
-		&expDataDante,
-		0,
-		sizeof(ExpData)
-	);
-
-	SetMemory
-	(
-		&expDataVergil,
-		0,
-		sizeof(ExpData)
-	);
+	missionExpDataDante  = sessionExpDataDante;
+	missionExpDataVergil = sessionExpDataVergil;
 }
 
-namespaceStart(Exp);
-
-export void InitSession()
+export void SceneMissionResult()
 {
 	LogFunction();
 
-	ResetExpData();
+	sessionExpDataDante  = missionExpDataDante;
+	sessionExpDataVergil = missionExpDataVergil;
 }
 
 namespaceEnd();
@@ -150,6 +139,10 @@ bool Max()
 
 
 
+
+#pragma region JSON
+
+
 namespaceStart(JSON);
 
 #include "../Core/JSON.h"
@@ -254,6 +247,12 @@ void ToExp()
 
 namespaceEnd();
 
+#pragma endregion
+
+
+
+
+
 
 
 export void SaveExp()
@@ -267,7 +266,20 @@ export void SaveExp()
 
 
 
-	CopyActiveToSaved();
+	auto saveIndex = g_saveIndex;
+	if (saveIndex >= SAVE_COUNT)
+	{
+		return;
+	}
+
+	if (g_scene == SCENE::GAME)
+	{
+		sessionExpDataDante  = missionExpDataDante;
+		sessionExpDataVergil = missionExpDataVergil;
+	}
+
+	savedExpDataDante [saveIndex] = sessionExpDataDante;
+	savedExpDataVergil[saveIndex] = sessionExpDataVergil;
 
 
 
@@ -354,7 +366,14 @@ export void LoadExp()
 
 
 
-	CopySavedToActive();
+	auto saveIndex = g_saveIndex;
+	if (saveIndex >= SAVE_COUNT)
+	{
+		return;
+	}
+
+	sessionExpDataDante  = savedExpDataDante [saveIndex];
+	sessionExpDataVergil = savedExpDataVergil[saveIndex];
 }
 
 

Mary/GUI.ixx

@@ -1,5 +1,6 @@
 
 
+// @Todo: g_showWelcome or just make g_show consider activeConfig.welcome
 // @Todo: Add missing move descriptions.
 // @Todo: Move GamepadClose calls to end of window.
 // @Clean
@@ -5614,7 +5615,7 @@ else if (tabIndex == TAB::DANTE)
 
 	Function
 	(
-		expDataDante,
+		missionExpDataDante,
 		shopHelpersDante,
 		countof(shopHelpersDante)
 	);
@@ -5627,7 +5628,7 @@ else if (tabIndex == TAB::VERGIL)
 
 	Function
 	(
-		expDataVergil,
+		missionExpDataVergil,
 		shopHelpersVergil,
 		countof(shopHelpersVergil)
 	);
@@ -5756,12 +5757,24 @@ void ExpWindow()
 				height
 			)
 		);
+
+		// // Center
+		// ImGui::SetNextWindowPos
+		// (
+		// 	ImVec2
+		// 	(
+		// 		((g_renderSize.x - width ) / 2),
+		// 		((g_renderSize.y - height) / 2)
+		// 	)
+		// );
+
+		// Top Right
 		ImGui::SetNextWindowPos
 		(
 			ImVec2
 			(
-				((g_renderSize.x - width ) / 2),
-				((g_renderSize.y - height) / 2)
+				(g_renderSize.x - width),
+				0
 			)
 		);
 	}
@@ -5924,15 +5937,18 @@ void ExpWindow()
 
 		FunctionOnce
 		(
-			expDataDante,
-			"Dante Active",
+			missionExpDataDante,
+			"Dante Mission",
+			shopHelpersDante,
+			countof(shopHelpersDante)
+		);
+		FunctionOnce
+		(
+			sessionExpDataDante,
+			"Dante Session",
 			shopHelpersDante,
 			countof(shopHelpersDante)
 		);
-		//ImGui::Text("");
-
-
-
 		FunctionLoop
 		(
 			savedExpDataDante,
@@ -5944,17 +5960,20 @@ void ExpWindow()
 
 
 
-
 		FunctionOnce
 		(
-			expDataVergil,
-			"Vergil Active",
+			missionExpDataVergil,
+			"Vergil Mission",
+			shopHelpersVergil,
+			countof(shopHelpersVergil)
+		);
+		FunctionOnce
+		(
+			sessionExpDataVergil,
+			"Vergil Session",
 			shopHelpersVergil,
 			countof(shopHelpersVergil)
 		);
-		//ImGui::Text("");
-
-
 		FunctionLoop
 		(
 			savedExpDataVergil,
@@ -5966,6 +5985,13 @@ void ExpWindow()
 
 
 
+
+
+
+
+
+
+
 		auto Content = [&](PlayerActorData & actorData)
 		{
 			ImGui::PushItemWidth(200);

Mary/Scene.ixx

@@ -6,6 +6,7 @@ import Core;
 
 import Actor;
 import Config;
+import Exp;
 import Global;
 import Vars;
 
@@ -15,6 +16,8 @@ import Vars;
 
 namespaceStart(Item);
 
+// @Research: Main & MissionSelect seem redundant.
+
 void SceneMain()
 {
 	if (!activeConfig.Actor.enable)
@@ -175,7 +178,7 @@ void SceneHandler()
 			Log(funcName);
 
 			Actor::SceneMissionStart();
-
+			Exp::SceneMissionStart();
 			Item::SceneMissionStart();
 
 			break;
@@ -184,6 +187,8 @@ void SceneHandler()
 		{
 			Log(funcName);
 
+			Exp::SceneMissionResult();
+
 			break;
 		}
 		case GAME_OVER:

ddmk.js

@@ -3049,8 +3049,8 @@ let helpersMary =
 	c += NEW_LINE;
 
 	c += Tabs() + "ExpData * expDataAddr =" + NEW_LINE;
-	c += Tabs() + "(character == CHARACTER::DANTE ) ? &expDataDante  :" + NEW_LINE;
-	c += Tabs() + "(character == CHARACTER::VERGIL) ? &expDataVergil :" + NEW_LINE;
+	c += Tabs() + "(character == CHARACTER::DANTE ) ? &missionExpDataDante  :" + NEW_LINE;
+	c += Tabs() + "(character == CHARACTER::VERGIL) ? &missionExpDataVergil :" + NEW_LINE;
 	c += Tabs() + "0;" + NEW_LINE;
 	c += NEW_LINE;
 

dinput8.cpp

@@ -224,7 +224,7 @@ byte32 DllMain
 {
 	if (reason == DLL_PROCESS_ATTACH)
 	{
-		Core_Log_Init("logs", "dinput8.txt");
+		InitLog("logs", "dinput8.txt");
 
 		Log("Session started.");