update islands page buttons stuff and more

Author: OmgRod

include/Surge/layers/IslandNode.h

@@ -5,8 +5,6 @@
 
 using namespace geode::prelude;
 
-namespace more {
-
 class IslandNode : public CCNode {
 public:
     static IslandNode* create(
@@ -23,6 +21,4 @@ class IslandNode : public CCNode {
 
     int m_index;
     IslandSelectLayer* m_islandSelectLayer;
-};
-
-} // namespace more
+};

include/Surge/layers/IslandSelectLayer.h

@@ -12,6 +12,8 @@ class IslandSelectLayer : public CCLayer, public BoomScrollLayerDelegate, public
     BoomScrollLayer* m_scrollLayer;
 	float m_fWindowWidth;
     int m_level;
+	CCMenuItemSpriteExtra* m_nextPageBtn;
+	CCMenuItemSpriteExtra* m_prevPageBtn;
 	GJGameLevel* level;
 	ccColor3B colorForPage(int);
 	ccColor3B getColorValue(int, int, float);
@@ -32,4 +34,6 @@ class IslandSelectLayer : public CCLayer, public BoomScrollLayerDelegate, public
 	static IslandSelectLayer* create(int page);
 	static CCScene* scene(int page);
 	void updatePageWithObject(CCObject* page, CCObject* object) override;
+	void onEnterTransitionDidFinish() override;
+	void updatePageButtons();
 };

res/IconSheet/player_ball_126_001.png renamed to res/IconSheet/player_ball_119_001.png

@@ -65,20 +65,21 @@ bool IslandLevel::setup(GJGameLevel* level, CCMenuItemSpriteExtra* button) {
     m_level->m_levelString = LocalLevelManager::sharedState()->getMainLevelString(levelID);
 
     auto songSprite = CCSprite::createWithSpriteFrameName("GJ_playMusicBtn_001.png");
-    songSprite->setScale(0.5f);
+    songSprite->setScale(0.75f);
     auto songBtn = CCMenuItemSpriteExtra::create(
         songSprite,
         button,
         menu_selector(IslandLevel::onSong)
     );
-    songBtn->setPosition({ m_mainLayer->getContentSize().width, m_mainLayer->getContentSize().height });
+    songBtn->setPosition({ 300.f, 0.f });
     m_buttonMenu->addChild(songBtn);
 
     auto playBtn = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("GJ_playBtn2_001.png"), this, menu_selector(IslandLevel::onPlay));
-    
+    playBtn->setPosition({ BG->getPositionX(), BG->getPositionY() + 35.f });
+
     m_buttonMenu->addChild(playBtn);
-    m_buttonMenu->setPositionX(BG->getPositionX());
-    m_buttonMenu->setPositionY(BG->getPositionY()+35);
+    m_buttonMenu->setPositionX(0.f);
+    m_buttonMenu->setPositionY(0.f);
 
     //Normal mode progress bar
     int per = 100;
@@ -307,6 +308,7 @@ void IslandLevel::onInfo(CCObject* sender) {
 }
 
 void IslandLevel::onSong(CCObject* sender) {
-    if (!m_level) return;
-    SongInfoLayer::create(m_level->m_songID)->show();
+    // if (!m_level) return;
+    // SongInfoLayer::create(m_level->m_songID)->show();
+    SongInfoLayer::create(1)->show();
 }

res/IconSheet/player_ball_126_2_001.png renamed to res/IconSheet/player_ball_119_2_001.png

@@ -2,12 +2,7 @@
 
 using namespace geode::prelude;
 
-namespace more {
-
-IslandNode* IslandNode::create(
-    int index,
-    IslandSelectLayer* islandSelectLayer
-) {
+IslandNode* IslandNode::create(int index, IslandSelectLayer* islandSelectLayer) {
     IslandNode* ret = new IslandNode();
 
     if (ret && ret->init(index, islandSelectLayer)) {
@@ -19,20 +14,15 @@ IslandNode* IslandNode::create(
     return ret;
 }
 
-bool IslandNode::init(
-    int index,
-    IslandSelectLayer* islandSelectLayer
-) {
+bool IslandNode::init(int index, IslandSelectLayer* islandSelectLayer) {
     if (!CCNode::init()) {
         return false;
     }
-
+    
     m_index = index;
 
-  /*  std::cout << index << std::endl;*/
     m_islandSelectLayer = islandSelectLayer;
-   
-
+    
     return true;
 }
 
@@ -47,6 +37,4 @@ CCSprite* IslandNode::createIsland() {
     );
 
     return sprite;
-}
-
-} // namespace more
+}