3.1 beta2

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "user95401.gemetry_trash",
 	"name": "Gemetry Trash",
-	"version": "v3.1.1-beta.1",
+	"version": "v3.1.1-beta.2",
 	"developer": "user95401",
 	"description": "",
 	"early-load": true,

src/_main.cpp

@@ -9,6 +9,15 @@ class $modify(CCSpriteExt, CCSprite) {
     };
 };
 
+#include <Geode/modify/CCString.hpp>
+class $modify(CCString) {
+    const char* getCString() {
+        //log::debug("{}(int:{})->{}", this, (int)this, __func__);
+        if ((int)this == 0) log::error("{}(int:{})->{}", this, (int)this, __func__);
+        return (int)this != 0 ? CCString::getCString() : CCString::createWithFormat("")->getCString();
+    }
+};
+
 #include <Geode/modify/GauntletSelectLayer.hpp>
 class $modify(GauntletSelectLayerFix, GauntletSelectLayer) {
     $override void setupGauntlets() {
@@ -95,6 +104,12 @@ class $modify(MouseAnchorPointExt, CCNode) {
             };
         };
 #ifdef GEODE_IS_WINDOWS
+        if (this->getID() == "iconic"_spr) {
+            auto pos = toCocos(ImGui::GetMousePos());
+            pos = this->convertToNodeSpace(pos);
+            this->setAnchorPoint(pos / this->getContentSize());
+            this->getScale() == 1.f ? this->setScale(1.05f) : void();
+        }
         if (auto casted = typeinfo_cast<MenuGameLayer*>(this)) {
             auto pos = toCocos(ImGui::GetMousePos());
             pos = casted->convertToNodeSpace(pos);

src/_main.hpp

@@ -5,6 +5,10 @@ using namespace geode::prelude;
 
 #include <libs/CCLabelBMFontAnimated.h>
 
+#include <libs/Gif/GIFMovie.h>
+#include <libs/Gif/CacheGif.h>
+#include <libs/Gif/InstantGif.h>
+
 #include <regex>
 
 #include <_fs.hpp>
@@ -191,7 +195,7 @@ auto pLoadingLayerRef = Ref<LoadingLayer>(nullptr);
 #include "random_shit/menulayer_ruinify.hpp"
 #include "random_shit/game_ruinify.hpp"
 #include "random_shit/SoggyPop.hpp"
-#include "random_shit/event_level.hpp"
+#include "random_shit/NX_vcjZmQ9w.hpp"
 #include "random_shit/gtasa_map.hpp"
 #include "random_shit/menuitems.hpp"
 #include "random_shit/second_floor.hpp"

src/icons_ext.hpp

@@ -98,7 +98,7 @@ class $modify(PlayerObjectIconsExt, PlayerObject) {
         auto original_count = GameManager::get()->countForType(type);
         GameManagerIconsExt::return_original_count_for_type->setVisible(0);
 
-        if ((index != original_count) or (index != (original_count + 1))) {//fucking checks
+        if ((index == original_count) or (index == (original_count + 1))) {//fucking checks
             index = GameManager::get()->activeIconForType(type);
         }
 
@@ -140,7 +140,9 @@ class $modify(PlayerObjectIconsExt, PlayerObject) {
                 this->m_vehicleGlow->displayFrame()->getOriginalSize().height / this->m_vehicleGlow->getContentSize().height,
                 });
             if (m_vehicleSprite and type == IconType::Ufo) m_vehicleSprite->setPositionY(-8.f);
+            if (m_vehicleSprite and type == IconType::Ufo) m_vehicleGlow->setPositionY(-8.f);
             if (m_vehicleSprite and type == IconType::Ship) m_vehicleSprite->setPositionY(-6.f);
+            if (m_vehicleSprite and type == IconType::Ship) m_vehicleGlow->setPositionY(-6.f);
         };
 
         return index;

src/random_shit/NX_vcjZmQ9w.hpp

@@ -0,0 +1,61 @@
+#include <_main.hpp>
+
+#include <Geode/modify/LevelAreaInnerLayer.hpp>
+class $modify(NX_vcjZmQ9w, LevelAreaInnerLayer) {
+	$override bool init(bool p0) {
+		if (!LevelAreaInnerLayer::init(p0)) return false;
+
+		auto button = CCMenuItemExt::createSpriteExtraWithFilename(
+			"NX_vcjZmQ9w.png", 1.0f, [this](auto) {
+
+				findFirstChildRecursive<CCNode>(this, [](auto e) {e->setVisible(0); return false; });
+				this->setVisible(1);
+
+				if (auto gif = InstantGif::create("NX_vcjZmQ9w.gif")) {
+					gif->m_speed_mult = 1.25;
+					gif->setPosition(this->getContentSize() / 2);
+					limitNodeSize(gif, this->getContentSize(), 1337.f, 1.0f);
+					this->addChild(gif);
+				}
+				else return;
+
+				GameManager::get()->fadeInMusic("NX_vcjZmQ9w.mp1337");
+				GameManager::get()->fadeInMusic("NX_vcjZmQ9w.mp3");
+
+			}
+		);
+
+		button->m_colorEnabled = 1;
+		button->m_animationEnabled = 0;
+
+		button->getNormalImage()->runAction(CCEaseBounceOut::create(CCFadeIn::create(3.f)));
+
+		this->addChild(CCMenu::create(button, nullptr), 618, 618);
+
+		button->getParent()->setPosition(ccp(0, 0));
+		button->getParent()->setAnchorPoint(ccp(0, 0));
+
+		return true;
+	}
+};
+
+#include <Geode/modify/GJGarageLayer.hpp>
+class $modify(IcON_in_garage, GJGarageLayer) {
+	$override bool init() {
+		if (!GJGarageLayer::init()) return false;
+
+		if (auto gif = InstantGif::create("iconic.gif")) {
+			auto container = CCLayer::create();
+			container->setID("iconic"_spr);
+			container->addChild(gif, -2);
+			gif->setAnchorPoint(ccp(0,0));
+			gif->setScaleX(container->getContentWidth() / gif->getContentWidth());
+			gif->setScaleY(container->getContentHeight() / gif->getContentHeight());
+			gif->setOpacity(69);
+			gif->setBlendFunc({ GL_ONE, GL_ONE });
+			this->addChild(container, -2);
+		}
+
+		return true;
+	}
+};

src/random_shit/menulayer_ruinify.hpp

@@ -1,10 +1,6 @@
 #pragma once
 #include <_main.hpp>
 
-#include "Gif/GIFMovie.h"
-#include "Gif/CacheGif.h"
-#include "Gif/InstantGif.h"
-
 #include <Geode/modify/MenuGameLayer.hpp>
 class $modify(MenuGameLayerExt, MenuGameLayer) {
     void runaway(float) {
@@ -382,15 +378,6 @@ class $modify(MenuLayerExt, MenuLayer) {
         get_rand_meme_button_menu_long_var_here_for_ever->setPosition({ 230.f, 6.f });
         this->addChild(get_rand_meme_button_menu_long_var_here_for_ever);
 
-        if (auto gif = InstantGif::create("NX_vcjZmQ9w.gif")) {
-            gif->m_speed_mult = 1.241;
-            gif->setPosition(this->getContentSize() / 2);
-            this->addChild(gif);
-        };
-
-        GameManager::get()->fadeInMusic("NX_vcjZmQ9w.mp1337");
-        GameManager::get()->fadeInMusic("NX_vcjZmQ9w.mp3");
-
         return rtn;
     }
     inline static bool seenWarn = false;