Skip to content

Commit

Permalink
Some fixes and ultimate achievements merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@iArtie
iArtie committed Mar 6, 2024
1 parent 9bb14cc commit b78152a
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 5 deletions.
3 changes: 3 additions & 0 deletions about.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# More Games!

## **Ultimate Achievements Fix!**
- This fix was done by [iristraa](https://github.com/iristraa)
# Description
Have you ever thought that the "More Games" button was completely useless? WELL NOT ANYMORE

This mod brings all 3 fully playable Geometry Dash spinoffs into one mod!
Expand Down
2 changes: 1 addition & 1 deletion mod.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "2.0.0-beta.12",
"version": "v1.0.2",
"version": "v1.0.3",
"id": "bitz.moregames",
"name": "MoreGames",
"developer": "BitZ",
Expand Down
3 changes: 3 additions & 0 deletions src/MeltdownSelectLevelLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ bool MeltdownSelectLevelLayer::init(int page) {
mlevel3->m_levelName = "Airborne Robots";
mlevel3->m_stars = 3;
mlevel3->m_coins = 3;
mlevel3->m_levelType = GJLevelType::Local;
mlevel3->m_audioTrack = 25;
mlevel3->m_difficulty = GJDifficulty::Hard;
mlevel3->m_creatorName = "RobTopGames";
Expand All @@ -106,6 +107,7 @@ bool MeltdownSelectLevelLayer::init(int page) {
mlevel2->m_levelName = "Viking Arena";
mlevel2->m_stars = 2;
mlevel2->m_coins = 3;
mlevel2->m_levelType = GJLevelType::Local;
mlevel2->m_audioTrack = 24;
mlevel2->m_difficulty = GJDifficulty::Normal;
mlevel2->m_creatorName = "RobTopGames";
Expand All @@ -118,6 +120,7 @@ bool MeltdownSelectLevelLayer::init(int page) {
mlevel1->m_levelName = "The Seven Seas";
mlevel1->m_stars = 1;
mlevel1->m_coins = 3;
mlevel1->m_levelType = GJLevelType::Local;
mlevel1->m_audioTrack = 23;
mlevel1->m_difficulty = GJDifficulty::Easy;
mlevel1->m_creatorName = "RobTopGames";
Expand Down
2 changes: 2 additions & 0 deletions src/SubZeroSelectLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ bool SubZeroSelectLayer::init(int page) {
GJGameLevel* level3 = GLM->getMainLevel(4003, true);
level3->m_levelName = "Power Trip";
level3->m_levelID = 4003;
level3->m_levelType = GJLevelType::Local;
level3->m_stars = 8;
level3->m_coins = 3;
level3->m_audioTrack = 39;
Expand All @@ -102,6 +103,7 @@ bool SubZeroSelectLayer::init(int page) {
//std::string text2((std::istreambuf_iterator<char>(t2)), std::istreambuf_iterator<char>());
GJGameLevel* level2 = GLM->getMainLevel(4002, true);
level2->m_levelName = "Nock Em";
level2->m_levelType = GJLevelType::Local;
level2->m_stars = 6;
level2->m_coins = 3;
level2->m_audioTrack = 38;
Expand Down
37 changes: 33 additions & 4 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,9 @@ class $modify(LevelSelectLayer) {
bool init(int a1) {


auto back = Mod::get()->getSavedValue<int>("onsubzero");
/*auto back = Mod::get()->getSavedValue<int>("onsubzero");
back = 10;
Mod::get()->setSavedValue("onsubzero", back);
Mod::get()->setSavedValue("onsubzero", back);*/
return LevelSelectLayer::init(a1);
}

Expand Down Expand Up @@ -370,7 +370,13 @@ class $modify(MenuLayer) {
//CCDirector::sharedDirector()->replaceScene(CCTransitionFade::create(0.5, NewLevelSelectLayer::scene(0)));

}
void onPlay(CCObject* sender) {
auto back = Mod::get()->getSavedValue<int>("onsubzero");
back = 10;
Mod::get()->setSavedValue("onsubzero", back);

MenuLayer::onPlay(sender);
}


};
Expand Down Expand Up @@ -515,6 +521,7 @@ class $modify(PauseLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 2:
/*std::cout << "on Nock Em" << std::endl;*/
Expand All @@ -531,6 +538,7 @@ class $modify(PauseLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 3:
/*std::cout << "on Power Trip" << std::endl;*/
Expand All @@ -548,7 +556,6 @@ class $modify(PauseLayer) {
dashlandScene->instantPage(sender, 1);
}


break;
case 4:

Expand All @@ -565,6 +572,7 @@ class $modify(PauseLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 5:
/*std::cout << "on FrontLines" << std::endl;*/
Expand All @@ -590,38 +598,47 @@ class $modify(PauseLayer) {

page = 5;
dashlandScene->instantPage(sender, 2);

break;
case 7:

page = 6;
dashlandScene->instantPage(sender, 2);

break;
case 8:

page = 7;
dashlandScene->instantPage(sender, 2);

break;
case 9:

page = 8;
dashlandScene->instantPage(sender, 2);

break;
case 10:

page = 9;
dashlandScene->instantPage(sender, 2);

break;
default:
/*std::cout << "on a common level" << std::endl;*/
page = 10;

break;
}

if (page != 10) {

CCDirector::sharedDirector()->replaceScene(CCTransitionFade::create(0.5, scene));
PauseLayer::onQuit(sender);

}
else {
Mod::get()->setSavedValue("onsubzero", 10);
PauseLayer::onQuit(sender);
}

Expand Down Expand Up @@ -680,6 +697,7 @@ class $modify(EndLevelLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 2:
/*std::cout << "on Nock Em" << std::endl;*/
Expand All @@ -696,6 +714,7 @@ class $modify(EndLevelLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 3:
/*std::cout << "on Power Trip" << std::endl;*/
Expand All @@ -712,6 +731,7 @@ class $modify(EndLevelLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 4:

Expand All @@ -728,6 +748,7 @@ class $modify(EndLevelLayer) {
{
dashlandScene->instantPage(sender, 1);
}

break;
case 5:
/*std::cout << "on FrontLines" << std::endl;*/
Expand All @@ -746,34 +767,39 @@ class $modify(EndLevelLayer) {
dashlandScene->instantPage(sender, 1);
}



/* BG->setColor({ 125, 0, 255 });*/
break;
case 6:

page = 5;

dashlandScene->instantPage(sender, 2);
break;
case 7:

page = 6;
dashlandScene->instantPage(sender, 2);

break;
case 8:

page = 7;
dashlandScene->instantPage(sender, 2);

break;
case 9:

page = 8;
dashlandScene->instantPage(sender, 2);

break;
case 10:

page = 9;
dashlandScene->instantPage(sender, 2);

break;
default:
/*std::cout << "on a common level" << std::endl;*/
Expand All @@ -782,10 +808,13 @@ class $modify(EndLevelLayer) {
}

if (page != 10) {

CCDirector::sharedDirector()->replaceScene(CCTransitionFade::create(0.5, scene));
EndLevelLayer::onMenu(sender);

}
else {
Mod::get()->setSavedValue("onsubzero", 10);
EndLevelLayer::onMenu(sender);
}

Expand Down
10 changes: 10 additions & 0 deletions src/ownWorldSelectLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2468,6 +2468,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
std::string mtext((std::istreambuf_iterator<char>(mt)), std::istreambuf_iterator<char>());
level21 = GLM->getMainLevel(2001, false);
level21->m_levelName = "Payload";
level21->m_levelType = GJLevelType::Local;
level21->m_stars = 2;
level21->m_levelString = mtext;
level21->m_audioTrack = 27;
Expand All @@ -2486,6 +2487,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2002, false);
level21->m_levelName = "Beast Mode";
level21->m_stars = 2;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 28;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2503,6 +2505,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2003, false);
level21->m_levelName = "Machina";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 29;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2520,6 +2523,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2004, false);
level21->m_levelName = "Years";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 30;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2537,6 +2541,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2005, false);
level21->m_levelName = "Frontlines";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 31;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2553,6 +2558,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2006, false);
level21->m_levelName = "Space Pirates";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 32;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2569,6 +2575,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2007, false);
level21->m_levelName = "Striker";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 33;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2585,6 +2592,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2008, false);
level21->m_levelName = "Embers";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 34;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2601,6 +2609,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2009, false);
level21->m_levelName = "Round 1";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 35;
level21->m_difficulty = GJDifficulty::Normal;
Expand All @@ -2617,6 +2626,7 @@ void ownWorldSelectLayer::onInfo(CCObject* sender) {
level21 = GLM->getMainLevel(2010, false);
level21->m_levelName = "Monster Dance Off";
level21->m_stars = 3;
level21->m_levelType = GJLevelType::Local;
level21->m_levelString = mtext;
level21->m_audioTrack = 36;
level21->m_difficulty = GJDifficulty::Normal;
Expand Down

0 comments on commit b78152a

Please sign in to comment.