Changes to Fake Teleport and Fake Fake Teleport:

- Added Blimp Strats, Make Random Stunt Jump and Teleport To Random Store to fake teleports
- Tidy up the code for fake teleports
- Fix CurrentEffect::OverrideEffectNameFromId

Author: Regynate

ChaosMod/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13)
 project(ChaosMod)
 
 file(GLOB ROOT_SRC ${PROJECT_SOURCE_DIR}/*.cpp)
-file(GLOB_RECURSE SRC ${PROJECT_SOURCE_DIR}/Components/*.cpp ${PROJECT_SOURCE_DIR}/Effects/*.cpp
+file(GLOB_RECURSE SRC ${PROJECT_SOURCE_DIR}/Components/*.cpp ${PROJECT_SOURCE_DIR}/Effects/*.cpp ${PROJECT_SOURCE_DIR}/Effects/*.h
     ${PROJECT_SOURCE_DIR}/Memory/*.cpp ${PROJECT_SOURCE_DIR}/Util/*.cpp)
 file(GLOB PATTERNS_SRC ${PROJECT_SOURCE_DIR}/../vendor/Patterns/Patterns.cpp)
 add_library(ChaosMod MODULE ${ROOT_SRC} ${SRC} ${PATTERNS_SRC} ChaosMod.rc)

ChaosMod/Components/EffectDispatchTimer.cpp

@@ -159,6 +159,21 @@ void EffectDispatchTimer::ResetFakeTimerPercentage()
 	m_FakeTimerPercentage = 0.f;
 }
 
+bool EffectDispatchTimer::IsTimerPaused() const
+{
+	return m_PauseTimer;
+}
+
+void EffectDispatchTimer::SetTimerPaused(bool pause)
+{
+	m_PauseTimer = pause;
+}
+
+bool EffectDispatchTimer::IsUsingDistanceBasedDispatch() const
+{
+	return m_DistanceChaosState.EnableDistanceBasedEffectDispatch;
+}
+
 void EffectDispatchTimer::OnRun()
 {
 	auto curTime = GetTickCount64();

ChaosMod/Components/EffectDispatchTimer.h

@@ -49,5 +49,10 @@ class EffectDispatchTimer : public Component
 	void SetFakeTimerPercentage(float percentage);
 	void ResetFakeTimerPercentage();
 
+	bool IsTimerPaused() const;
+	void SetTimerPaused(bool pause);
+
+	bool IsUsingDistanceBasedDispatch() const;
+
 	virtual void OnRun() override;
 };

ChaosMod/Components/EffectDispatcher.cpp

@@ -345,15 +345,15 @@ void EffectDispatcher::UpdateEffects(int deltaTime)
 			if (!effectSharedData->OverrideEffectName.empty())
 			{
 				activeEffect.FakeName = effectSharedData->OverrideEffectName;
-				effectSharedData->OverrideEffectId.clear();
+				effectSharedData->OverrideEffectName.clear();
 			}
 
 			if (!effectSharedData->OverrideEffectId.empty())
 			{
 				if (g_EnabledEffects.contains(effectSharedData->OverrideEffectId))
 				{
 					auto &fakeEffect      = g_EnabledEffects.at(effectSharedData->OverrideEffectId);
-					activeEffect.FakeName = !fakeEffect.HasCustomName() ? "" : fakeEffect.CustomName;
+					activeEffect.FakeName = !fakeEffect.HasCustomName() ? fakeEffect.Name : fakeEffect.CustomName;
 				}
 				else
 				{

ChaosMod/Effects/db/Player/PlayerBlimpStrats.cpp

@@ -6,9 +6,13 @@
 
 #include "Memory/Hooks/ScriptThreadRunHook.h"
 
-static void OnStart()
+#include "PlayerBlimpStrats.h"
+
+void OnStartBlimpStrats(bool bHandleThreadBlock)
 {
-	Hooks::EnableScriptThreadBlock();
+	if (bHandleThreadBlock)
+		Hooks::EnableScriptThreadBlock();
+
 	bool cutscenePlaying = IS_CUTSCENE_PLAYING();
 
 	Hash blimpHash       = "blimp"_hash;
@@ -61,15 +65,22 @@ static void OnStart()
 		SET_PED_AS_NO_LONGER_NEEDED(&pedDave);
 	}
 
-	Hooks::DisableScriptThreadBlock();
+	if (bHandleThreadBlock)
+		Hooks::DisableScriptThreadBlock();
+
 	SET_VEHICLE_AS_NO_LONGER_NEEDED(&veh);
 }
 
+static void OnStart()
+{
+	OnStartBlimpStrats(true);
+}
+
 // clang-format off
 REGISTER_EFFECT(OnStart, nullptr, nullptr, EffectInfo
     {
         .Name = "Blimp Strats",
         .Id = "player_blimp_strats",
         .EffectGroupType = EffectGroupType::Teleport
     }
-);
+);

ChaosMod/Effects/db/Player/PlayerBlimpStrats.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void OnStartBlimpStrats(bool bHandleThreadBlock);

ChaosMod/Effects/db/Player/PlayerRandomStuntJump.cpp

@@ -7,6 +7,8 @@
 #include "Util/Player.h"
 #include "Util/Vehicle.h"
 
+#include "PlayerRandomStuntJump.h"
+
 struct Location
 {
 	Vector3 coordinates;
@@ -47,7 +49,7 @@ CHAOS_VAR std::vector<Location> allPossibleJumps = {
 	{ { -958.207, -2766.583, 13.693 }, 151.829, 45.f }  // 30
 };
 
-static void OnStart()
+void OnStartMakeRandomStuntJump()
 {
 	Ped playerPed = PLAYER_PED_ID();
 	Vehicle veh;
@@ -76,7 +78,7 @@ static void OnStart()
 }
 
 // clang-format off
-REGISTER_EFFECT(OnStart, nullptr, nullptr, EffectInfo
+REGISTER_EFFECT(OnStartMakeRandomStuntJump, nullptr, nullptr, EffectInfo
     {
         .Name = "Make Random Stunt Jump",
         .Id = "player_tp_stunt",

ChaosMod/Effects/db/Player/PlayerRandomStuntJump.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void OnStartMakeRandomStuntJump();