Expose MetaModifiers::TimeToDispatchEffect and MetaModifiers::Distanc…

…eToDispatchEffect to Lua runtime
gta-chaos-mod · Jan 31, 2025 · 938d945 · 938d945
1 parent 108881e
commit 938d945
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ChaosMod/Components/EffectDispatchTimer.cpp b/ChaosMod/Components/EffectDispatchTimer.cpp
@@ -228,7 +228,7 @@ void EffectDispatchTimer::OnRun()
 	if (!m_PauseTimer)
 	{
 		const TimerMode modeOverride =
-		    ComponentExists<MetaModifiers>() ? GetComponent<MetaModifiers>()->OverrideTimerMode : TimerMode::None;
+		    ComponentExists<MetaModifiers>() ? GetComponent<MetaModifiers>()->TimerModeOverride : TimerMode::None;
 
 		switch (modeOverride)
 		{

diff --git a/ChaosMod/Components/LuaScripts.cpp b/ChaosMod/Components/LuaScripts.cpp
@@ -580,7 +580,8 @@ void LuaScripts::SetupGlobalState()
 		auto metaModifiersMetaTable = m_GlobalState.create_table_with(
 		    "EffectDurationModifier", P(EffectDurationModifier), "TimerSpeedModifier", P(TimerSpeedModifier),
 		    "AdditionalEffectsToDispatch", P(AdditionalEffectsToDispatch), "HideChaosUI", P(HideChaosUI),
-		    "DisableChaos", P(DisableChaos), "FlipChaosUI", P(FlipChaosUI));
+		    "DisableChaos", P(DisableChaos), "FlipChaosUI", P(FlipChaosUI), "TimeToDispatchEffect",
+		    P(TimeToDispatchEffect), "DistanceToDispatchEffect", P(DistanceToDispatchEffect));
 #undef P
 		metaModifiersMetaTable[sol::meta_function::new_index] = [] {};
 		metaModifiersMetaTable[sol::meta_function::index] = metaModifiersMetaTable;

diff --git a/ChaosMod/Components/MetaModifiers.h b/ChaosMod/Components/MetaModifiers.h
@@ -16,7 +16,7 @@ class MetaModifiers : public Component
 	bool DisableChaos                        = false;
 	bool FlipChaosUI                         = false;
 	VotingMode VotingModeOverride            = VotingMode::None;
-	TimerMode OverrideTimerMode              = TimerMode::None;
+	TimerMode TimerModeOverride              = TimerMode::None;
 	int TimeToDispatchEffect                 = 0;
 	int DistanceToDispatchEffect             = 0;
 };
diff --git a/ChaosMod/Effects/db/Meta/MetaTimerMode.cpp b/ChaosMod/Effects/db/Meta/MetaTimerMode.cpp
@@ -13,7 +13,7 @@ static void OnStop()
 	if (!ComponentExists<MetaModifiers>())
 		return;
 
-	GetComponent<MetaModifiers>()->OverrideTimerMode = TimerMode::None;
+	GetComponent<MetaModifiers>()->TimerModeOverride = TimerMode::None;
 	GetComponent<MetaModifiers>()->DistanceToDispatchEffect = 0;
 	GetComponent<MetaModifiers>()->TimeToDispatchEffect = 0;
 	if (ComponentExists<EffectDispatchTimer>())
@@ -25,7 +25,7 @@ static void OnTick_Time()
 	if (!ComponentExists<MetaModifiers>())
 		return;
 
-	GetComponent<MetaModifiers>()->OverrideTimerMode = TimerMode::Time;
+	GetComponent<MetaModifiers>()->TimerModeOverride = TimerMode::Time;
 
 	int defaultDistance = ComponentExists<EffectDispatchTimer>()
 	                    ? GetComponent<EffectDispatchTimer>()->GetDefaultEffectSpawnDistance()
@@ -51,7 +51,7 @@ static void OnTick_Distance()
 	if (!ComponentExists<MetaModifiers>())
 		return;
 
-	GetComponent<MetaModifiers>()->OverrideTimerMode = TimerMode::Distance;
+	GetComponent<MetaModifiers>()->TimerModeOverride = TimerMode::Distance;
 	int defaultTime =
 	    ComponentExists<EffectDispatchTimer>() ? GetComponent<EffectDispatchTimer>()->GetDefaultEffectSpawnTime() : 0;
 	GetComponent<MetaModifiers>()->DistanceToDispatchEffect = defaultTime ? defaultTime * 10 : 300;