Skip to content

Commit 386f2ff

Browse files
OmgRodOmgRod
committed
added level -1 (test) and full coming never screen
1 parent 345bbb2 commit 386f2ff

File tree

5 files changed

+64
-14
lines changed

5 files changed

+64
-14
lines changed

‎include/Surge/modify/PlayLayer.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ class $modify(MyPlayLayer, PlayLayer) {
88
$override
99
void levelComplete();
1010
// void onQuit();
11+
void showHint();
1112
};

‎res/levels/level-1.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAACqVYTW8UMQz9Q8sqtvPhCPVQJKgQHxJtoWgvEeVQoSJxQAUh8ePJjKdiU-LEFYcdd8fPHr839riztxfEOyjeFSyAoVDBEAqAGBQjJ315AiUWcM6VVKBAWA5cXOECv6GsKRzaUsD_p8jdFAtGAkxJsCzxvUSPkqR-__8cvptjCb8n5GZ0gkrHPUaVqKZ5pLw9SrvbU6CdW0wQE8X4XT3K32k94uaXb8CLuaAsvvUoeVbHqV-P4gUnIEGhwFAQmHawwJ0YEIOrQUmFkoXER-IjKc1LMi_JfJBw8REJ0ouR8kmut8zZYvJqYGMhcbiVC1J8NU9hl6sguKMqUs3q6nXCcq1a08XZh-_XZ3z38sX5t08f39wsn-uzD3i4-nnyIC7dhyFI7OvL5zevzt7-uL76enf49ezu8PHw9fOX279xkcI-Yjf2_ObkCBdAw128O8ZFv09d2OXpMYzTFJNcVFKdH18xIe-hX9n7YwapVkZKvgbHTsM1TFOm_ZwoQ7DowfU2zKlyiHvuZ2uoci1NkaShml3WcA3VjLjvwxoS2XuDIrneB6W25pqsNmbDte4P2Pe76bzFUVJwDdc6ejDlAC6RRRFwmaZMAWDpzDlTCK5KMmcKMSq4limkbOlNQNdN9gBUb4NhWgH90ptzsliL64vSksUcFFxLlhwbmhOInEkTqvfCwJaS1pwtW-9YUaVl69EruJatr81u6U8fskUVX2-GYWZrg2od2tINFE0zGwKaZjbEOCcRmE2aRMdzphG19myZxhhMMxsZTDMbs2m_QoL5goVEpg0LKWjd2ZJNWXuQtWQZnGlmGS0rFtibdixwtCxZYNaas2WbUXuStWwzZdPM5mDaspCTZc1CzqY9iw60Dm3oYt2LlplFF017Fh3P9yzWrW3RBAHnexbBm_YsApv2LEI27VlEZ9qziDTfs4jBtGcR02zPugUW3Pq-EQWED8_Tdn4Nru93f_25idP8arz3x-85Hf8xx056N3bT2B3H7jx0N_-VdtxhzIypr_h2XlUs41jxza_GpzSpaywpjyXlsaQ8ljSPJc1h7OYhM4LYVfz-vKYYYRgqfu9X48FN6hpKupWnu4eSEg4l3WrX3Tx0t79S_Ov3ua-4Hz8VKPBY8c2vxnua1DWW1I8lDWNJw1jSMJY0wtitPC__ADN6CNrRFQAA

