Beta release - 10 full levels, speedup after, nearly there?

Author: ahnlak

32blox.sublime-workspace

@@ -27,12 +27,13 @@
  * constructor - Spawns a ball at the specified location, of the specfied type
  */
 
-Ball::Ball( blit::Point p_origin, ball_type_t p_type )
+Ball::Ball( blit::Point p_origin, float p_speed, ball_type_t p_type )
 {
   /* Save the origin and type. */
   location.x = p_origin.x;
   location.y = p_origin.y;
   ball_type = p_type;
+  speed = p_speed;
 
   /* And set some defaults, for now. */
   vector = blit::Vec2( 0, 0 );
@@ -153,7 +154,7 @@ void Ball::launch( void )
 {
   /* First off, start with a launch-speed vertical vector. */
   vector.x = 0;
-  vector.y = -1.5;
+  vector.y = speed * -1.0f;
 
   /* And apply a launch angle to that. */
   vector.rotate( compute_bat_angle() );
@@ -174,7 +175,7 @@ void Ball::randomise( void )
 {
   /* First off, start with a launch-speed vertical vector. */
   vector.x = 0;
-  vector.y = -1.5;
+  vector.y = speed * -1.0f;
 
   /* And apply a random angle to it. */
   vector.rotate( (float)( blit::random() % 180 ) / 100.0f - 0.9f );

Ball.cpp

@@ -23,14 +23,15 @@ class Ball
 private:
   blit::Vec2    location;
   blit::Vec2    vector;
+  float         speed;
   ball_type_t   ball_type;
   blit::Rect    bat_position;
   const uint8_t ball_size[BALL_MAX] = { 8, 6 };
   float         compute_bat_angle( void );
   blit::Point   get_render_location( void );
 
 public:
-                Ball( blit::Point, ball_type_t = BALL_NORMAL );
+                Ball( blit::Point, float = 1.5, ball_type_t = BALL_NORMAL );
   blit::Rect    get_bounds( void );
   ball_type_t   get_type( void );
   bool          moving_up( void );

Ball.hpp

@@ -216,7 +216,7 @@ void GameState::spawn_ball( bool pBat )
     }
 
     /* create a new ball. */
-    l_ball = new Ball( l_ballpos );
+    l_ball = new Ball( l_ballpos, level->get_ball_speed() );
 
     /* Stick it to the bat. */
     l_ball->stuck = true;
@@ -228,7 +228,7 @@ void GameState::spawn_ball( bool pBat )
     l_ballpos = l_current_ball->get_bounds().center();
 
     /* create a new ball. */
-    l_ball = new Ball( l_ballpos );
+    l_ball = new Ball( l_ballpos, level->get_ball_speed() );
     l_ball->randomise();
   }
 
@@ -670,8 +670,9 @@ gamestate_t GameState::update( uint32_t p_time )
   /* If there are no more balls in play, then we lose a life. */
   if ( std::distance( balls.begin(), balls.end() ) == 0 )
   {
-    /* Switch the bat back to standard speed, too. */
+    /* Switch the bat back to standard type and speed, too. */
     bat_speed = 1.0f;
+    bat_type = BAT_NORMAL;
 
     /* Reduce our lives, spawn a fresh ball if we can. */
     lives--;

GameState.cpp

@@ -39,7 +39,7 @@ Level::Level( uint8_t p_level )
    * In a normal world, we'd load a level file based on level number. But as
    * we're embedded, level data is compiled in so we just access it.
    */
-  switch( p_level )
+  switch( ( p_level % LEVEL_MAX ) )
   {
     case 1:
       init( a_level_01, a_level_01_length );
@@ -50,6 +50,27 @@ Level::Level( uint8_t p_level )
     case 3:
       init( a_level_03, a_level_03_length );
       break;
+    case 4:
+      init( a_level_04, a_level_04_length );
+      break;
+    case 5:
+      init( a_level_05, a_level_05_length );
+      break;
+    case 6:
+      init( a_level_06, a_level_06_length );
+      break;
+    case 7:
+      init( a_level_07, a_level_07_length );
+      break;
+    case 8:
+      init( a_level_08, a_level_08_length );
+      break;
+    case 9:
+      init( a_level_09, a_level_09_length );
+      break;
+    case 0:
+      init( a_level_10, a_level_10_length );
+      break;
     default:
       init( nullptr, 0 );
       break;
@@ -164,5 +185,25 @@ uint8_t Level::hit_brick( blit::Point p_point )
   return 10;
 }
 
+
+/*
+ * get_ball_speed - works out how fast a standard ball should be moving, which
+ *                  is based on the level we're currently on. It's a cynical
+ *                  trick to increase difficulty without building load of new
+ *                  levels :-)
+ *
+ * Returns float, the speed of the ball
+ */
+
+float Level::get_ball_speed( void )
+{
+  float l_base_speed = 1.5f;
+
+  /* Levels are cyclic, and we have a speed bump for each complete cycle. */
+  l_base_speed += ( ( level - 1 ) / LEVEL_MAX ) / 2.0f;
+
+  /* All done, return it. */
+  return l_base_speed;
+}
 
 /* End of Level.cpp */

Level.cpp

@@ -14,6 +14,8 @@
 #define   BOARD_HEIGHT  15
 #define   BOARD_WIDTH   10
 
+#define   LEVEL_MAX     10
+
 class Level
 {
 private:
@@ -29,6 +31,7 @@ class Level
   uint8_t     get_brick( uint8_t, uint8_t );
   uint8_t     get_brick( blit::Point );
   uint8_t     hit_brick( blit::Point );
+  float       get_ball_speed( void );
 };
 
 #endif /* _LEVEL_HPP_ */

Level.hpp

@@ -25,6 +25,27 @@ assets_levels.cpp:
   assets/level03.csv: 
     name: "03"
 
+  assets/level04.csv: 
+    name: "04"
+
+  assets/level05.csv: 
+    name: "05"
+
+  assets/level06.csv: 
+    name: "06"
+
+  assets/level07.csv: 
+    name: "07"
+
+  assets/level08.csv: 
+    name: "08"
+
+  assets/level09.csv: 
+    name: "09"
+
+  assets/level10.csv: 
+    name: "10"
+
 
 assets_fonts.cpp:
   prefix: a_font_

assets.yml

@@ -1,4 +1,5 @@
-1,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
+5,4,3,2,1,1,2,3,4,5
+4,3,2,1,0,0,1,2,3,4
+3,2,1,0,0,0,0,1,2,3
+2,1,0,0,0,0,0,0,1,2
 1,0,0,0,0,0,0,0,0,1

assets/level04.csv

@@ -1,4 +1,5 @@
-1,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
 1,0,0,0,0,0,0,0,0,1
+2,1,0,0,0,0,0,0,1,2
+3,2,1,0,0,0,0,1,2,3
+4,3,2,1,0,0,1,2,3,4
+5,4,3,2,1,1,2,3,4,5

assets/level05.csv

@@ -1,4 +1,6 @@
-1,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
-1,0,0,0,0,0,0,0,0,1
+2,2,2,2,2,2,2,2,2,2
+2,0,0,0,0,0,0,0,0,2
+2,0,1,4,1,4,1,4,0,2
+2,0,4,1,4,1,4,1,0,2
+2,0,0,0,0,0,0,0,0,2
+2,2,2,2,2,2,2,2,2,2

assets/level06.csv

@@ -1,4 +1,10 @@
+0,0,0,0,0,0,0,0,0,0
 1,1,1,1,1,1,1,1,1,1
+0,0,0,0,0,0,0,0,0,0
+1,1,1,1,1,1,1,1,1,1
+0,0,0,0,0,0,0,0,0,0
+1,1,1,1,1,1,1,1,1,1
+0,0,0,0,0,0,0,0,0,0
+1,1,1,1,1,1,1,1,1,1
+0,0,0,0,0,0,0,0,0,0
 1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
-1,0,0,0,0,0,0,0,0,1

assets/level07.csv

@@ -1,4 +1,10 @@
+0,0,0,0,0,0,0,0,0,0
 1,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
-1,0,0,0,0,0,0,0,0,1
+0,0,0,0,0,0,0,0,0,0
+2,2,2,2,2,2,2,2,2,2
+0,0,0,0,0,0,0,0,0,0
+3,3,3,3,3,3,3,3,3,3
+0,0,0,0,0,0,0,0,0,0
+4,4,4,4,4,4,4,4,4,4
+0,0,0,0,0,0,0,0,0,0
+5,5,5,5,5,5,5,5,5,5

assets/level08.csv

@@ -1,4 +1,8 @@
-1,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1,1,1
+0,0,0,0,0,0,0,0,0,0
+0,0,0,1,1,1,1,0,0,0
 1,1,1,2,2,2,2,1,1,1
-1,0,0,0,0,0,0,0,0,1
+1,2,2,3,3,3,3,2,2,1
+1,2,3,4,5,5,4,3,2,1
+1,2,2,3,3,3,3,2,2,1
+1,1,1,2,2,2,2,1,1,1
+0,0,0,1,1,1,1,0,0,0

assets/level09.csv

@@ -1,4 +1,9 @@
 1,1,1,1,1,1,1,1,1,1
+1,7,7,7,1,1,7,7,1,1
+1,1,1,1,7,1,1,1,7,1
+1,1,1,1,7,1,1,1,7,1
+1,1,7,7,1,1,1,7,1,1
+1,1,1,1,7,1,7,1,1,1
+1,1,1,1,7,1,7,1,1,1
+1,7,7,7,1,1,7,7,7,1
 1,1,1,1,1,1,1,1,1,1
-1,1,1,2,2,2,2,1,1,1
-1,0,0,0,0,0,0,0,0,1

assets/level10.csv

@@ -3,10 +3,12 @@
 title: 32Blox
 description: A breakout clone
 author: ahnlak
+category: game
+url: https://github.com/ahnlak-blit32/32blox
 splash:
   file: assets/32blox-image.png
 icon:
   file: assets/32blox-icon.png
-version: v0.3.0a
+version: v0.9.0
 
 # End of metadata.yml