From 8a1f52ade03041b72f3555fa4fd992703b9daa6b Mon Sep 17 00:00:00 2001
From: OnlyRealNubs <91900600+OnlyRealNubs@users.noreply.github.com>
Date: Fri, 3 Jun 2022 10:54:19 -0400
Subject: [PATCH 1/2] Added "Vignette" effect

---
 ChaosMod/ChaosMod.vcxproj                     |  1 +
 ChaosMod/Effects/db/Screen/ScreenVignette.cpp | 25 +++++++++++++++++++
 ConfigApp/Effects.cs                          |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 ChaosMod/Effects/db/Screen/ScreenVignette.cpp

diff --git a/ChaosMod/ChaosMod.vcxproj b/ChaosMod/ChaosMod.vcxproj
index c6cc7cdf9..2eca8f9c8 100644
--- a/ChaosMod/ChaosMod.vcxproj
+++ b/ChaosMod/ChaosMod.vcxproj
@@ -172,6 +172,7 @@
     <ClCompile Include="Effects\db\Screen\ScreenSickCam.cpp" />
     <ClCompile Include="Effects\db\Screen\ScreenSpinCam.cpp" />
     <ClCompile Include="Effects\db\Screen\ScreenTimecycModifierController.cpp" />
+    <ClCompile Include="Effects\db\Screen\ScreenVignette.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderArc.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderColorfulWorld.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderDimWarp.cpp" />
diff --git a/ChaosMod/Effects/db/Screen/ScreenVignette.cpp b/ChaosMod/Effects/db/Screen/ScreenVignette.cpp
new file mode 100644
index 000000000..0aa2a64f0
--- /dev/null
+++ b/ChaosMod/Effects/db/Screen/ScreenVignette.cpp
@@ -0,0 +1,25 @@
+/*
+	Effect By OnlyRealNubs
+*/
+
+#include <stdafx.h>
+
+static void OnTick()
+{
+	SET_TIMECYCLE_MODIFIER("BombCam01");
+	SET_TIMECYCLE_MODIFIER_STRENGTH(1.5f);
+}
+
+static void OnStop()
+{
+	CLEAR_TIMECYCLE_MODIFIER();
+}
+
+// clang-format off
+REGISTER_EFFECT(nullptr, OnStop, OnTick, EffectInfo
+	{
+		.Name = "Vignette",
+		.Id = "screen_vignette",
+		.IsTimed = true,
+	}
+);
\ No newline at end of file
diff --git a/ConfigApp/Effects.cs b/ConfigApp/Effects.cs
index e045e76e7..a933e9107 100644
--- a/ConfigApp/Effects.cs
+++ b/ConfigApp/Effects.cs
@@ -372,6 +372,7 @@ public enum EffectTimedType
             { "screen_colorfulworld", new EffectInfo("Colorful World", EffectCategory.Screen, true) },
             { "screen_arc", new EffectInfo("Arced Screen", EffectCategory.Screen, true, true) },
             { "world_blackhole", new EffectInfo("Black Hole", EffectCategory.Misc, true, true) },
+            { "screen_vignette", new EffectInfo("Vignette", EffectCategory.Screen, true ) },
         };
     }
 }

From e9abaa50f0a23ed2ee207031586fa8544d38f64d Mon Sep 17 00:00:00 2001
From: OnlyRealNubs <91900600+OnlyRealNubs@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:18:52 -0400
Subject: [PATCH 2/2] Moved to TimecycleControll

---
 ChaosMod/ChaosMod.vcxproj                     |  1 -
 .../ScreenTimecycModifierController.cpp       | 18 ++++++++++++-
 ChaosMod/Effects/db/Screen/ScreenVignette.cpp | 25 -------------------
 3 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 ChaosMod/Effects/db/Screen/ScreenVignette.cpp

diff --git a/ChaosMod/ChaosMod.vcxproj b/ChaosMod/ChaosMod.vcxproj
index 2eca8f9c8..c6cc7cdf9 100644
--- a/ChaosMod/ChaosMod.vcxproj
+++ b/ChaosMod/ChaosMod.vcxproj
@@ -172,7 +172,6 @@
     <ClCompile Include="Effects\db\Screen\ScreenSickCam.cpp" />
     <ClCompile Include="Effects\db\Screen\ScreenSpinCam.cpp" />
     <ClCompile Include="Effects\db\Screen\ScreenTimecycModifierController.cpp" />
-    <ClCompile Include="Effects\db\Screen\ScreenVignette.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderArc.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderColorfulWorld.cpp" />
     <ClCompile Include="Effects\db\Screen\Shaders\ScreenShaderDimWarp.cpp" />
diff --git a/ChaosMod/Effects/db/Screen/ScreenTimecycModifierController.cpp b/ChaosMod/Effects/db/Screen/ScreenTimecycModifierController.cpp
index 422071947..a043d996f 100644
--- a/ChaosMod/Effects/db/Screen/ScreenTimecycModifierController.cpp
+++ b/ChaosMod/Effects/db/Screen/ScreenTimecycModifierController.cpp
@@ -1,10 +1,11 @@
 #include <stdafx.h>
 
-static void StartTransitionTimecycle(std::string modifier)
+static void StartTransitionTimecycle(std::string modifier, float strength = 1.f)
 {
 	if (GET_TIMECYCLE_TRANSITION_MODIFIER_INDEX() == -1 && GET_TIMECYCLE_MODIFIER_INDEX() == -1)
 	{
 		SET_TRANSITION_TIMECYCLE_MODIFIER(modifier.c_str(), 5.f);
+		SET_TIMECYCLE_MODIFIER_STRENGTH(strength);
 	}
 }
 
@@ -313,4 +314,19 @@ REGISTER_EFFECT(nullptr, OnStop, OnTickNeedGlasses, EffectInfo
 		.IsShortDuration = true,
 		.EffectCategory = EEffectCategory::Timecycle
 	}
+);
+// clang-format on
+
+static void OnTickVig()
+{
+	StartTransitionTimecycle("BombCam01", 1.5f);
+}
+
+// clang-format off
+REGISTER_EFFECT(nullptr, OnStop, OnTickVig, EffectInfo
+	{
+		.Name = "Vignette",
+		.Id = "screen_vignette",
+		.IsTimed = true,
+	}
 );
\ No newline at end of file
diff --git a/ChaosMod/Effects/db/Screen/ScreenVignette.cpp b/ChaosMod/Effects/db/Screen/ScreenVignette.cpp
deleted file mode 100644
index 0aa2a64f0..000000000
--- a/ChaosMod/Effects/db/Screen/ScreenVignette.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-	Effect By OnlyRealNubs
-*/
-
-#include <stdafx.h>
-
-static void OnTick()
-{
-	SET_TIMECYCLE_MODIFIER("BombCam01");
-	SET_TIMECYCLE_MODIFIER_STRENGTH(1.5f);
-}
-
-static void OnStop()
-{
-	CLEAR_TIMECYCLE_MODIFIER();
-}
-
-// clang-format off
-REGISTER_EFFECT(nullptr, OnStop, OnTick, EffectInfo
-	{
-		.Name = "Vignette",
-		.Id = "screen_vignette",
-		.IsTimed = true,
-	}
-);
\ No newline at end of file