‎src/modify/LevelPage.cpp‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,18 @@ void MyLevelPage::updateDynamicPage(GJGameLevel* level) {
5656
switch (level->m_levelID) {
5757
case -1: {
5858
if (hasAch && Mod::get()->getSettingValue<bool>("shattered-code") && label) {
59-
auto comingNeverNode = CCNode::create();
59+
auto comingNeverNode = CCMenu::create();
6060
comingNeverNode->setID("coming-never-node");
6161
comingNeverNode->setPosition(label->getPosition());
6262

63+
auto bg = createLayerBG();
64+
bg->setZOrder(-1);
65+
bg->setColor({ 0, 0, 0 });
66+
bg->setScaleX(winSize.width / bg->getContentSize().width);
67+
bg->setScaleY(winSize.height / bg->getContentSize().height);
68+
bg->setPosition(-comingNeverNode->getPosition());
69+
comingNeverNode->addChild(bg);
70+
6371
auto comingText = CCLabelBMFont::create("Coming", "bigFont.fnt");
6472
comingText->setPosition({ -winSize.width * 0.3f, 0.f });
6573

@@ -71,7 +79,7 @@ void MyLevelPage::updateDynamicPage(GJGameLevel* level) {
7179
float scale1 = winSize.height / zigzag1->getContentSize().height;
7280
zigzag1->setScale(scale1);
7381
float zigzag1X = comingText->getPositionX() + (zigzag1->getContentSize().width * scale1) / 2.f;
74-
zigzag1->setPosition({ zigzag1X + 40.f, 0.f });
82+
zigzag1->setPosition({ zigzag1X + 60.f, 0.f });
7583

7684
auto zigzag2 = CCSprite::createWithSpriteFrameName("GDS_zigzag.png"_spr);
7785
float scale2 = winSize.height / zigzag2->getContentSize().height;
@@ -80,6 +88,32 @@ void MyLevelPage::updateDynamicPage(GJGameLevel* level) {
8088
float zigzag2X = neverText->getPositionX() - (zigzag2->getContentSize().width * scale2) / 2.f;
8189
zigzag2->setPosition({ zigzag2X - 40.f, 0.f });
8290

91+
auto diffFace = CCSprite::createWithSpriteFrameName("difficulty_00_btn_001.png");
92+
diffFace->setPosition({ 0, 0 });
93+
94+
auto star = CCSprite::createWithSpriteFrameName("star_small01_001.png");
95+
star->setPosition({ -5.f, -30.f });
96+
97+
auto starCount = CCCounterLabel::create(3, "bigFont.fnt", FormatterType::Integer);
98+
starCount->setScale(0.4);
99+
starCount->setAnchorPoint({ 0.f, 0.5f });
100+
starCount->setPosition({ 2.5f, -30.f });
101+
102+
auto playBtn2Spr = CCSprite::createWithSpriteFrameName("GJ_playBtn2_001.png");
103+
auto playBtn = CCMenuItemSpriteExtra::create(
104+
playBtn2Spr,
105+
this,
106+
menu_selector(LevelPage::onPlay)
107+
);
108+
playBtn->setTag(1);
109+
playBtn->setPosition({ 0.f, -75.f });
110+
111+
this->addChild(playBtn);
112+
113+
comingNeverNode->addChild(diffFace);
114+
comingNeverNode->addChild(star);
115+
comingNeverNode->addChild(starCount);
116+
comingNeverNode->addChild(playBtn);
83117
comingNeverNode->addChild(comingText);
84118
comingNeverNode->addChild(neverText);
85119
comingNeverNode->addChild(zigzag1);
@@ -121,7 +155,7 @@ void MyLevelPage::updateDynamicPage(GJGameLevel* level) {
121155
}
122156
}
123157

124-
m_isBusy = (level->m_levelID < 0 && level->m_levelID != -3);
158+
m_isBusy = (level->m_levelID < 0 && (level->m_levelID != -3 || level->m_levelID != -1));
125159
});
126160
}
127161

@@ -135,6 +169,11 @@ void MyLevelPage::onPlay(CCObject* sender) {
135169
if (m_level->m_levelID == -3) {
136170
onIslands(sender);
137171
return;
172+
} else if (m_level->m_levelID == -1) {
173+
auto level = LevelTools::getLevel(m_level->m_levelID, false);
174+
auto scene = PlayLayer::scene(level, false, false);
175+
auto transition = CCTransitionFade::create(0.5f, scene);
176+
CCDirector::sharedDirector()->pushScene(transition);
138177
}
139178

140179
LevelPage::onPlay(sender);

‎src/modify/LevelTools.cpp‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,62 +152,67 @@ GJGameLevel* MyLevelTools::getLevel(int levelID, bool loaded) {
152152
setLevelInfo(level, 2, GJDifficulty::Normal, 0);
153153
level->m_levelName = "The Factory";
154154
level->m_audioTrack = -1;
155-
level->m_coins = 0;
155+
level->m_coins = 3;
156156
break;
157157
case 2002:
158158
setLevelInfo(level, 3, GJDifficulty::Normal, 0);
159159
level->m_levelName = "The Woods";
160160
level->m_audioTrack = -1;
161-
level->m_coins = 0;
161+
level->m_coins = 3;
162162
break;
163163
case 2003:
164164
setLevelInfo(level, 4, GJDifficulty::Normal, 0);
165165
level->m_levelName = "The Complex";
166166
level->m_audioTrack = -1;
167-
level->m_coins = 0;
167+
level->m_coins = 3;
168168
break;
169169
case 2004:
170170
setLevelInfo(level, 5, GJDifficulty::Normal, 0);
171171
level->m_levelName = "The Storage";
172172
level->m_audioTrack = -1;
173-
level->m_coins = 0;
173+
level->m_coins = 3;
174174
break;
175175
case 2005:
176176
setLevelInfo(level, 6, GJDifficulty::Normal, 0);
177177
level->m_levelName = "The Ship";
178178
level->m_audioTrack = -1;
179-
level->m_coins = 0;
179+
level->m_coins = 3;
180180
break;
181181
case 2006:
182182
setLevelInfo(level, 2, GJDifficulty::Normal, 0);
183183
level->m_levelName = "Dockline";
184184
level->m_audioTrack = -1;
185-
level->m_coins = 0;
185+
level->m_coins = 3;
186186
break;
187187
case 2007:
188188
setLevelInfo(level, 3, GJDifficulty::Normal, 0);
189189
level->m_levelName = "Cargo Bay";
190190
level->m_audioTrack = -1;
191-
level->m_coins = 0;
191+
level->m_coins = 3;
192192
break;
193193
case 2008:
194194
setLevelInfo(level, 4, GJDifficulty::Normal, 0);
195195
level->m_levelName = "Slipstream";
196196
level->m_audioTrack = -1;
197-
level->m_coins = 0;
197+
level->m_coins = 3;
198198
break;
199199
case 2009:
200200
setLevelInfo(level, 5, GJDifficulty::Normal, 0);
201201
level->m_levelName = "Overpass";
202202
level->m_audioTrack = -1;
203-
level->m_coins = 0;
203+
level->m_coins = 3;
204204
break;
205205
case 2010:
206206
setLevelInfo(level, 6, GJDifficulty::Normal, 0);
207207
level->m_levelName = "Terminal Drift";
208208
level->m_audioTrack = -1;
209-
level->m_coins = 0;
209+
level->m_coins = 3;
210210
break;
211+
case -1:
212+
setLevelInfo(level, 3, GJDifficulty::NA, 0);
213+
level->m_levelName = "THE END is NEaR";
214+
level->m_audioTrack = -1;
215+
211216
}
212217
if (!loaded) {
213218
level->m_levelString = LocalLevelManager::sharedState()->getMainLevelString(levelID);

‎src/modify/PlayLayer.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ void MyPlayLayer::levelComplete() {
1414
// FMODAudioEngine::sharedEngine()->stopAllMusic(true);
1515
// FMODAudioEngine::sharedEngine()->playMusic("menuLoop.mp3", true, 0.1f, 0);
1616
// CCDirector::sharedDirector()->popSceneWithTransition(0.5f, PopTransition::kPopTransitionFade);
17-
// }
17+
// }
18+
19+
void MyPlayLayer::showHint() {
20+
log::info("{} is bad at the game", GameManager::sharedState()->m_playerName);
21+
}

0 commit comments

Comments
 (0)