From 7281f44d696d74b9132e37357d41140ebd229046 Mon Sep 17 00:00:00 2001 From: carxt Date: Wed, 8 Jan 2025 10:12:27 +0100 Subject: [PATCH] apply dialogue emotion patch by default --- JG/JohnnyGuitarNVSE.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/JG/JohnnyGuitarNVSE.h b/JG/JohnnyGuitarNVSE.h index 1dce64c..88bb94e 100644 --- a/JG/JohnnyGuitarNVSE.h +++ b/JG/JohnnyGuitarNVSE.h @@ -82,7 +82,7 @@ namespace hk_GMSTJG { { Setting fCombatLocationTargetRadiusMaxBase; Setting fCombatRangedWeaponRangeBaseMult; - Setting iOverrideStandardEmotions; + Setting iOverrideDialogueEmotionValues; }; void ExtraGMSTInit() @@ -90,7 +90,7 @@ namespace hk_GMSTJG { using namespace gmst; ThisStdCall(func_AddGameSetting_Float, &fCombatLocationTargetRadiusMaxBase, "fCombatLocationTargetRadiusMaxBase", 10.0f); ThisStdCall(func_AddGameSetting_Float, &fCombatRangedWeaponRangeBaseMult, "fCombatRangedWeaponRangeBaseMult", 1.0f); - ThisStdCall(func_AddGameSetting_IntOrStaticStr, &iOverrideStandardEmotions, "iOverrideStandardEmotions", 1); + ThisStdCall(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(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; }