Skip to content

Commit bb505cc

Browse files
FireMario211FireMario211
committed
fix some issues
1 parent 8cab4c7 commit bb505cc

File tree

11 files changed

+208
-194
lines changed

11 files changed

+208
-194
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
66

77
if(NOT DEFINED GEODE_TARGET_PLATFORM)
88
set(GEODE_TARGET_PLATFORM "Win64")
9-
set(GEODE_GD_VERSION 2.206)
10-
set(GEODE_COMP_GD_VERSION 22060)
9+
set(GEODE_GD_VERSION 2.2074)
10+
set(GEODE_COMP_GD_VERSION 22074)
1111
endif()
1212

1313
if (${GEODE_TARGET_PLATFORM} STREQUAL "Win64")
@@ -66,7 +66,7 @@ endif()
6666
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND WIN32)
6767
message("compiling on linux!!")
6868
# why it requires advapi32 is beyond me
69-
target_link_libraries(${PROJECT_NAME} opengl32 ws2_32 crypt32 wldap32 normaliz advapi32 comdlg32)
69+
target_link_libraries(${PROJECT_NAME} opengl32 ws2_32 crypt32 wldap32 normaliz advapi32)
7070
elseif(${GEODE_TARGET_PLATFORM} STREQUAL "Win32")
7171
target_link_libraries(${PROJECT_NAME} opengl32 ws2_32 Crypt32 Wldap32 Normaliz)
7272
endif()

‎mod.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"geode": "4.0.0-alpha.1",
2+
"geode": "4.0.0-beta.1",
33
"version": "v1.3.12",
44
"gd": {
55
"win": "2.2074",
@@ -20,12 +20,12 @@
2020
"dependencies": [
2121
{
2222
"id": "geode.node-ids",
23-
"version": ">=v1.14.0",
23+
"version": ">=v1.17.0",
2424
"importance": "required"
2525
},
2626
{
2727
"id": "jouca.badgesapi",
28-
"version": ">=v1.1.0",
28+
"version": ">=v1.2.0-beta.3",
2929
"importance": "required"
3030
}
3131
],

‎src/MoreLeaderboards/LevelHelper.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#pragma once
21
#include "../includes.h"
32

43
#define STAR_EXP 5
@@ -412,4 +411,4 @@ class SpriteHelper {
412411

413412
return barColor;
414413
}
415-
};
414+
};

