Skip to content

Commit 38ef8f4

Browse files
committed
shit
1 parent b164974 commit 38ef8f4

File tree

6 files changed

+52
-17
lines changed

6 files changed

+52
-17
lines changed

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"geode": "2.0.0",
3-
"version": "v1.1.0",
3+
"version": "v1.0.4",
44
"gd": {
55
"win": "2.204",
66
"android": "*"

src/Client/AndroidUI.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AndroidUI : public cocos2d::CCLayerColor {
5858
{
5959
if (Client::GetModuleEnabled("speedhack-enabled"))
6060
{
61-
float v = 1.0f;
61+
v = 1.0f;
6262

6363
if (SpeedhackTop::instance->text.size() != 0 && !SpeedhackTop::instance->text.ends_with("."))
6464
{
@@ -428,6 +428,11 @@ class AndroidBall : public CCLayer
428428

429429
virtual void update(float dt)
430430
{
431+
//if (CCScene::get()->getChildByID("android-ui"))
432+
// CCDirector::get()->setNotificationNode(nullptr);
433+
//else
434+
// CCDirector::get()->setNotificationNode(this);
435+
431436
UpdateVisible(false);
432437
}
433438

src/Client/ClientSetup.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class ClientUtils
3434
speedhack->modules.push_back(new SpeedhackTop());
3535
speedhack->modules.push_back(new Module("Enabled", "speedhack-enabled", "Is the speedhack enabled?"));
3636
speedhack->modules.push_back(new Module("Speedhack Music", "speedhack-music", "Speedhack all sound by your speed modifier", true));
37+
speedhack->modules.push_back(new Module("Gameplay Only", "speedhack-gameplay", "Only enables the speedhack in gameplay and editor"));
3738

3839
(reinterpret_cast<SpeedhackTop*>(speedhack->modules.front()))->format = "%x";
3940

src/Client/Window.h

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,10 @@ class Speedhack : public Window//, public TextInputDelegate
252252
menu->addChild(slider, 2);
253253

254254
modules[0]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 50) - ccp(180 / 2, 0) + ccp(10, 0));
255-
modules[1]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 200) - ccp(180 / 2, 0) + ccp(10, 0));
256-
modules[2]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 250) - ccp(180 / 2, 0) + ccp(10, 0));
255+
256+
modules[1]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 110) - ccp(180 / 2, 0) + ccp(10, 0));
257+
modules[2]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 110 - (24 * 1)) - ccp(180 / 2, 0) + ccp(10, 0));
258+
modules[3]->makeAndroid(menu, ccp(menu->getContentSize().width / 2, menu->getContentSize().height - 110 - (24 * 2)) - ccp(180 / 2, 0) + ccp(10, 0));
257259
//static_cast<geode::InputNode*>(menu->getChildByID("speedhack-top"))->getInput()->setDelegate(this);
258260

259261
auto trash = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("GJ_trashBtn_001.png"), menu, menu_selector(Speedhack::clear));
@@ -582,6 +584,22 @@ class Config : public Window
582584

583585
}
584586

587+
void onLink(CCObject* sender)
588+
{
589+
auto a = geode::createQuickPopup(
590+
"Hold Up!",
591+
"Links are spooky! Are you sure you want to go to <cy>" + std::string(as<CCNode*>(sender)->getID()) + "</c>?",
592+
"Cancel", "Yes",
593+
[](FLAlertLayer* a, bool btn2) {
594+
if (btn2) {
595+
CCApplication::get()->openURL(a->getID().c_str());
596+
}
597+
}
598+
);
599+
600+
a->setID(as<CCNode*>(sender)->getID());
601+
}
602+
585603
void cocosCreate(CCMenu* menu)
586604
{
587605
btns.clear();
@@ -662,8 +680,14 @@ class Config : public Window
662680
menu->addChild(lED);
663681
menu->addChild(ED);
664682

665-
auto discord = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("gj_discordIcon_001.png"), menu, nullptr); // https://discord.gg/DfQSTEnQKK
683+
auto discord = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("gj_discordIcon_001.png"), menu, menu_selector(Config::onLink)); // https://discord.gg/DfQSTEnQKK
666684
discord->setPosition(ccp(menu->getContentSize().width, 0) + ccp(-10, 12));
685+
discord->setID("https://discord.gg/DfQSTEnQKK");
667686
menu->addChild(discord);
687+
688+
auto yt = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("gj_ytIcon_001.png"), menu, menu_selector(Config::onLink)); // https://www.youtube.com/@TheSillyDoggo
689+
yt->setPosition(ccp(menu->getContentSize().width, 0) + ccp(-10, 12) + ccp(0, 35));
690+
yt->setID("https://www.youtube.com/@TheSillyDoggo");
691+
menu->addChild(yt);
668692
}
669693
};

src/Hacks/SolidWaveTrail.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
#include <Geode/Geode.hpp>
2-
#include <Geode/modify/HardStreak.hpp>
1+
/*#include <Geode/Geode.hpp>
2+
//#include <Geode/modify/HardStreak.hpp>
3+
#include <Geode/modify/CCDrawNode.hpp>
34
#include "../Client/Client.h"
45
56
using namespace geode::prelude;
6-
/*
7-
class $modify (HardStreak)
7+
8+
class $modify (CCDrawNode)
89
{
9-
inline void drawPolygon(CCPoint *verts, unsigned int count, const ccColor4F &fillColor, float borderWidth, const ccColor4F &borderColor)
10+
void drawPolygon(CCPoint *verts, unsigned int count, const ccColor4F &fillColor, float borderWidth, const ccColor4F &borderColor)
1011
{
1112
log::info("a");
1213
13-
HardStreak::drawPolygon(verts, count, fillColor, borderWidth, borderColor);
14+
CCDrawNode::drawPolygon(verts, count, fillColor, borderWidth, borderColor);
1415
}
16+
};
17+
*/
18+
/*void updateStroke(float p0)
19+
{
20+
HardStreak::updateStroke(p0);
1521
16-
/*void updateStroke(float p0)
17-
{
18-
HardStreak::updateStroke(p0);
19-
20-
log::info("s");
21-
}//
22+
log::info("s");
23+
}//
2224
};*/

src/Hacks/Speedhack.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ class $modify (CCScheduler)
2525
if (v > 99999)
2626
v = 99999;
2727

28+
if (Client::GetModuleEnabled("speedhack-gameplay"))
29+
if (!(PlayLayer::get() || GameManager::sharedState()->getEditorLayer())) { v = 1.0f; }
30+
2831
FMOD::ChannelGroup* masterGroup;
2932
FMODAudioEngine::sharedEngine()->m_system->getMasterChannelGroup(&masterGroup);
3033
masterGroup->setPitch(Client::GetModuleEnabled("speedhack-music") ? v : 1);

0 commit comments

Comments
 (0)