beta

Author: OmgRod

changelog.md

@@ -1,4 +1,4 @@
-# v2.0.2
+# v2.1.0-beta
 
 - Added Layers: `teamtcm.geometry-dash-odyssey/OdysseyComicLayer`, `teamtcm.geometry-dash-odyssey/OdysseySelectLayer`, `gd/UIOptionsLayer`, `gd/UIPOptionsLayer`, `GJShopLayer` (currently all of them are together)
 

mod.json

@@ -5,7 +5,7 @@
         "win": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v2.0.2",
+    "version": "v2.1.0-beta",
     "id": "omgrod.geodify",
     "name": "Geodify",
     "developers": ["OmgRod", "Viper"],
@@ -435,6 +435,12 @@
             "type": "bool",
             "default": true
         },
+        "teamtcm.geometry-dash-odyssey/GJShopLayer-Carp": {
+            "name": "Carp Shop",
+            "description": "GJShopLayer-Carp",
+            "type": "bool",
+            "default": true
+        },
 
         "other/enable-menu-icons": {
             "name": "Enable Menu Ground + Icons",

previews/teamtcm.geometry-dash-odyssey-GJShopLayer-CarpPreview.png

@@ -32,27 +32,6 @@ class $nodeModify(my##layer, layer) {\
     }\
 }
 
-
-#define SET_SWELVY_SPRITE_NOBG(layer, setting) \
-class $nodeModify(my##layer, layer) { \
-    void modify() { \
-        int lowestZ = INT_MAX;\
-        CCNode* node = nullptr;\
-        CCObject* obj = nullptr; \
-        CCARRAY_FOREACH(getChildren(), obj) { \
-            if (node) { \
-                lowestZ = std::min(lowestZ, node->getZOrder()); \
-            } \
-        } \
-        \
-        if (Mod::get()->getSettingValue<bool>(setting)) { \
-            SwelvyBG* swelvyBG = SwelvyBG::create(); \
-            swelvyBG->setZOrder(lowestZ - 1);\
-            addChild(swelvyBG); \
-        } \
-    } \
-}
-
 class SwelvyBG : public CCNode {
 protected:
     bool init(float widthmult, float heightmul, float minspeed, float maxspeed);

src/SwelvyBG.hpp

@@ -1,75 +1,51 @@
 #include <Geode/Geode.hpp>
 #include "../../SwelvyBG.hpp"
 #include <Geode/modify/GJShopLayer.hpp>
+#include <alphalaneous.alphas_geode_utils/include/NodeModding.h>
 
 using namespace geode::prelude;
 
 class $modify(MyGJShopLayer, GJShopLayer) {
-	bool init(ShopType p0) {
-		if (!GJShopLayer::init(p0)) {
-			return false;
-		}
-        if (static_cast<int>(p0) == 0) {
-            if (Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Normal")){
-                if (auto bg = this->getChildByID("background")) {
-                    bg->setVisible(false);
-                }
-
-                auto swelvyBG = SwelvyBG::create();
-                swelvyBG->setZOrder(-999);
-                
-
-                this->addChild(swelvyBG);
-            }
-        } else if (static_cast<int>(p0) == 1) {
-            if (Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Secret")){
-                if (auto bg = this->getChildByID("background")) {
-                    bg->setVisible(false);
-                }
-
-                auto swelvyBG = SwelvyBG::create();
-                swelvyBG->setZOrder(-999);
-                
-
-                this->addChild(swelvyBG);
-            }
-        } else if (static_cast<int>(p0) == 2) {
-            if (Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Community")){
-                if (auto bg = this->getChildByID("background")) {
-                    bg->setVisible(false);
-                }
-
-                auto swelvyBG = SwelvyBG::create();
-                swelvyBG->setZOrder(-999);
-                
-
-                this->addChild(swelvyBG);
-            }
-        } else if (static_cast<int>(p0) == 3) {
-            if (Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Mechanic")){
-                if (auto bg = this->getChildByID("background")) {
-                    bg->setVisible(false);
-                }
-
-                auto swelvyBG = SwelvyBG::create();
-                swelvyBG->setZOrder(-999);
-                
+    bool init(ShopType p0) {
+        if (!GJShopLayer::init(p0)) {
+            return false;
+        }
 
-                this->addChild(swelvyBG);
-            }
-        } else if (static_cast<int>(p0) == 4) {
-            if (Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Diamond")){
-                if (auto bg = this->getChildByID("background")) {
-                    bg->setVisible(false);
-                }
+        bool shouldReplaceBG = false;
+        switch (p0) {
+            case ShopType::Normal:
+                shouldReplaceBG = Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Normal");
+                break;
+            case ShopType::Secret:
+                shouldReplaceBG = Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Secret");
+                break;
+            case ShopType::Community:
+                shouldReplaceBG = Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Community");
+                break;
+            case ShopType::Mechanic:
+                shouldReplaceBG = Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Mechanic");
+                break;
+            case ShopType::Diamond:
+                shouldReplaceBG = Mod::get()->getSettingValue<bool>("gd/GJShopLayer-Diamond");
+                break;
+            default:
+                break;
+        }
 
-                auto swelvyBG = SwelvyBG::create();
-                swelvyBG->setZOrder(-999);
-                
+        if (static_cast<int>(p0) == 6) {
+            shouldReplaceBG = Mod::get()->getSettingValue<bool>("teamtcm.geometry-dash-odyssey/GJShopLayer-Carp");
+        }
 
-                this->addChild(swelvyBG);
+        if (shouldReplaceBG) {
+            if (auto bg = this->getChildByID("background")) {
+                bg->setVisible(false);
             }
+            this->getChildByType<CCSprite>(0)->setVisible(false);
+            auto swelvyBG = SwelvyBG::create();
+            swelvyBG->setZOrder(-999);
+            this->addChild(swelvyBG);
         }
-		return true;
-	}
+        
+        return true;
+    }
 };