gg

TheSillyDoggo · Aug 16, 2024 · 4310ba1 · 4310ba1
1 parent a85ae76
commit 4310ba1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "3.4.0",
-	"version": "v1.5.8",
+	"version": "v1.5.9",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",

diff --git a/src/Client/ClientSetup.h b/src/Client/ClientSetup.h
@@ -221,6 +221,9 @@ class ClientUtils
         Client::GetModule("tps-bypass")->options.push_back(tps);
 
         Client::GetModule("custom-trans")->options.push_back(new TransCustomizerModule());
+        //Client::GetModule("custom-trans")->options.push_back(nullptr);
+        //Client::GetModule("custom-trans")->options.push_back(new InputModule("Time Mod (*)", "transition-time-modifier", "1.0"));
+        //Client::GetModule("custom-trans")->options.push_back(new ColourModule("Fade Colour:", "transition-fade-colour", ccc3(0, 0, 0)));
 
         auto pitch = new InputModule("Pitch:", "pitch-shifter-value", "1.0");
         pitch->maxSize = 6;

diff --git a/src/Hacks/TransitionTimeCustomiser.cpp b/src/Hacks/TransitionTimeCustomiser.cpp
@@ -11,7 +11,7 @@ using namespace geode::prelude;
 
 //{"Fade", "Cross Fade", "Fade Bottom Left", "Fade Top Right", "Fade Up", "Fade Down", "Flip Angular", "Flip X", "Flip Y", "Zoom Flip Angular" "Zoom Flip X", "Zoom Flip Y", "Jump Zoom", "Move In Top", "Move In Bottom", "Move In Left", "Move In Right", "Rotate Zoom", "Shrink Grow", "Slide In Top", "Slide In Bottom", "Slide In Left", "Slide In Right", "Split Rows", "Split Columns", "Tiles"}
 
-CCScene* getSceneForSel(int i, float f, CCScene* s)
+CCScene* getSceneForSel(int i, float f, CCScene* s, const ccColor3B& color)
 {
     AppDelegate::get()->willSwitchToScene(s);
 
@@ -74,14 +74,14 @@ CCScene* getSceneForSel(int i, float f, CCScene* s)
 
 class $modify (cocos2d::CCTransitionFade)
 {
-    static CCTransitionFade* create(float duration,CCScene* scene)
+    static CCTransitionFade* create(float duration, CCScene* scene, const ccColor3B& color)
     {
         float mod = 1;
 
         if (Client::GetModuleEnabled("no-trans"))
         {
             mod = 0;
-        }
+        }  
 
         if (SpeedhackTop::instance && SpeedhackTransFix::instance->enabled)
         {
@@ -95,17 +95,17 @@ class $modify (cocos2d::CCTransitionFade)
             }
         }
 
-        return as<CCTransitionFade*>(getSceneForSel(Client::GetModuleEnabled("custom-trans") ? Mod::get()->getSavedValue<int>("transition", 0) : 0, duration * mod, scene));// /*base_cast<CCTransitionFade*>(CCTransitionFlipY::create(duration * mod, scene));  */CCTransitionFade::create(duration * mod, scene);
+        return as<CCTransitionFade*>(getSceneForSel(Client::GetModuleEnabled("custom-trans") ? Mod::get()->getSavedValue<int>("transition", 0) : 0, duration * mod, scene, color));// /*base_cast<CCTransitionFade*>(CCTransitionFlipY::create(duration * mod, scene));  */CCTransitionFade::create(duration * mod, scene);
     }
 };
 
 #else
 
 class $modify (cocos2d::CCTransitionFade)
 {
-    static CCTransitionFade* create(float duration,CCScene* scene)
+    static CCTransitionFade* create(float duration,CCScene* scene, const ccColor3B& color)
     {
-        return CCTransitionFade::create((Client::GetModuleEnabled("no-trans") ? 0 : duration) * (SpeedhackTransFix::instance->enabled ? (SpeedhackEnabled::instance->enabled ? (1 / SpeedhackTop::instance->getFloatValue()) : 1) : 1), scene);
+        return CCTransitionFade::create((Client::GetModuleEnabled("no-trans") ? 0 : duration) * (SpeedhackTransFix::instance->enabled ? (SpeedhackEnabled::instance->enabled ? (1 / SpeedhackTop::instance->getFloatValue()) : 1) : 1), scene, color);
     }
 };