yippee

Author: BlueWitherer

about.md

@@ -74,7 +74,7 @@ class $modify(MyPlayLayer, PlayLayer) {
 };
 ```
 
-> ![icon](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*If you plan on publishing a mod that acts as an add-on to Horrible Ideas, all we ask is to please be sure to follow the safe code practices as instructed in the [documentation](https://github.com/DumbCaveSpider/HorribleIdeas/tree/main/include) to the best of your ability!*</c>
+> ![ℹ️](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*If you plan on publishing a mod that acts as an add-on to Horrible Ideas, all we ask is to please be sure to follow the safe code practices as instructed in the [documentation](https://github.com/DumbCaveSpider/HorribleIdeas/tree/main/include) to the best of your ability!*</c>
 
 ---
 

src/Utils.hpp

@@ -47,7 +47,7 @@ namespace horrible {
 
     namespace str = geode::utils::string; // Shortcut for geode::utils::string
 
-    // Default horrible categories
+    // Default option categories
     namespace category {
         inline constexpr const char* playerlife = "Player Life";
         inline constexpr const char* jumpscares = "Jumpscares";

src/classes/ui/src/MathQuiz.cpp

@@ -279,7 +279,7 @@ void MathQuiz::onAnswerClicked(CCObject* sender) {
         feedbackLabel->setScale(0.125f);
         feedbackLabel->setAnchorPoint({ 0.5, 0.5 });
         feedbackLabel->setAlignment(kCCTextAlignmentCenter);
-        feedbackLabel->setPosition({ winSize.width / 2.f, winSize.height / 2.f });
+        feedbackLabel->setPosition(winSize / 2.f);
         feedbackLabel->setColor(correct ? colors::green : colors::red);
 
         addChild(feedbackLabel, 9);
@@ -366,7 +366,7 @@ void MathQuiz::update(float dt) {
         feedbackLabel->setID("feedback-label");
         feedbackLabel->setAnchorPoint({ 0.5, 0.5 });
         feedbackLabel->setAlignment(kCCTextAlignmentCenter);
-        feedbackLabel->setPosition({ winSize.width / 2.f, winSize.height / 2.f });
+        feedbackLabel->setPosition(winSize / 2.f);
         feedbackLabel->setScale(0.1f);
         feedbackLabel->setColor(colors::red);
 
@@ -417,7 +417,7 @@ bool Richard::init() {
     addChild(m_impl->m_sprite);
 
     setContentSize(m_impl->m_sprite->getScaledContentSize());
-    m_impl->m_sprite->setPosition({ getScaledContentWidth() / 2.f, getScaledContentHeight() / 2.f });
+    m_impl->m_sprite->setPosition(getScaledContentSize() / 2.f);
 
     return true;
 };

src/classes/ui/src/SpamChallenge.cpp

@@ -121,7 +121,7 @@ void SpamChallenge::setSuccess(bool v) {
     auto symbol = CCSprite::createWithSpriteFrameName(v ? "GJ_completesIcon_001.png" : "GJ_deleteIcon_001.png");
     symbol->setID("success-icon");
     symbol->setScale(0.f);
-    symbol->setPosition({ getScaledContentWidth() / 2.f, getScaledContentHeight() / 2.f });
+    symbol->setPosition(getScaledContentSize() / 2.f);
 
     addChild(symbol, 9);
     symbol->runAction(CCSequence::createWithTwoActions(

src/hooks/Mock.cpp

@@ -63,7 +63,7 @@ class $modify(MockMenuLayer, MenuLayer) {
 
                                 auto percLabel = CCLabelBMFont::create(percLabelText.c_str(), "bigFont.fnt");
                                 percLabel->setID("percentage");
-                                percLabel->setPosition({ ss->getScaledContentWidth() / 2.f, ss->getScaledContentHeight() / 2.f });
+                                percLabel->setPosition(ss->getScaledContentSize() / 2.f);
                                 percLabel->setAlignment(CCTextAlignment::kCCTextAlignmentLeft);
                                 percLabel->ignoreAnchorPointForPosition(false);
                                 percLabel->setAnchorPoint({ 0, 0 });

src/hooks/PlayLayer/BlackScreen.cpp

@@ -37,7 +37,7 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
 
             auto blackScreen = CCScale9Sprite::create("square02_001.png");
             blackScreen->setContentSize({ winSize.width + 10.f, winSize.height + 10.f });
-            blackScreen->setPosition({ winSize.width / 2.f, winSize.height / 2.f });
+            blackScreen->setPosition(winSize / 2.f);
             blackScreen->setID("black_screen"_spr);
 
             m_uiLayer->addChild(blackScreen, 99);

src/main.cpp

@@ -299,6 +299,8 @@ static std::vector<Option> defOpts = {
         log::info("Done registering {} default options!", defOpts.size());
 
         defOpts.clear();
+        defOpts.shrink_to_fit();
+
         log::debug("Cleaned up default option array");
     } else {
         log::error("Failed to get OptionManager");

src/menu/CategoryItem.hpp

@@ -11,7 +11,7 @@ class CategoryEvent : public Event {
     bool m_enabled;
 
 public:
-    CategoryEvent(std::string_view id, bool enabled = false);
+    CategoryEvent(std::string id, bool enabled = false);
 
     std::string const& getId() const;
     bool isEnabled() const;

src/menu/src/CategoryItem.cpp

@@ -7,7 +7,7 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-CategoryEvent::CategoryEvent(std::string_view id, bool enabled) : m_id(id), m_enabled(enabled) {};
+CategoryEvent::CategoryEvent(std::string id, bool enabled) : m_id(std::move(id)), m_enabled(enabled) {};
 
 std::string const& CategoryEvent::getId() const {
     return m_id;
@@ -39,15 +39,15 @@ bool CategoryItem::init(CCSize const& size, std::string_view category) {
 
     if (!CCMenu::init()) return false;
 
-    setID(str::join(str::split(str::toLower(category.data()), " "), "-"));
-    setScaledContentSize(size);
+    setID(str::join(str::split(str::filter(str::toLower(category.data()), "abcdefghijklmnopqrstuvwxyz0123456789 "), " "), "-"));
+    setContentSize(size);
     setAnchorPoint({ 0.5, 1 });
 
     auto bg = CCScale9Sprite::create("square02_001.png");
     bg->setID("background");
     bg->setScale(0.2f);
     bg->setAnchorPoint({ 0, 0 });
-    bg->setContentSize({ getScaledContentWidth() * 5.f, getScaledContentHeight() * 5.f });
+    bg->setContentSize(getScaledContentSize() * 5.f);
     bg->setOpacity(40);
 
     addChild(bg, -1);

src/menu/src/FloatingButton.cpp

@@ -54,7 +54,7 @@ bool FloatingButton::init() {
 
     setContentSize(m_impl->m_sprite->getScaledContentSize());
 
-    m_impl->m_sprite->setPosition({ getScaledContentWidth() / 2.f, getScaledContentHeight() / 2.f });
+    m_impl->m_sprite->setPosition(getScaledContentSize() / 2.f);
 
     setScale(m_impl->m_scale); // set initial scale
     setOpacity(m_impl->m_opacity); // set initial opacity