apply dialogue emotion patch by default

carxt · Jan 8, 2025 · 7281f44 · 7281f44
1 parent 0953066
commit 7281f44
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/JG/JohnnyGuitarNVSE.h b/JG/JohnnyGuitarNVSE.h
@@ -82,15 +82,15 @@ namespace hk_GMSTJG {
 	{
 		Setting fCombatLocationTargetRadiusMaxBase;
 		Setting fCombatRangedWeaponRangeBaseMult;
-		Setting iOverrideStandardEmotions;
+		Setting iOverrideDialogueEmotionValues;
 
 	};
 	void ExtraGMSTInit()
 	{
 		using namespace gmst;
 		ThisStdCall<void>(func_AddGameSetting_Float, &fCombatLocationTargetRadiusMaxBase, "fCombatLocationTargetRadiusMaxBase", 10.0f);
 		ThisStdCall<void>(func_AddGameSetting_Float, &fCombatRangedWeaponRangeBaseMult, "fCombatRangedWeaponRangeBaseMult", 1.0f);
-		ThisStdCall<void>(func_AddGameSetting_IntOrStaticStr, &iOverrideStandardEmotions, "iOverrideStandardEmotions", 1);
+		ThisStdCall<void>(func_AddGameSetting_IntOrStaticStr, &iOverrideDialogueEmotionValues, "iOverrideDialogueEmotionValues", 0);
 
 
 	}
@@ -454,7 +454,7 @@ class hk_EmotionOverrideUndo
 {
 	static void* __fastcall hk_UndoEmotionOverride(void** ptr)
 	{
-		Setting* iSTDEmotionVal = &hk_GMSTJG::gmst::iOverrideStandardEmotions;
+		Setting* iSTDEmotionVal = &hk_GMSTJG::gmst::iOverrideDialogueEmotionValues;
 		auto retVal = ThisStdCall<void*>(hookCall, ptr);
 		if (iSTDEmotionVal->data.i <= 0)
 		{
@@ -606,7 +606,7 @@ namespace hk_DialogueTopicResponseManageHook {
 					responseCol->emotionValue = diaItem->second.m_emotionValue;
 
 				}
-				if ((responseCol->emotionType > 0) && hk_GMSTJG::gmst::iOverrideStandardEmotions.data.i >= 1)
+				if ((responseCol->emotionType > 0) && hk_GMSTJG::gmst::iOverrideDialogueEmotionValues.data.i >= 1)
 				{
 					responseCol->emotionValue = iSTDEmotionVal->data.i;
 				}