stuff

Author: TheSillyDoggo

changelog.md

@@ -1,3 +1,17 @@
+# 2.8.5
+
+- Added Show Trajectory hitbox trail
+- Added menu snow, december snow is now togglable so you can have snowy menus all of the year
+- Added customizable shortcut animations
+- Added Keybind Hold mode
+- Removed unused language font to save on storage
+- Fixed mouse scrolling not working on mobile
+- Fixed rare crash with show trajectory
+- Fixed Run Info From in Percentage option not working
+- Fixed Speedhack and Safe Mode not appearing as red in the mod menu
+- Fixed Shortcut configs resetting when pressing escape instead of the OK button
+- Fixed Shortcuts not working during scene transitions
+
 # 2.8.4
 
 - Added Gravity Arrow

mod-2.2074.json

@@ -1,6 +1,6 @@
 {
 	"geode": "4.10.0",
-	"version": "v2.8.4-beta.1",
+	"version": "v2.8.5-beta.1",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
@@ -20,8 +20,6 @@
         "files": [
             "resources/fonts/kosugimaru/*.fnt",
 			"resources/fonts/kosugimaru/*.png",
-			"resources/fonts/chirongo/*.fnt",
-			"resources/fonts/chirongo/*.png",
 			"resources/fonts/lexend/*.fnt",
 			"resources/fonts/lexend/*.png",
 			"resources/fonts/notosans/*.fnt",

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "5.5.3",
-	"version": "v2.8.4",
+	"version": "v2.8.5",
 	"gd": {
 		"win": "2.2081",
 		"android": "2.2081",
@@ -20,8 +20,6 @@
         "files": [
             "resources/fonts/kosugimaru/*.fnt",
 			"resources/fonts/kosugimaru/*.png",
-			"resources/fonts/chirongo/*.fnt",
-			"resources/fonts/chirongo/*.png",
 			"resources/fonts/lexend/*.fnt",
 			"resources/fonts/lexend/*.png",
 			"resources/fonts/notosans/*.fnt",

resources/translations

@@ -41,4 +41,14 @@ std::map<int, std::string> EnumModule::getDisplayNames()
 ModuleNode* EnumModule::getNode()
 {
     return EnumModuleNode::create(this);
+}
+
+void EnumModule::setNext()
+{
+    setValue(std::next(listedValues.find(value))->first);
+}
+
+void EnumModule::setPrev()
+{
+    setValue(std::prev(listedValues.find(value))->first);
 }

src/Client/EnumModule.cpp

@@ -38,5 +38,8 @@ class EnumModule : public Module
 
         std::map<int, std::string> getDisplayNames();
 
+        void setNext();
+        void setPrev();
+
         virtual ModuleNode* getNode();
 };

src/Client/EnumModule.hpp

@@ -62,14 +62,14 @@ void EnumModuleNode::onLeft(CCObject* sender)
 {
     auto mod = static_cast<EnumModule*>(module);
 
-    mod->setValue(mod->getValue() - 1);
+    mod->setPrev();
     updateNode();
 }
 
 void EnumModuleNode::onRight(CCObject* sender)
 {
     auto mod = static_cast<EnumModule*>(module);
 
-    mod->setValue(mod->getValue() + 1);
+    mod->setNext();
     updateNode();
 }

src/Client/EnumModuleNode.cpp

@@ -295,7 +295,36 @@ void Module::removeKeybind()
 
 void Module::onKeybindActivated(KeyState state)
 {
-    this->setUserEnabled(!getUserEnabled());
+    bool en = getUserEnabled();
+
+    switch (keyConfig.type)
+    {
+        case KeybindType::Toggle:
+            en = !getUserEnabled();
+
+            if (!state.isDown && !state.isRepeat)
+                return;
+            break;
+
+        case KeybindType::Hold:
+            en = state.isDown;
+
+            if (state.isRepeat)
+                return;
+            break;
+
+        case KeybindType::HoldInverted:
+            en = !state.isDown;
+
+            if (state.isRepeat)
+                return;
+            break;
+    }
+
+    if (getUserEnabled() == en)
+        return;
+
+    this->setUserEnabled(en);
 
     onToggle();
     ModuleNode::updateAllNodes(nullptr);
@@ -346,6 +375,7 @@ void Module::saveShortcutConfig()
     conf["colour_opacity"] = shortcutConf.colour.opacity;
     conf["colour_chromaspeed"] = shortcutConf.colour.chromaSpeed;
     conf["colour_type"] = (int)shortcutConf.colour.type;
+    conf["animation"] = (int)shortcutConf.animation;
 
     Mod::get()->setSavedValue<matjson::Value>(fmt::format("{}_shortcutconf", getID()), conf);
 }
@@ -375,6 +405,7 @@ void Module::loadShortcutConfig()
     conf.colour.opacity = json["colour_opacity"].asDouble().unwrapOr(1);
     conf.colour.chromaSpeed = json["colour_chromaspeed"].asDouble().unwrapOr(1);
     conf.colour.type = (ColourConfigType)json["colour_type"].asInt().unwrapOr(0);
+    conf.animation = (FloatingButtonAnimationType)json["animation"].asInt().unwrapOr(0);
 
     setShortcutConfig(Mod::get()->getSavedValue<bool>(fmt::format("{}_shortcutenabled", getID()), false), conf);
 }
@@ -399,6 +430,7 @@ void Module::setShortcutConfig(bool enabled, ModuleShortcutConfig conf)
         btn->setMovable(shortcutConf.isMovable);
         btn->setBaseScale(shortcutConf.scale);
         btn->setBaseOpacity(shortcutConf.opacity);
+        btn->setAnimation(shortcutConf.animation);
 
         shortcutNode = btn;
     }

src/Client/Module.cpp

@@ -69,7 +69,7 @@ void ModuleNode::setup()
 
 void ModuleNode::onUpdateLabelColour(float dt)
 {
-    auto col = SeperateColourCheatNames::get()->getRealEnabled() && (module->getSafeModeTrigger() != SafeModeTrigger::None) ? CheatNameColour::get()->getColour() : ccWHITE;
+    auto col = SeperateColourCheatNames::get()->getRealEnabled() && shouldAppearCheat() ? CheatNameColour::get()->getColour() : ccWHITE;
 
     if (isDisabled())
     {
@@ -246,5 +246,21 @@ bool ModuleNode::altClickBegan(int button, cocos2d::CCPoint point)
         return true;
     }
 
+    return false;
+}
+
+bool ModuleNode::shouldAppearCheat()
+{
+    if (module->getID() == "safe-mode")
+        return true;
+
+    if (module->getID() == "speedhack/enabled")
+        return true;
+
+    return (module->getSafeModeTrigger() != SafeModeTrigger::None);
+}
+
+bool ModuleNode::shouldAppearDisabled()
+{
     return false;
 }

src/Client/ModuleNode.cpp

@@ -20,6 +20,7 @@ class ModuleNode : public qolmod::CCMenuExt, public qolmod::AltMouseDelegate
         bool disabled = false;
 
         virtual bool altClickBegan(int button, cocos2d::CCPoint point);
+        virtual void draw();
 
         ~ModuleNode();
 
@@ -37,7 +38,9 @@ class ModuleNode : public qolmod::CCMenuExt, public qolmod::AltMouseDelegate
         void onUpdateLabelColour(float dt);
         bool isDisabled();
 
+        virtual bool shouldAppearCheat();
+        virtual bool shouldAppearDisabled();
+
         virtual void updateNode();
-        virtual void draw();
         bool init(Module* module);
 };