start range system

Author: TheSillyDoggo

src/Client/LayoutModule.cpp

@@ -116,4 +116,26 @@ void LayoutModule::nodeUpdate(float dt)
     auto mod = reinterpret_cast<LayoutModule*>(self->getUserData());
 
     self->setPosition(mod->getPosition());
+}
+
+void LayoutModule::addOption(std::string key, std::string displayKey, float defaultV, float min, float max)
+{
+    floatOptions.emplace(key, FloatOption{
+        .display = displayKey,
+        .defaultV = defaultV,
+        .min = min,
+        .max = max,
+        .value = defaultV
+    });
+}
+
+void LayoutModule::setOption(std::string key, float value)
+{
+    floatOptions[key].value = value;
+    save();
+}
+
+float LayoutModule::getOption(std::string key)
+{
+    return floatOptions[key].value;
 }

src/Client/LayoutModule.hpp

@@ -9,13 +9,23 @@ namespace qolmod
 
 class LayoutModule : public ButtonModule
 {
+    friend class qolmod::EditLayoutUI;
     protected:
         std::function<cocos2d::CCNode*()> previewNode = nullptr;
         geode::Anchor anchor = geode::Anchor::Center;
         cocos2d::CCPoint offset = ccp(0, 0);
 
         geode::Anchor defaultAnchor = geode::Anchor::Center;
         cocos2d::CCPoint defaultOffset = ccp(0, 0);
+        struct FloatOption
+        {
+            std::string display = "";
+            float defaultV = 1.0f;
+            float min = 0.0f;
+            float max = 1.0f;
+            float value = 0.0f;
+        };
+        std::unordered_map<std::string, FloatOption> floatOptions = {};
 
         virtual void save();
         virtual void load();
@@ -25,6 +35,8 @@ class LayoutModule : public ButtonModule
         void setPreviewNode(std::function<cocos2d::CCNode*()> preview);
         void setDefaults(geode::Anchor an, cocos2d::CCPoint off);
 
+        void addOption(std::string key, std::string displayKey, float defaultV, float min, float max);
+
         void nodeUpdate(float);
 
     public:
@@ -35,5 +47,8 @@ class LayoutModule : public ButtonModule
         void setPosition(cocos2d::CCPoint point);
         cocos2d::CCPoint getPosition();
 
+        void setOption(std::string key, float value);
+        float getOption(std::string key);
+
         virtual ModuleNode* getNode();
 };

src/Client/Range.cpp

@@ -0,0 +1,26 @@
+#include "Range.hpp"
+
+using namespace geode::prelude;
+using namespace qolmod;
+
+bool Range::inRange(float v)
+{
+    return v >= min && v <= max;
+}
+
+matjson::Value Range::save()
+{
+    matjson::Value value;
+    value["min"] = min;
+    value["max"] = max;
+    value["enable"] = enable;
+
+    return value;
+}
+
+void Range::load(const matjson::Value& value)
+{
+    min = value["min"].asDouble().unwrapOr(min);
+    max = value["max"].asDouble().unwrapOr(max);
+    enable = value["enable"].asBool().unwrapOr(enable);
+}

src/Client/Range.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+namespace qolmod
+{
+    struct Range
+    {
+        double min = 0;
+        double max = 1;
+        bool enable = true;
+
+        bool inRange(float v);
+
+        matjson::Value save();
+        void load(const matjson::Value& value);
+    };
+};

src/Client/Ranges.cpp

@@ -0,0 +1,50 @@
+#include "Ranges.hpp"
+
+using namespace geode::prelude;
+using namespace qolmod;
+
+void Ranges::sort()
+{
+
+}
+
+bool Ranges::getEnable(float value, bool def)
+{
+    for (auto& range : ranges)
+    {
+        if (range.inRange(value))
+            return range.enable;
+    }
+
+    return def;
+}
+
+matjson::Value Ranges::save()
+{
+    sort();
+    matjson::Value value = matjson::Value::array();
+
+    for (auto& range : ranges)
+    {
+        value.push(range.save());
+    }
+
+    return value;
+}
+
+void Ranges::load(const matjson::Value& value)
+{
+    ranges.clear();
+
+    if (!value.isArray())
+        return;
+
+    for (auto& v : value.asArray().unwrap())
+    {
+        Range range;
+        range.load(v);
+        ranges.push_back(range);
+    }
+
+    sort();
+}

