Fix some things

ScriptedSnark · Apr 9, 2024 · af71a47 · af71a47
1 parent c580bef
commit af71a47
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/GSChaos/CChaos.cpp b/GSChaos/CChaos.cpp
@@ -759,6 +759,11 @@ double CChaos::GetTime()
 	return m_flTime;
 }
 
+double CChaos::GetChaosTime()
+{
+	return m_flChaosTime;
+}
+
 double CChaos::GetGlobalTime()
 {
 	return m_flGlobalTime;

diff --git a/GSChaos/CChaos.h b/GSChaos/CChaos.h
@@ -64,6 +64,7 @@ class CChaos
 	int GetRandomEffect(int min, int max);
 	float GetRandomValue(float min, float max);
 	double GetTime();
+	double GetChaosTime();
 	double GetGlobalTime();
 	int GetFrameCount();
 	bool IsReady();

diff --git a/GSChaos/CFeatureLobotomy.cpp b/GSChaos/CFeatureLobotomy.cpp
@@ -56,15 +56,15 @@ void CFeatureLobotomy::DoMegaLobotomy(double time)
 
 	EMIT_SOUND_DYN2((*sv_player), CHAN_ITEM, "fvox/beep.wav", 1.0, ATTN_IDLE, 0, gChaos.GetRandomValue(PITCH_LOW - 20, PITCH_HIGH + 20));
 
-	m_flLobotomyTPTime = gChaos.GetGlobalTime() + (((CHAOS_ACTIVATE_TIMER / 2.0) / time) / 2.0); // :skull:
+	m_flLobotomyTPTime = gChaos.GetGlobalTime() + (((gChaos.GetChaosTime() / 2.0) / time) / 2.0); // :skull:
 }
 
 void CFeatureLobotomy::OnFrame(double time)
 {
 	if (!m_bActivated)
 		return;
 
-	if (time > (CHAOS_ACTIVATE_TIMER - 10.0f))
+	if (time > (gChaos.GetChaosTime() - 10.0f))
 	{
 		if (!m_bPlayedSound)
 		{
@@ -102,7 +102,7 @@ void CFeatureLobotomy::OnFrame(double time)
 
 		EMIT_SOUND_DYN2((*sv_player), CHAN_ITEM, "fvox/beep.wav", 1.0, ATTN_IDLE, 0, gChaos.GetRandomValue(PITCH_LOW - 20, PITCH_HIGH + 20));
 
-		if (time > (CHAOS_ACTIVATE_TIMER - 10.0f))
+		if (time > (gChaos.GetChaosTime() - 10.0f))
 			m_flLobotomyTPTime = gChaos.GetGlobalTime() + 0.5;
 		else
 			m_flLobotomyTPTime = gChaos.GetGlobalTime() + (LOBOTOMY_TP_TIME / 4.0);

diff --git a/GSChaos/CFeatureSwapHealth.cpp b/GSChaos/CFeatureSwapHealth.cpp
@@ -14,7 +14,7 @@ void CFeatureSwapHealth::ActivateFeature()
 	armor = (*sv_player)->v.armorvalue;
 
 	(*sv_player)->v.health = max(1.0f, armor);
-	(*sv_player)->v.armorvalue = health;
+	(*sv_player)->v.armorvalue = min(health, 4000.0f); // 5000-5100 is crash point - StereoBucket
 }
 
 void CFeatureSwapHealth::DeactivateFeature()