fix broken rift

Author: TheSillyDoggo

CMakeLists.txt

@@ -28,14 +28,10 @@ file(GLOB SOURCES
 )
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
-add_link_options(/errorlimit:0)
 
-# Windows specific settings
+# enable symbols on windows
 if (WIN32)
-  # Disable annoying warnings
   target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
-
-  # Export all symbols for better debugging
   set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()
 
@@ -50,7 +46,12 @@ include_directories(include src/Client src/Hacks/Speedhack src/Utils src/Notific
 
 # CPMAddPackage("gh:TheSillyDoggo/gd-imgui-cocos#2d33a3d") # should be geode
 
-CPMAddPackage("gh:EclipseMenu/RIFT#v1")
+CPMAddPackage(
+    NAME rift
+    GIT_REPOSITORY https://git.eclipse.menu/EclipseMenu/RIFT
+    GIT_TAG v1
+)
+
 CPMAddPackage("gh:rapidfuzz/rapidfuzz-cpp#main")
 CPMAddPackage("gh:maxnut/GDReplayFormat#72078e5")
 CPMAddPackage("gh:ZXShady/enchantum#116de86")

changelog.md

@@ -1,5 +1,6 @@
 # 2.8.7
 
+- Added **Auto Activate** in range
 - Added info button for mods that have per player options
 - Added movable startpos switcher button
 - Fixed Button Module keybinds repeating

resources/sprites/icons/categories/ranges.png

@@ -46,8 +46,11 @@ bool Module::getRealEnabled()
 
     if (auto pl = PlayLayer::get(); pl && pl->m_started)
     {
+        if (pl->m_player1->m_isDead || (pl->m_player2 && pl->m_player2->m_isDead))
+            return userEnabled;
+
         bool inRange;
-        auto ret = enableRanges.getEnable(pl->getCurrentPercent(), userEnabled, &inRange);
+        bool ret = enableRanges.getEnable(pl->getCurrentPercent(), userEnabled, &inRange);
 
         if (inRange && ret != userEnabled)
             SafeMode::get()->onModuleToggled(this);

src/Client/Module.cpp

@@ -3,10 +3,36 @@
 using namespace geode::prelude;
 using namespace qolmod;
 
+// purpose: merge overlapped ranges
 void Ranges::sort()
 {
-    // TODO: implement
-    // purpose: stop overlapped ranges
+    return;
+    std::unordered_map<double, uint8_t> commandMap = {};
+
+    std::function<bool(double)> canReplace = [&](double v)
+    {
+        if (commandMap.contains(v) && commandMap[v] == 0)
+            return true;
+
+        return !commandMap.contains(v);
+    };
+
+    for (auto& zone : ranges)
+    {
+        if (canReplace(zone.min))
+            commandMap.emplace(zone.min, zone.enable ? 1 : 2);
+        
+        if (canReplace(zone.max))
+            commandMap.emplace(zone.max, 0);
+    }
+
+    std::map<double, uint8_t> sorted(commandMap.begin(), commandMap.end());
+    log::info("BEGIN");
+
+    for (auto& sort : sorted)
+    {
+        log::error("1: {}, 2: {}", sort.first, sort.second);
+    }
 }
 
 bool Ranges::getEnable(float value, bool def, bool* inAnyRange)
@@ -27,13 +53,19 @@ bool Ranges::getEnable(float value, bool def, bool* inAnyRange)
 
 void Ranges::addRange(qolmod::Range range)
 {
-    ranges.push_back(range);
+    if (std::abs<float>(range.min - range.max) <= 0.00005f)
+        return;
+
+    ranges.insert(ranges.begin(), range);
     sort();
 }
 
 void Ranges::addRange(float min, float max, bool enable)
 {
-    ranges.push_back(qolmod::Range({
+    if (std::abs<float>(min - max) <= 0.00005f)
+        return;
+
+    ranges.insert(ranges.begin(), qolmod::Range({
         .min = min,
         .max = max,
         .enable = enable
@@ -46,6 +78,11 @@ void Ranges::clear()
     ranges.clear();
 }
 
+bool Ranges::isEmpty()
+{
+    return ranges.empty();
+}
+
 matjson::Value Ranges::save()
 {
     sort();

src/Client/Ranges.cpp

@@ -8,11 +8,14 @@ namespace qolmod
     {
         std::vector<Range> ranges = {};
 
-        void sort();
         bool getEnable(float value, bool def, bool* inAnyRange = nullptr);
+
         void addRange(float min, float max, bool enable);
         void addRange(qolmod::Range range);
+
+        void sort();
         void clear();
+        bool isEmpty();
 
         matjson::Value save();
         void load(const matjson::Value& value);

src/Client/Ranges.hpp

@@ -5,6 +5,7 @@
 #include <Categories/FavouritesNode.hpp>
 #include <SetupShortcutUI.hpp>
 #include <EditKeyConfigUI.hpp>
+#include <SetupRangeUI.hpp>
 
 using namespace geode::prelude;
 using namespace qolmod;
@@ -61,10 +62,16 @@ bool ModuleInfoAlert::init(Module* module)
     btnKeybind->getNormalImage()->setPosition(btnKeybind->getContentSize() / 2);
 
     auto btnShortcut = CCMenuItemToggler::create(CCSprite::createWithSpriteFrameName("shortcuts.png"_spr), CCSprite::createWithSpriteFrameName("shortcuts.png"_spr), this, menu_selector(ModuleInfoAlert::onChangeShortcut));
-    btnShortcut->setPositionX(m_mainLayer->getContentWidth() - 25 - 25);
+    btnShortcut->setPositionX(m_mainLayer->getContentWidth() - 25 - 25 - 25);
+
+    auto btnRanges = Button::create(CCSprite::createWithSpriteFrameName("ranges.png"_spr), this, menu_selector(ModuleInfoAlert::onChangeRanges));
+    btnRanges->setContentSize(btnRanges->getContentSize() * ccp(1, 2));
+    btnRanges->setPositionX(m_mainLayer->getContentWidth() - 25 - 25);
+    btnRanges->getNormalImage()->setPosition(btnRanges->getContentSize() / 2);
 
     menu->addChild(btn);
     menu->addChild(btnKeybind);
+    menu->addChild(btnRanges);
     menu->addChild(btnShortcut);
     m_mainLayer->addChild(menu, 8008569);
     return true;
@@ -100,4 +107,9 @@ void ModuleInfoAlert::onChangeShortcut(CCObject* sender)
     ui->modID = mod->getID();
     ui->setStartConfig(mod->isShortcutEnabled(), mod->getShortcutConfig());
     ui->show();
+}
+
+void ModuleInfoAlert::onChangeRanges(CCObject* sender)
+{
+    SetupRangeUI::create(mod)->show();
 }

src/GUI/ModuleInfoAlert.cpp

@@ -17,6 +17,7 @@ namespace qolmod
             void onToggleFavourite(CCObject* sender);
             void onChangeKeybind(CCObject* sender);
             void onChangeShortcut(CCObject* sender);
+            void onChangeRanges(CCObject* sender);
 
             bool init(Module* module);
     };

src/GUI/ModuleInfoAlert.hpp

@@ -9,6 +9,7 @@
 #include <EditKeyConfigUI.hpp>
 #include <Button.hpp>
 #include <PulsingCircle.hpp>
+#include <SetupRangeUI.hpp>
 
 using namespace qolmod;
 
@@ -83,17 +84,24 @@ bool OptionsUI::setup()
     favBtn->m_offButton->setOpacity(150);
 
     auto btnKeybind = Button::create(CCSprite::createWithSpriteFrameName("keybinds.png"_spr), this, menu_selector(OptionsUI::onChangeKeybind));
-    btnKeybind->setContentSize(btnKeybind->getContentSize() * 3);
+    btnKeybind->setContentSize(btnKeybind->getContentSize() * ccp(1, 2));
     btnKeybind->getNormalImage()->setPosition(btnKeybind->getContentSize() / 2);
     btnKeybind->setPosition(ccp(m_size.width - 18 * 2, -m_size.height + 18 * 2));
 
+    auto btnRanges = Button::create(CCSprite::createWithSpriteFrameName("ranges.png"_spr), this, menu_selector(OptionsUI::onChangeRanges));
+    btnRanges->setContentSize(btnRanges->getContentSize() * ccp(1, 2));
+    btnRanges->setPositionX(btnKeybind->getPositionX() - 25);
+    btnRanges->setPositionY(btnKeybind->getPositionY());
+    btnRanges->getNormalImage()->setPosition(btnRanges->getContentSize() / 2);
+
     auto btnShortcut = CCMenuItemToggler::create(CCSprite::createWithSpriteFrameName("shortcuts.png"_spr), CCSprite::createWithSpriteFrameName("shortcuts.png"_spr), this, menu_selector(OptionsUI::onChangeShortcut));
     btnShortcut->setUserData(module);
     btnShortcut->setPosition(ccp(2, -m_size.height + 18 * 2));    
 
     menu3->addChild(favBtn);
     menu3->addChild(btnKeybind);
     menu3->addChild(btnShortcut);
+    menu3->addChild(btnRanges);
 
     node = CategoryNode::create();
     node->setAnchorPoint(ccp(0.5f, 0.5f));
@@ -145,15 +153,8 @@ void OptionsUI::onInfo(CCObject* sender)
     ModuleInfoAlert::create(module)->show();
 }
 
-#include <SetupRangeUI.hpp>
-
 void OptionsUI::onSeperateOptionsInfo(CCObject* sender)
 {
-    // DO NOT UPLOAD THIS IS FOR TESTING
-    SetupRangeUI::create(module)->show();
-
-    return;
-
     Mod::get()->setSavedValue<bool>("has-shown-seperate-info", true);
 
     if (pulsingCircle)
@@ -197,6 +198,11 @@ void OptionsUI::onChangeKeybind(CCObject* sender)
     ui->show();
 }
 
+void OptionsUI::onChangeRanges(CCObject* sender)
+{
+    SetupRangeUI::create(module)->show();
+}
+
 OptionsUI::~OptionsUI()
 {
     if (instance == this)

src/GUI/OptionsUI.cpp

@@ -29,6 +29,7 @@ class OptionsUI : public PopupBase
         void onToggleFavourite(CCObject* sender);
         void onChangeShortcut(CCObject* sender);
         void onChangeKeybind(CCObject* sender);
+        void onChangeRanges(CCObject* sender);
 
         CCSize calculateSize();
         virtual bool setup();