‎src/MoreLeaderboards/MoreLeaderboards.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ void MoreLeaderboards::loadPageMore() {
720720
addChild(listLayer);
721721

722722
if (MoreLeaderboards::scroll_int != 0) {
723-
listLayer->m_listView->m_tableView->scrollLayer(-99999999);
723+
listLayer->m_listView->m_tableView->scrollLayer((float)-INT_MAX);
724724
listLayer->m_listView->m_tableView->scrollLayer(MoreLeaderboards::scroll_int);
725725
}
726726
}
@@ -1290,8 +1290,6 @@ void MoreLeaderboards::onTab(CCObject* pSender) {
12901290
class $modify(LeaderboardsLayer) {
12911291
bool init(LeaderboardState state) {
12921292
if (!LeaderboardsLayer::init(state)) return false;
1293-
1294-
log::info("weee");
12951293
auto menu = CCMenu::create();
12961294

12971295
auto plusSpr = CCSprite::createWithSpriteFrameName("GJ_plusBtn_001.png");

‎src/Secret/BadApple.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class $modify(SecretVault, SecretLayer2) {
177177
void launchBadApple(CCObject* pSender) {
178178

179179
//GameSoundManager::sharedManager()->stopBackgroundMusic();
180-
FMODAudioEngine::sharedEngine()->stopAllMusic();
180+
FMODAudioEngine::sharedEngine()->stopAllMusic(true);
181181
auto scene = cocos2d::CCScene::create();
182182
auto layer = BadApple::create();
183183
scene->addChild(layer);
@@ -199,7 +199,7 @@ class $modify(SecretVault, SecretLayer2) {
199199

200200
void launchCOTE(CCObject* pSender) {
201201
//GameSoundManager::sharedManager()->stopBackgroundMusic();
202-
FMODAudioEngine::sharedEngine()->stopAllMusic();
202+
FMODAudioEngine::sharedEngine()->stopAllMusic(true);
203203
auto scene = cocos2d::CCScene::create();
204204
auto layer = COTE::create();
205205
scene->addChild(layer);

‎src/Settings/CustomSettings.cpp‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,10 @@
11
#include "CustomSettings.hpp"
22
#include <Geode/loader/Dirs.hpp>
3-
#include "../Notifications/EventsPush.h"
43
#include "../includes.h"
5-
int cycleTypes = -1;
64

7-
SettingNodeV3* SettingTestValue::createNode(float width) {
8-
return SettingTestNode::create(static_pointer_cast<SettingTestValue>(shared_from_this()), width);
9-
}
105
SettingNodeV3* SettingPosValue::createNode(float width) {
116
return SettingPosNode::create(static_pointer_cast<SettingPosValue>(shared_from_this()), width);
127
}
138
SettingNodeV3* SettingCreditsValue::createNode(float width) {
149
return SettingCreditsNode::create(static_pointer_cast<SettingCreditsValue>(shared_from_this()), width);
1510
}
16-
17-
void SettingTestNode::onTestBtn(CCObject*) {
18-
auto scene = CCDirector::sharedDirector()->getRunningScene();
19-
cycleTypes = cycleTypes + 1;
20-
if (cycleTypes > 4) cycleTypes = 0;
21-
bool newRate = Mod::get()->getSettingValue<bool>("newRate");
22-
bool daily = Mod::get()->getSettingValue<bool>("daily");
23-
bool weekly = Mod::get()->getSettingValue<bool>("weekly");
24-
if (!newRate && cycleTypes == 0) cycleTypes = 1;
25-
if (!daily && cycleTypes == 1) cycleTypes = 2;
26-
if (!weekly && cycleTypes == 2) cycleTypes = 3;
27-
if (!newRate && !daily && !weekly) {
28-
cycleTypes = 5;
29-
}
30-
31-
sio::message::ptr data = sio::object_message::create();
32-
//{'demon': 1, 'type': 1, 'starsum': 6, 'stars': 10, 'rate': 1, 'title': 'BRAINPOWER Let the base kick!', 'level_name': 'O-oooooooooo AAAAE-A-A-I-A-U-', 'level_creator': ' JO-oooooooooooo AAE-O-A-A-U-U-A- E-eee-ee-eee AAAAE-A-E-I-E-A- JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA', 'sprite': 'GJ_square01.png'}
33-
data->get_map()["coins"] = sio::int_message::create(3);
34-
data->get_map()["verified_coins"] = sio::int_message::create(1);
35-
data->get_map()["platformer"] = sio::int_message::create(0);
36-
switch (cycleTypes) {
37-
case 0: // new rate
38-
data->get_map()["title"] = sio::string_message::create("New Rated Level !");
39-
data->get_map()["demon"] = sio::int_message::create(0);
40-
data->get_map()["type"] = sio::int_message::create(0);
41-
data->get_map()["stars"] = sio::int_message::create(1);
42-
data->get_map()["starsum"] = sio::int_message::create(10);
43-
data->get_map()["level_name"] = sio::string_message::create("Stereo Madness");
44-
data->get_map()["level_creator"] = sio::string_message::create("by RobTop");
45-
data->get_map()["sprite"] = sio::string_message::create("GJ_square01.png");
46-
data->get_map()["rate"] = sio::int_message::create(1);
47-
break;
48-
case 1: // daily
49-
data->get_map()["title"] = sio::string_message::create("New Daily Level !");
50-
data->get_map()["demon"] = sio::int_message::create(0);
51-
data->get_map()["type"] = sio::int_message::create(1);
52-
data->get_map()["stars"] = sio::int_message::create(9);
53-
data->get_map()["starsum"] = sio::int_message::create(40);
54-
data->get_map()["level_name"] = sio::string_message::create("Cycles");
55-
data->get_map()["level_creator"] = sio::string_message::create("by RobTop");
56-
data->get_map()["sprite"] = sio::string_message::create("GJ_square01.png");
57-
data->get_map()["rate"] = sio::int_message::create(1);
58-
break;
59-
case 2: // weekly
60-
data->get_map()["title"] = sio::string_message::create("New Weekly Level !");
61-
data->get_map()["demon"] = sio::int_message::create(1);
62-
data->get_map()["type"] = sio::int_message::create(2);
63-
data->get_map()["stars"] = sio::int_message::create(14);
64-
data->get_map()["starsum"] = sio::int_message::create(7);
65-
data->get_map()["level_name"] = sio::string_message::create("Theory of Everything 2");
66-
data->get_map()["level_creator"] = sio::string_message::create("by RobTop");
67-
data->get_map()["sprite"] = sio::string_message::create("GJ_square05.png");
68-
data->get_map()["rate"] = sio::int_message::create(1);
69-
break;
70-
case 3: // Legendary rating test
71-
data->get_map()["title"] = sio::string_message::create("New Rated Level !");
72-
data->get_map()["demon"] = sio::int_message::create(0);
73-
data->get_map()["type"] = sio::int_message::create(0);
74-
data->get_map()["stars"] = sio::int_message::create(3);
75-
data->get_map()["starsum"] = sio::int_message::create(20);
76-
data->get_map()["level_name"] = sio::string_message::create("Oh no it's happening");
77-
data->get_map()["level_creator"] = sio::string_message::create("by ...");
78-
data->get_map()["sprite"] = sio::string_message::create("GJ_square01.png");
79-
data->get_map()["rate"] = sio::int_message::create(3);
80-
break;
81-
case 4: // Mythic rating test
82-
data->get_map()["title"] = sio::string_message::create("New Rated Level !");
83-
data->get_map()["demon"] = sio::int_message::create(0);
84-
data->get_map()["type"] = sio::int_message::create(0);
85-
data->get_map()["stars"] = sio::int_message::create(100);
86-
data->get_map()["starsum"] = sio::int_message::create(20);
87-
data->get_map()["level_name"] = sio::string_message::create("FIRE IN THE HOLE!");
88-
data->get_map()["level_creator"] = sio::string_message::create("by GD Community");
89-
data->get_map()["sprite"] = sio::string_message::create("GJ_square01.png");
90-
data->get_map()["rate"] = sio::int_message::create(4);
91-
break;
92-
case 5: // in case the user disables everything
93-
data->get_map()["title"] = sio::string_message::create("New Rated Level !");
94-
data->get_map()["demon"] = sio::int_message::create(1);
95-
data->get_map()["type"] = sio::int_message::create(-1);
96-
data->get_map()["stars"] = sio::int_message::create(2);
97-
data->get_map()["starsum"] = sio::int_message::create(6);
98-
data->get_map()["level_name"] = sio::string_message::create("Back On Track");
99-
data->get_map()["level_creator"] = sio::string_message::create("by RobTop");
100-
data->get_map()["sprite"] = sio::string_message::create("GJ_square01.png");
101-
data->get_map()["rate"] = sio::int_message::create(1);
102-
break;
103-
default: // not possible
104-
data->get_map()["title"] = sio::string_message::create("hi there hxd user, ghidra user or ida user. (or hi RobTop) Here's a little easter egg for you :)");
105-
data->get_map()["demon"] = sio::int_message::create(1);
106-
data->get_map()["type"] = sio::int_message::create(2);
107-
data->get_map()["stars"] = sio::int_message::create(14);
108-
data->get_map()["starsum"] = sio::int_message::create(7);
109-
data->get_map()["sprite"] = sio::string_message::create("This will crash! :D");
110-
111-
break;
112-
}
113-
EventsPush::pushRateLevel(scene, data);
114-
}

‎src/Settings/CustomSettings.hpp‎

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,8 @@
44
#include <Geode/ui/TextInput.hpp>
55
using namespace geode::prelude;
66

7-
/*
8-
--- Test ---
9-
*/
10-
11-
class SettingTestValue : public SettingV3 {
12-
public:
13-
static Result<std::shared_ptr<SettingV3>> parse(std::string const& key, std::string const& modID, matjson::Value const& json) {
14-
auto res = std::make_shared<SettingTestValue>();
15-
auto root = checkJson(json, "SettingTestValue");
16-
res->init(key, modID, root);
17-
res->parseNameAndDescription(root);
18-
root.checkUnknownKeys();
19-
return root.ok(std::static_pointer_cast<SettingV3>(res));
20-
}
21-
22-
bool load(matjson::Value const& json) override {
23-
return true;
24-
}
25-
bool save(matjson::Value& json) const override {
26-
return true;
27-
}
28-
bool isDefaultValue() const override {
29-
return true;
30-
}
31-
void reset() override {}
32-
SettingNodeV3* createNode(float width) override;
33-
};
347

358

36-
class SettingTestNode : public SettingNodeV3 {
37-
protected:
38-
bool init(std::shared_ptr<SettingTestValue> setting, float width) {
39-
if (!SettingNodeV3::init(setting, width))
40-
return false;
41-
this->setContentSize({ width, 35.f });
42-
auto label = CCLabelBMFont::create("Test", "bigFont.fnt");
43-
label->setScale(.6F);
44-
auto playSpr = CCSprite::createWithSpriteFrameName("GJ_playBtn2_001.png");
45-
playSpr->setScale(.4F);
46-
auto testBtn = CCMenuItemSpriteExtra::create(
47-
playSpr,
48-
this,
49-
menu_selector(SettingTestNode::onTestBtn)
50-
);
51-
getButtonMenu()->setContentWidth(width);
52-
getButtonMenu()->addChildAtPosition(label, Anchor::Left, {42, 0});
53-
getButtonMenu()->addChildAtPosition(testBtn, Anchor::Right, {-15, 0});
54-
getButtonMenu()->updateLayout();
55-
getNameLabel()->setVisible(false);
56-
return true;
57-
}
58-
void onCommit() override {}
59-
void onResetToDefault() override {}
60-
61-
public:
62-
void onTestBtn(CCObject*);
63-
bool hasUncommittedChanges() const override {
64-
return false;
65-
}
66-
bool hasNonDefaultValue() const override {
67-
return false;
68-
}
69-
static SettingTestNode* create(std::shared_ptr<SettingTestValue> setting, float width) {
70-
auto ret = new SettingTestNode();
71-
if (ret && ret->init(setting, width)) {
72-
ret->autorelease();
73-
return ret;
74-
}
75-
CC_SAFE_DELETE(ret);
76-
return nullptr;
77-
}
78-
};
799

8010
/*
8111
Notification Position
@@ -267,6 +197,7 @@ class SettingCreditsValue : public SettingV3 {
267197
auto root = checkJson(json, "SettingCreditsValue");
268198
res->init(key, modID, root);
269199
res->parseNameAndDescription(root);
200+
res->parseEnableIf(root);
270201
root.checkUnknownKeys();
271202
return root.ok(std::static_pointer_cast<SettingV3>(res));
272203
}

0 commit comments

Comments
 (0)