Adicionando super bola e icones

Classes/BeginScene.cpp

@@ -47,7 +47,8 @@ bool BeginScene::init() {
     auto bg = cocos2d::LayerColor::create(COLOR_back);
     this->addChild(bg);
     
-    auto menu_item_start = MenuItemFont::create("Start", CC_CALLBACK_1(BeginScene::Play, this));
+    auto menu_item_start = MenuItemFont::create(MSG_START, CC_CALLBACK_1(BeginScene::Play, this));
+    menu_item_start->setFontNameObj(FONT);
     
     menu_item_start->setPosition(Point(visibleSize.width / 2, (visibleSize.height*0.25)));
     
@@ -98,7 +99,7 @@ bool BeginScene::init() {
     
     char level_text[256];
     if (level != 0) {
-        sprintf(level_text,"You are at level %d. In %.1f hour(s) you will regrow a level.", level, diff/3600.0);
+        sprintf(level_text,MSG_LEVEL_BACK, level, diff/3600.0);
         
         auto textlevel = Label::createWithTTF(level_text, FONT, 20);
         textlevel->setPosition(menu_item_start->getPositionX(), menu_item_start->getPositionY()-60);

Classes/GameScene.cpp

@@ -58,10 +58,12 @@ Scene* GameScene::createScene(int level) {
     
     CallFunc *runCallback_triple_balls = CallFunc::create(CC_CALLBACK_0(GameScene::tripleBallsAppearance, layer));
     CallFunc *runCallback_paddle_ball = CallFunc::create(CC_CALLBACK_0(GameScene::paddleBallAppearance, layer));
+    CallFunc *runCallback_superball = CallFunc::create(CC_CALLBACK_0(GameScene::superBallAppearance, layer));
     
     layer->runAction(seq_save_level);
     layer->runAction(runCallback_triple_balls);
     layer->runAction(runCallback_paddle_ball);
+    layer->runAction(runCallback_superball);
     
     layer->addAndThrowBall();
     
@@ -77,7 +79,7 @@ bool GameScene::init() {
     }
     
     over = false;
-    last_touch = 0;
+    last_touch = time(NULL);
     
     // https://www.freesound.org/people/schademans/sounds/13290/
     FileUtils::getInstance()->addSearchPath("res");
@@ -131,12 +133,23 @@ bool GameScene::onContactBegin(PhysicsContact& contact) {
             nodeA = tmp;
         }
         
+        if (nodeA->getTag() == BALL_TAG) {
+            last_touch = time(NULL);
+        }
+        
         // sempre B < A
         if (nodeB->getTag() == BLOCK_TAG) {
             auto audio = CocosDenshion::SimpleAudioEngine::getInstance();
             audio->playEffect("pipe.wav");
             nodeB->removeFromParentAndCleanup(true);
         } else if (nodeB->getTag() == INDESTRUCTIBLE_BLOCK_TAG) {
+            if (nodeA->getTag() == BALL_TAG) {
+                Ball* ball = (Ball*) nodeA;
+                if (ball->superball) {
+                    nodeB->removeFromParentAndCleanup(true);
+                    ball->resetNormalball();
+                }
+            }
             auto audio = CocosDenshion::SimpleAudioEngine::getInstance();
             audio->playEffect("metal.wav");
         } else if (nodeB->getTag() == BOTTOM_TAG && nodeA->getTag() == BALL_TAG) {
@@ -149,6 +162,8 @@ bool GameScene::onContactBegin(PhysicsContact& contact) {
             caseSaveLevel(nodeB);
         } else if (nodeB->getTag() == THREE_BALLS_TAG && nodeA->getTag() == RACKET_TAG) {
             caseTripleBalls(nodeB);
+        } else if (nodeB->getTag() == SUPERBALL_TAG && nodeA->getTag() == RACKET_TAG) {
+            caseSuperBall(nodeB);
         } else if (nodeB->getTag() == RACKET_BALL_TAG && nodeA->getTag() == RACKET_TAG) {
             caseRaqueteBall(nodeB);
         } else if (nodeB->getTag() == SAVE_TAG && nodeA->getTag() == BOTTOM_TAG) {
@@ -157,6 +172,8 @@ bool GameScene::onContactBegin(PhysicsContact& contact) {
             nodeB->removeFromParentAndCleanup(true);
         } else if (nodeB->getTag() == RACKET_BALL_TAG && nodeA->getTag() == BOTTOM_TAG) {
             nodeB->removeFromParentAndCleanup(true);
+        } else if (nodeB->getTag() == SUPERBALL_TAG && nodeA->getTag() == BOTTOM_TAG) {
+            nodeB->removeFromParentAndCleanup(true);
         }
         
     }
@@ -178,8 +195,8 @@ void GameScene::caseBallCollision (Node *ball) {
         auto text = Label::createWithTTF(MSG_OVER, FONT, 40);
         text->setPosition(width/2, height/2);
         addChild(text);
-        
-        auto menu_item_start = MenuItemFont::create("Restart", CC_CALLBACK_1(GameScene::NextLevel, this));
+        auto menu_item_start = MenuItemFont::create(MSG_RESTART, CC_CALLBACK_1(GameScene::NextLevel, this));
+        menu_item_start->setFontNameObj(FONT);
         menu_item_start->setPosition(text->getPosition());
         menu_item_start->setPositionY(menu_item_start->getPositionY()-50);
         auto *menu = Menu::create(menu_item_start, NULL);
@@ -198,7 +215,7 @@ void GameScene::caseBallCore (Node *core, Node *ball) {
     
     auto callbackRotate = CallFunc::create([=](){
         level = level + 1;
-        auto menu_item_start = MenuItemFont::create("Next Level", CC_CALLBACK_1(GameScene::NextLevel, this));
+        auto menu_item_start = MenuItemFont::create(MSG_NEXT_LEVEL, CC_CALLBACK_1(GameScene::NextLevel, this));
         menu_item_start->setPosition(Point(width / 2, (height / 2)));
         auto *menu = Menu::create(menu_item_start, NULL);
         menu->setPosition(Point(0, 0));
@@ -226,7 +243,7 @@ void GameScene::NextLevel(Ref *pSender) {
 }
 
 void GameScene::setLevel(int level) {
-    level = level;
+    this->level = level;
     char level_text[256];
     sprintf(level_text,"Level %d", level);
     auto text = Label::createWithTTF(level_text, FONT, 30);
@@ -237,7 +254,9 @@ void GameScene::setLevel(int level) {
 
 // Power-up: salva o nível atual
 void GameScene::saveLevel() {
-    if (rand_0_1() < DROP_LEVEL_SAVE && over == false){
+    if (over) return;
+    
+    if (rand_0_1() < DROP_LEVEL_SAVE){
         auto ball_draw = DrawNode::create();
         ball_draw->drawDot(Vec2(0, 0), BALL_SIZE/3.0, Color4F(COLOR_green));
         
@@ -252,7 +271,7 @@ void GameScene::saveLevel() {
         ball_draw->setTag(SAVE_TAG);
         
         ball_draw->setPosition(width * rand_0_1(), height);
-        addChild(ball_draw);
+        addChild(ball_draw, 20);
     }
     
     auto delay = DelayTime::create(1.0);
@@ -264,11 +283,15 @@ void GameScene::saveLevel() {
 
 // Power-up: deixa 3 bolas na tela ao invés de 1
 void GameScene::tripleBallsAppearance() {
-    if (rand_0_1() < DROP_TRIPLE_BALL && over == false){
+    if (over) return;
+    double delta = (time(NULL)-last_touch);
+    
+    if (rand_0_1() < delta*DROP_TRIPLE_BALL){
+        last_touch = time(NULL);
+        
         auto ball_draw = DrawNode::create();
         ball_draw->drawDot(Vec2(0, 0), BALL_SIZE/3.0, Color4F(COLOR_pink));
         
-        
         auto physicsBody = PhysicsBody::createCircle(BALL_SIZE/3.0, PhysicsMaterial(0.0f, 1.0f, 0.0f));
         physicsBody->setGravityEnable(true);
         physicsBody->setVelocity(Vec2(0,0));
@@ -280,7 +303,7 @@ void GameScene::tripleBallsAppearance() {
         ball_draw->setTag(THREE_BALLS_TAG);
         
         ball_draw->setPosition(width * rand_0_1(), height);
-        addChild(ball_draw);
+        addChild(ball_draw, 20);
     }
     
     auto delay = DelayTime::create(1.0);
@@ -297,6 +320,8 @@ void GameScene::caseTripleBalls(Node *powerup_ball) {
 }
 
 void GameScene::paddleBallAppearance() {
+    if (over) return;
+    
     if (rand_0_1() < DROP_RACKET_BALL && over == false){
         auto ball_draw = DrawNode::create();
         ball_draw->drawDot(Vec2(0, 0), BALL_SIZE/3.0, Color4F(COLOR_blue));
@@ -312,7 +337,7 @@ void GameScene::paddleBallAppearance() {
         ball_draw->setTag(RACKET_BALL_TAG);
         
         ball_draw->setPosition(width * rand_0_1(), height);
-        addChild(ball_draw);
+        addChild(ball_draw, 20);
     }
     
     auto delay = DelayTime::create(1.0);
@@ -346,3 +371,42 @@ void GameScene::alert(std::string text) {
         display_label->runAction(FadeOut::create(3));
     }
 }
+
+// Power-up: deixa 3 bolas na tela ao invés de 1
+void GameScene::superBallAppearance() {
+    if (over) return;
+    
+    if (rand_0_1() < DROP_SUPER_BALL){
+        last_touch = time(NULL);
+        
+        auto ball_draw = DrawNode::create();
+        ball_draw->drawDot(Vec2(0, 0), BALL_SIZE/3.0, Color4F(COLOR_orange));
+        
+        auto physicsBody = PhysicsBody::createCircle(BALL_SIZE/3.0, PhysicsMaterial(0.0f, 1.0f, 0.0f));
+        physicsBody->setGravityEnable(true);
+        physicsBody->setVelocity(Vec2(0,0));
+        physicsBody->setLinearDamping(0.0);
+        physicsBody->setMass(1.0f);
+        physicsBody->setContactTestBitmask(0xFFFFFFFF);
+        physicsBody->setGroup(-1);
+        ball_draw->addComponent(physicsBody);
+        ball_draw->setTag(SUPERBALL_TAG);
+        
+        ball_draw->setPosition(width * rand_0_1(), height);
+        addChild(ball_draw, 20);
+    }
+    
+    auto delay = DelayTime::create(1.0);
+    CallFunc *runCallback = CallFunc::create(CC_CALLBACK_0(GameScene::superBallAppearance, this));
+    auto seq = Sequence::create(delay, runCallback, nullptr);
+    runAction(seq);
+}
+
+void GameScene::caseSuperBall(Node *powerup_ball) {
+    if (over) return;
+    alert(MSG_SUPER_BALL);
+    Vector<Node *>  balls_vector = balls->getChildren();
+    Ball* ball = (Ball*) balls_vector.at(0);
+    ball->setSuperball();
+    powerup_ball->removeFromParentAndCleanup(true);
+}

Classes/GameScene.h

@@ -30,13 +30,15 @@ class GameScene : public cocos2d::Layer {
         void caseTripleBalls(Node *powerup_ball);
         void paddleBallAppearance();
         void caseRaqueteBall(Node *powerup_ball);
+        void superBallAppearance();
+        void caseSuperBall(Node *powerup_ball);
         void addAndThrowBall();
         int level;
         bool over; // salva se o jogo acabou!
         Paddle * paddle;
         cocos2d::Node* balls; // Bolas
         double height, width; // tamanho do quadro
-        int last_touch; // ultima vez que a bola colidiu com algo
+        unsigned long int last_touch; // ultima vez que a bola colidiu com algo
 };
 
 

Classes/GameScene/Ball.cpp

@@ -10,9 +10,13 @@
 USING_NS_CC;
 
 bool Ball::init() {
-    auto ball_draw = DrawNode::create();
+    ball_draw = DrawNode::create();
     ball_draw->drawDot(Vec2(0, 0), BALL_SIZE, Color4F(COLOR_grey));
-    this->addChild(ball_draw);
+    addChild(ball_draw);
+    
+    superball_draw = DrawNode::create();
+    superball_draw->drawDot(Vec2(0, 0), BALL_SIZE, Color4F(COLOR_orange));
+    addChild(superball_draw);
     
     auto material = PHYSICSBODY_MATERIAL_DEFAULT;
     material.density = 0.0f;
@@ -28,8 +32,10 @@ bool Ball::init() {
     physicsBody->setContactTestBitmask(0xFFFFFFFF);
     physicsBody->setGroup(-5);
     
-    this->addComponent(physicsBody);
-    this->setTag(BALL_TAG);
+    addComponent(physicsBody);
+    setTag(BALL_TAG);
+    
+    resetNormalball();
     
     return true;
 }
@@ -40,3 +46,16 @@ void Ball::throwBall () {
     float y = cosf(ang) * INITIAL_SPEED;
     this->getPhysicsBody()->setVelocity(Vec2(x, y));
 }
+
+
+void Ball::setSuperball() {
+    superball = true;
+    ball_draw->setVisible(false);
+    superball_draw->setVisible(true);
+}
+
+void Ball::resetNormalball() {
+    superball = false;
+    ball_draw->setVisible(true);
+    superball_draw->setVisible(false);
+}

Classes/GameScene/Ball.h

@@ -13,6 +13,12 @@ class Ball : public cocos2d::Node {
         virtual bool init();
         void throwBall();
         CREATE_FUNC(Ball);
+        bool superball;
+        void setSuperball();
+        void resetNormalball();
+    private:
+        cocos2d::DrawNode* ball_draw;
+        cocos2d::DrawNode* superball_draw;
 };
 
 #endif /* Ball_h */

Classes/params.h

@@ -42,11 +42,13 @@
 #define THREE_BALLS_TAG 9
 #define SAVE_TAG 8
 #define RACKET_BALL_TAG 7
+#define SUPERBALL_TAG 6
 
 // Probabilities
-#define DROP_LEVEL_SAVE 0
-#define DROP_TRIPLE_BALL 0
-#define DROP_RACKET_BALL 1
+#define DROP_LEVEL_SAVE 0.05
+#define DROP_TRIPLE_BALL 0.05 // Aumenta com o tempo
+#define DROP_RACKET_BALL 0.15
+#define DROP_SUPER_BALL 0.05
 
 
 #define POWER_UP_PADDLE_SECONDS 10
@@ -55,7 +57,7 @@
 #define LOSE_IS 12
 
 // FONT
-#define FONT "fonts/Marker Felt.ttf"
+#define FONT "fonts/abel.ttf"
 
 // TEXT
 #define MSG_TRIPE_BALLS "Triple Balls!"
@@ -65,6 +67,10 @@
 #define MSG_DOUBLE_PADDLE "Doubled paddle!"
 #define MSG_HALF_PADDLE "Half paddle :("
 #define MSG_LEVEL_BACK "You are at level %d. In %.1f hour(s) you will regrow a level."
+#define MSG_NEXT_LEVEL "Next Level"
+#define MSG_RESTART "Restart"
+#define MSG_SUPER_BALL "Super Ball!"
+#define MSG_START "Start"
 
 // DEBUG
 #define DEBUG 0

proj.ios_mac/RedCore.xcodeproj/project.pbxproj

@@ -15,12 +15,6 @@
 		294D0D641D0D56D500F7F5D4 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 294D0D631D0D56D500F7F5D4 /* CoreText.framework */; };
 		3EACC98F19EE6D4300EB3C5E /* res in Resources */ = {isa = PBXBuildFile; fileRef = 3EACC98E19EE6D4300EB3C5E /* res */; };
 		3EACC99019EE6D4300EB3C5E /* res in Resources */ = {isa = PBXBuildFile; fileRef = 3EACC98E19EE6D4300EB3C5E /* res */; };
-		46880B7B19C43A67006E1F66 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7619C43A67006E1F66 /* CloseNormal.png */; };
-		46880B7C19C43A67006E1F66 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7619C43A67006E1F66 /* CloseNormal.png */; };
-		46880B7D19C43A67006E1F66 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7719C43A67006E1F66 /* CloseSelected.png */; };
-		46880B7E19C43A67006E1F66 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7719C43A67006E1F66 /* CloseSelected.png */; };
-		46880B8119C43A67006E1F66 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7A19C43A67006E1F66 /* HelloWorld.png */; };
-		46880B8219C43A67006E1F66 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7A19C43A67006E1F66 /* HelloWorld.png */; };
 		503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 503AE0F617EB97AB00D1A890 /* Icon.icns */; };
 		503AE10017EB989F00D1A890 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FB17EB989F00D1A890 /* AppController.mm */; };
 		503AE10117EB989F00D1A890 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FC17EB989F00D1A890 /* main.m */; };
@@ -128,9 +122,6 @@
 		288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		294D0D631D0D56D500F7F5D4 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; };
 		3EACC98E19EE6D4300EB3C5E /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
-		46880B7619C43A67006E1F66 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = "<group>"; };
-		46880B7719C43A67006E1F66 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = "<group>"; };
-		46880B7A19C43A67006E1F66 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = "<group>"; };
 		503AE0F617EB97AB00D1A890 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
 		503AE0F717EB97AB00D1A890 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		503AE0FA17EB989F00D1A890 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = SOURCE_ROOT; };
@@ -318,9 +309,6 @@
 			children = (
 				521A8EA819F11F5000D177D7 /* fonts */,
 				3EACC98E19EE6D4300EB3C5E /* res */,
-				46880B7619C43A67006E1F66 /* CloseNormal.png */,
-				46880B7719C43A67006E1F66 /* CloseSelected.png */,
-				46880B7A19C43A67006E1F66 /* HelloWorld.png */,
 			);
 			name = Resources;
 			path = ../Resources;
@@ -509,8 +497,6 @@
 				5087E77F17EB970100C73F5D /* Default@2x.png in Resources */,
 				50EF629917ECD46A001EB2F8 /* Icon-100.png in Resources */,
 				5087E78317EB970100C73F5D /* Icon-152.png in Resources */,
-				46880B8119C43A67006E1F66 /* HelloWorld.png in Resources */,
-				46880B7D19C43A67006E1F66 /* CloseSelected.png in Resources */,
 				5087E77D17EB970100C73F5D /* Default-568h@2x.png in Resources */,
 				5087E78517EB970100C73F5D /* Icon-72.png in Resources */,
 				521A8E6519F0C34300D177D7 /* Default-736h@3x.png in Resources */,
@@ -526,7 +512,6 @@
 				5087E78417EB970100C73F5D /* Icon-57.png in Resources */,
 				5087E77E17EB970100C73F5D /* Default.png in Resources */,
 				521A8E6419F0C34300D177D7 /* Default-667h@2x.png in Resources */,
-				46880B7B19C43A67006E1F66 /* CloseNormal.png in Resources */,
 				50EF629717ECD46A001EB2F8 /* Icon-58.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -535,12 +520,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				46880B8219C43A67006E1F66 /* HelloWorld.png in Resources */,
 				503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */,
 				3EACC99019EE6D4300EB3C5E /* res in Resources */,
 				521A8EAA19F11F5000D177D7 /* fonts in Resources */,
-				46880B7C19C43A67006E1F66 /* CloseNormal.png in Resources */,
-				46880B7E19C43A67006E1F66 /* CloseSelected.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

proj.ios_mac/RedCore.xcodeproj/xcuserdata/capella.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -67,5 +67,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../Classes/GameScene.cpp"
+            timestampString = "518835408.157334"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "198"
+            endingLineNumber = "198"
+            landmarkName = "GameScene::caseBallCollision (Node *ball)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../Classes/GameScene.cpp"
+            timestampString = "518835408.157334"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "409"
+            endingLineNumber = "409"
+            landmarkName = "GameScene::caseSuperBall(Node *powerup_ball)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>