src/Client/Ranges.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Range.hpp"
+
+namespace qolmod
+{
+    struct Ranges
+    {
+        std::vector<Range> ranges = {};
+
+        void sort();
+
+        bool getEnable(float value, bool def);
+
+        matjson::Value save();
+        void load(const matjson::Value& value);
+    };
+};

src/GUI/EditLayoutUI.cpp

@@ -5,6 +5,8 @@
 #include <Button.hpp>
 #include <LayoutModule.hpp>
 #include <RealtimeAction.hpp>
+#include <BetterSlider.hpp>
+#include <../IconEffects/IconicPlayerHook.hpp>
 
 using namespace geode::prelude;
 using namespace qolmod;
@@ -111,6 +113,8 @@ bool EditLayoutUI::setup()
     node->addChild(previewOutline, 7);
     node->addChild(grab, 7);
 
+    node->addChild(createOptions(), 2);
+
     m_mainLayer->addChildAtPosition(clip, Anchor::Center);
     m_mainLayer->addChildAtPosition(menu, Anchor::Bottom, ccp(0, -5.0f));
     m_mainLayer->addChildAtPosition(titleBG, Anchor::Top, ccp(0, 15));
@@ -244,6 +248,38 @@ void EditLayoutUI::updateAnchorPoints()
     }
 }
 
+void EditLayoutUI::onSliderChanged(CCObject* sender)
+{
+
+}
+
+CCMenu* EditLayoutUI::createOptions()
+{
+    return CCMenu::create();
+
+    auto menu = CCMenu::create();
+
+    float y = 0;
+    for (auto& option : module->floatOptions)
+    {
+        auto label = AdvLabelBMFont::createWithString(option.second.display, "bigFont.fnt");
+        auto slider = BetterSlider::create(this, menu_selector(EditLayoutUI::onSliderChanged));
+        slider->setRange(option.second.min, option.second.max);
+        slider->setValueRanged(option.second.value);
+        slider->setID(option.first);
+
+        label->setPosition(ccp(0, y));
+        slider->setPosition(ccp(0, y));
+
+        menu->addChild(label);
+        menu->addChild(slider);
+
+        y -= 30;
+    }
+
+    return menu;
+}
+
 CCNode* EditLayoutUI::createBackground(bool acu)
 {
     auto imageNode = CCNode::create();
@@ -277,6 +313,10 @@ CCNode* EditLayoutUI::createBackground(bool acu)
     player->setColor(GameManager::get()->colorForIdx(GameManager::get()->m_playerColor.value()));
     player->setSecondColor(GameManager::get()->colorForIdx(GameManager::get()->m_playerColor2.value()));
 
+    auto hook = IconicPlayerHook::create(player);
+    hook->setGamemode(IconicGamemodeType::Cube, false);
+    this->addChild(hook);
+
     if (GameManager::get()->m_playerGlow)
     {
         player->enableCustomGlowColor(GameManager::get()->colorForIdx(GameManager::get()->m_playerGlowColor.value()));

src/GUI/EditLayoutUI.hpp

@@ -24,13 +24,17 @@ namespace qolmod
             float anchorShowDis = 60;
             bool snapEnabled = true;
 
-            CCNode* createBackground(bool acu = true);
+            cocos2d::CCNode* createBackground(bool acu = true);
 
             void updateOutline();
             void updateAnchorPoints();
             void fixToAnchorPoints();
             void fixToScreenBounds();
 
+            void onSliderChanged(CCObject* sender);
+
+            cocos2d::CCMenu* createOptions();
+
         public:
             static EditLayoutUI* create(LayoutModule* module);