damage scaling

ermaccer · Feb 8, 2022 · cd475e0 · cd475e0
1 parent 9c9e31d
commit cd475e0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/I2Hook/I2Hook.rc b/I2Hook/I2Hook.rc
diff --git a/I2Hook/code/PlayerInfo.cpp b/I2Hook/code/PlayerInfo.cpp
@@ -8,4 +8,6 @@ void PlayerInfo::SetMeter(float value)
 
 void PlayerInfo::SetDamageMult(float value)
 {
+	*(float*)(this + 0x338) = value;
+	*(float*)(this + 0x338 + 4) = value;
 }
diff --git a/I2Hook/code/dcf2.cpp b/I2Hook/code/dcf2.cpp
@@ -34,6 +34,12 @@ void __fastcall Hooks::HookProcessStuff()
 		if (TheMenu->m_bZeroMeterP1)
 			p1_info->SetMeter(0.0f);
 
+		if (TheMenu->m_bDisableComboScaling)
+		{
+			if (p1_info)
+				p1_info->SetDamageMult(1.0f);
+		}
+
 		if (TheMenu->m_bDisableHeadTracking)
 			p1->KillHeadTracking();
 
@@ -77,6 +83,13 @@ void __fastcall Hooks::HookProcessStuff()
 			HideHUD();
 		if (TheMenu->m_bDisableHeadTracking)
 			p2->KillHeadTracking();
+
+		if (TheMenu->m_bDisableComboScaling)
+		{
+			if (p2_info)
+				p2_info->SetDamageMult(1.0f);
+		}
+
 		if (TheMenu->m_bP1CustomAbilities)
 		{
 			TheMenu->m_nP2Abilities = 0;

diff --git a/I2Hook/code/dcf2menu.cpp b/I2Hook/code/dcf2menu.cpp
@@ -338,7 +338,11 @@ void DCF2Menu::UpdateControls()
 	{
 		if (GetTickCount64() - timer <= 150) return;
 		timer = GetTickCount64();
-		m_bSlowMotion ^= 1;
+		TheMenu->m_bSlowMotion ^= 1;
+		if (TheMenu->m_bSlowMotion)
+			SlowGameTimeForXTicks(m_fSlowMotionSpeed, 0x7FFFFFFF);
+		else
+			SlowGameTimeForXTicks(1.0, 10);
 	}
 
 	if (GetAsyncKeyState(SettingsMgr->iToggleFreezeWorldKey))
@@ -852,6 +856,8 @@ void DCF2Menu::DrawMiscTab()
 	ImGui::Checkbox("Disable Head Tracking", &m_bDisableHeadTracking);
 	ImGui::SameLine();
 	ShowHelpMarker("Disables P1 head looking at P2. Automatically enabled with 'Head Perspective' custom camera.");
+
+	ImGui::Checkbox("Disable Combo Scaling", &m_bDisableComboScaling);
 }
 
 void DCF2Menu::DrawSettings()

diff --git a/I2Hook/code/dcf2menu.h b/I2Hook/code/dcf2menu.h
@@ -60,6 +60,8 @@ class DCF2Menu {
 	bool	m_bPlayer1Modifier = false;
 	bool	m_bPlayer2Modifier = false;
 
+	bool    m_bDisableComboScaling = false;
+
 	float	 m_fSlowMotionSpeed = 0.5f;
 	float	 m_fP1Speed = 1.0f;
 	float	 m_fP2Speed = 1.0f;

diff --git a/I2Hook/code/eSettingsManager.cpp b/I2Hook/code/eSettingsManager.cpp
@@ -86,8 +86,6 @@ void eSettingsManager::Init()
 	if (iFreeCameraKeyPitchMinus == 0xFF)
 		iFreeCameraKeyPitchMinus = ini.ReadInteger("Settings", "iFreeCameraKeyPitchMinus", 0);
 
-
-	CIniReader user("i2hook_user.ini");
 	fMenuScale = user.ReadFloat("MenuSettings", "fMenuScale", 1.0f);
 
 	if (fMenuScale < 1.0f)