26

data/mods.list.json

@@ -1,5 +1,5 @@
 {
-  "version": "v2.5.0-list1",
+  "version": "v2.6.0-list1",
   "list": [
 
     "https://github.com/MathieuAR-GDPSFH/Gauntlets-Position-Fix/releases/latest/download/jecket.gauntlets_position_fix.geode",

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "3.4.0",
+	"geode": "3.5.0",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",
@@ -8,7 +8,7 @@
 	},
 	"id": "user95401.gemetry_trash",
 	"name": "Gemetry Trash",
-	"version": "v2.5.0",
+	"version": "v2.6.0",
 	"developer": "user95401",
 	"description": "",
 	"early-load": true,

src/_main.hpp

@@ -126,5 +126,4 @@ inline auto raw_content_repo_lnk = std::string("https://raw.githubusercontent.co
 #include "random_shit/menulayerruinify.hpp"
 #include "random_shit/menuitems.hpp"
 #include "random_shit/loadinglayer.hpp"
-#include "random_shit/secondfloor.hpp"
-#include "random_shit/gradientBackground.hpp"
+#include "random_shit/secondfloor.hpp"

src/random_shit/loadinglayer.hpp

@@ -17,11 +17,7 @@ class $modify(LoadingLayerExt, LoadingLayer) {
             if (new_bg) bg->setDisplayFrame(new_bg->displayFrame());
         }
 
-        int bgMusicChannel = 0;
-        FMODAudioEngine::get()->m_backgroundMusicChannel->getIndex(&bgMusicChannel);
-        FMODAudioEngine::get()->playMusic(
-            "loading_theme.mp3", 1, 0, bgMusicChannel
-        );
+        GameManager::get()->fadeInMusic("loading_theme.mp3");
 
         return rtn;
     }

src/random_shit/menulayerruinify.hpp

@@ -115,6 +115,29 @@ class $modify(MenuLayerExt, MenuLayer) {
         if (auto node = this->getChildByIDRecursive("more-games-button"))
             node->setVisible(0);
 
+        if (auto title = this->getChildByIDRecursive("main-title")) {
+
+            auto pos = title->getPosition();
+            auto parent = title->getParent();
+
+            title->removeFromParentAndCleanup(0);
+
+            auto menu = CCMenu::createWithItem(CCMenuItemExt::createSpriteExtra(
+                title, [](auto) {
+                    CCApplication::get()->openURL(fmt::format("http://{}", server).c_str());
+                }
+            ));
+
+            auto btn = getChild<CCMenuItemSpriteExtra>(menu, 0); 
+            btn->setPosition(CCPointZero);
+            btn->m_colorEnabled = 1;
+            btn->m_animationEnabled = 0;
+
+            menu->setPosition(pos);
+            parent->addChild(menu);
+
+        }
+
         //centerNode
         CCNode* centerNode = CCNode::create();
         centerNode->setID("centerNode");

src/resources.hpp

@@ -58,10 +58,10 @@ class $modify(CCFileUtilsExt, CCFileUtils) {
     $override virtual unsigned char* getFileData(const char* pszFileName, const char* pszMode, unsigned long* pSize) {
         //log::debug("{}.pszFileName = {}", __FUNCTION__, pszFileName);
         if (string::contains(pszFileName, "ui/")) {
-            auto myfp = Mod::get()->getResourcesDir() / string::replace(pszFileName, "ui/", "ui.");
+            auto myfp = Mod::get()->getID() + "/" + string::replace(pszFileName, "ui/", "ui.");
             //log::debug("{}.myfp = {}", __FUNCTION__, myfp);
-            if (cocos::fileExistsInSearchPaths(myfp.string().c_str())) {
-                pszFileName = myfp.string().c_str();
+            if (cocos::fileExistsInSearchPaths(myfp.c_str())) {
+                pszFileName = myfp.c_str();
             }
         }
         //log::debug("{}.path = {}", __FUNCTION__, path);
@@ -121,9 +121,9 @@ class $modify(GJGarageLayerNoRandSelector, GJGarageLayer) {
         if (!GJGarageLayer::init()) return 0;
 
         if (auto shards_menu = typeinfo_cast<CCMenu*>(this->getChildByIDRecursive("shards-menu"))) {
-            auto openupbtnimagelabel = CCLabelBMFont::create("Rand\nSel.", "goldFont.fnt");
-            openupbtnimagelabel->setAlignment(kCCTextAlignmentCenter);
-            auto openupbtnimage = geode::AccountButtonSprite::create(openupbtnimagelabel, AccountBaseColor::Gray);
+            auto openupbtnimage = CCLabelBMFont::create("Rand\nSel.", "goldFont.fnt");
+            openupbtnimage->setAlignment(kCCTextAlignmentCenter);
+            openupbtnimage->setScale(0.5f);
             auto openupbtn = CCMenuItemExt::createSpriteExtra(openupbtnimage,
                 [](auto) {
                     auto popup = FLAlertLayer::create(
@@ -258,7 +258,6 @@ class $modify(GJGarageLayerNoRandSelector, GJGarageLayer) {
 
                 }
             );
-            openupbtn->getNormalImage()->setScale(0.75f);
             shards_menu->addChild(openupbtn);
             shards_menu->updateLayout();
         }

src/special_sprites.hpp

@@ -17,9 +17,10 @@ class $modify(SpecialSprites, CCSprite) {
             auto colorID = rand() % 23;
             auto color = reinterpret_cast<LevelSelectLayer*>(sprite)->colorForPage(colorID);
             sprite->runAction(CCTintTo::create(3.0f, color.r, color.g, color.b));
+            sprite->setTag(colorID);
         }
     }
-    void tryCetupGradientColorSch(float) {
+    void trySetupGradientColorSch(float) {
         if (auto base_layer = typeinfo_cast<CCSprite*>(this)) {
             if (ccc3BEqual(base_layer->getColor(), {0, 102, 255})) {
                 //color
@@ -31,6 +32,7 @@ class $modify(SpecialSprites, CCSprite) {
                 color_layer->setAnchorPoint(CCPointZero);
                 color_layer->setBlendFunc({ GL_ONE, GL_ONE });
                 color_layer->setColor(color);
+                color_layer->setOpacity(255);
                 color_layer->schedule(schedule_selector(SpecialSprites::gradientColorSch), 3.0f);
                 base_layer->addChild(color_layer, 0, colorID);
             };
@@ -39,7 +41,7 @@ class $modify(SpecialSprites, CCSprite) {
     $override static CCSprite* create(const char* pszFileName) {
         if (string::contains(pszFileName, "GJ_gradientBG")) {
             auto base_layer = CCSprite::create(pszFileName);
-            base_layer->scheduleOnce(schedule_selector(SpecialSprites::tryCetupGradientColorSch), 0.f);
+            base_layer->scheduleOnce(schedule_selector(SpecialSprites::trySetupGradientColorSch), 0.f);
             return base_layer;
         }
         return CCSprite::create(pszFileName);