Add files via upload

Author: retsyn

PouletAPlus.ino

@@ -1,6 +1,10 @@
 #include <Arduboy2.h>
+#include <Tinyfont.h>
+#include <math.h>
+
 
 Arduboy2 arduboy;
+Tinyfont tinyfont = Tinyfont(arduboy.sBuffer, Arduboy2::width(), Arduboy2::height());
 
 #include "poulet.h"
 #include "graphics.h"
@@ -9,6 +13,8 @@ Arduboy2 arduboy;
 #include "entity.h"
 #include "physics.h"
 #include "numbers.h"
+#include "sprite.h"
+
 
 
 // Forward declaration of essential types:
@@ -17,13 +23,7 @@ struct Game;
 
 Entity player;
 Game game;
-
-// later I'll init this as zero size
-Entity ents[4];
-
-
-// Init player
-
+Entity ents[10];
 
 
 void setup() {
@@ -32,6 +32,18 @@ void setup() {
   player.walkSpeed = 1;
   player.walkAccel = 0.1;
   player.animSpeed = 4;
+  player.image = poulet;
+
+  // Put a few test cats in
+
+  /*
+  create(1, 30, 10, ents); 
+  create(1, 40, 20, ents);
+  create(1, 50, 30, ents);
+  create(1, 60, 40, ents);
+  create(1, 70, 50, ents);
+  create(1, 80, 60, ents);
+  */
 
   game.mode = 1;
 
@@ -56,7 +68,7 @@ void loop() {
   arduboy.clear();
 
   if(game.mode == 0){
-    play(&player, &game);
+    play(&player, &game, ents);
   }
 
   if(game.mode == 1){
@@ -72,15 +84,18 @@ void loop() {
 
 
 void title(Game *g){
+  
   Sprites::drawOverwrite(0, -10, titlescreen, 0);
   arduboy.setCursor(40, 40);
   arduboy.print("Start");
   arduboy.setCursor(40, 48);
+  
   if(g->debug == false){
     arduboy.print("Debug: Off");
   } else {
     arduboy.print("Debug: On");
   }
+  
   arduboy.setCursor(40, 56);
   arduboy.print("Sound: Off");
 
@@ -97,7 +112,6 @@ void title(Game *g){
   arduboy.setCursor(30, (40 + (g->menuItem * 8)));
   arduboy.print(">");
 
-
   if(arduboy.justPressed(LEFT_BUTTON) || arduboy.justPressed(RIGHT_BUTTON)){
     if(g->menuItem == 1){
       if(g->debug){
@@ -111,7 +125,9 @@ void title(Game *g){
 }
 
 
-void play(Entity *p, Game *g){
+void play(Entity *p, Game *g, Entity *ents){
+
+  int i = 0;
 
   if (arduboy.pressed(LEFT_BUTTON)){
     p->ax -= p->walkAccel; 
@@ -125,15 +141,29 @@ void play(Entity *p, Game *g){
   }
   if (arduboy.justPressed(A_BUTTON)){
     // YOU WIN!
-    g->score += 1000;
+    g->score += 10;
+    create(1, p->x, p->y - 10, ents); 
+
   }
 
-  physicsUpdate(&player);
+  physicsUpdate(p);
+  for(i = 0; i < sizeof(ents); i++){
+    physicsUpdate(&ents[i]);
+  }
+  
   camera(&player, &game);
   if(game.debug) debug(&player, &game);
   drawLevel(0, 0, &game);
-  showHUD(&game);
+
   animation(p, g);
+  drawSprite(g, p);
+  
+  for(i = 0; i < ENT_MAX; i++){
+    animation (&ents[i], g);
+    drawSprite(g, &ents[i]);
+  }
+  
+  showHUD(g);
 
 }
 
@@ -152,7 +182,8 @@ void gameInit(Entity *p, Game *g){
 }
 
 
-void animation(Entity *p, Game *game){
+void animation(Entity *p, Game *g){
+  int i = 0;
 
   p->ticker += abs(p->ax);
   if(p->ticker >= p->animSpeed){
@@ -165,7 +196,6 @@ void animation(Entity *p, Game *game){
 
   if(p->ax > 0) p->flip = 0;
   if(p->ax < 0) p->flip = 8;
-
   if(p->ax == 0) p->frame = 0;
 
 
@@ -174,8 +204,6 @@ void animation(Entity *p, Game *game){
     if(p->ay > 0) p->frame = 7;
   }
 
-  Sprites::drawPlusMask(p->x - game->camerax, p->y, poulet, p->frame + p->flip);
-
 }
 
 
@@ -193,19 +221,19 @@ void camera(Entity *p, Game *game){
 }
 
 
-void debug(Entity *p, Game *game){ 
-  arduboy.print("X: ");
-  arduboy.print(p->x);
-  arduboy.print("  Y: ");
-  arduboy.print(p->y);
-  arduboy.print("\nTX: ");
-  arduboy.print(floor(p->x / 8));
-  arduboy.print("  TY: ");
-  arduboy.print(floor(p->y / 8));
-  arduboy.print("\nAX: ");
-  arduboy.print(p->ax);
-  arduboy.print("  AY: ");
-  arduboy.print(p->ay);
+void debug(Entity *p, Game *g){ 
+
+  tinyfont.setCursor(1, 0);
+  tinyfont.print("Debug Mode");
+  tinyfont.setCursor(1, 5);
+  tinyfont.print("p.X:");  
+  tinyfont.print(int(p->x));
+  tinyfont.print(" p.Y:");  
+  tinyfont.print(int(p->y));
+  tinyfont.setCursor(1, 10);
+  tinyfont.print("Score: ");
+  tinyfont.print(g->score);
+
 }
 
 

entity.cpp

@@ -4,4 +4,39 @@
  * Functions for adding, removing, and updating entities.
  */
 
- 
+#include "poulet.h"
+#include "entity.h"
+#include "graphics.h"
+#include "physics.h"
+
+// create a new entity in the world.
+void create(int type, float x, float y, struct Entity e[]){
+
+  int newIndex = 0;
+  int i = 0;
+  int elementSize = 0;
+
+  // Iterate through what's still alive and active to not overwrite anything...
+  for(i = 0; i < ENT_MAX; i++){
+    if(e[i].alive = 0){
+      break;
+    }
+  }
+
+  newIndex = i;
+  e[i].alive = true;
+  
+  // Now we assign values to the new index.
+  e[newIndex].x = x;
+  e[newIndex].y = y;
+
+
+  // Catch default case:
+  e[newIndex].image = cat;
+  
+  // Cat
+  if(type == 1){
+    e[newIndex].image = cat;
+  }
+}
+

entity.h

@@ -1,106 +1,9 @@
 #ifndef ENTITY_H
 #define ENTITY_H
 
+#include "poulet.h"
 
-void entPhysicsUpdate(struct Entity *e){
-
-  // Process the entity physics.
-  
-  int i; // iterator to check
-  bool blocked; // State if a wall is found during a check.
-
-  // lock the velocity to the set walkspeed.
-  if(e->ax > 0){
-    if(e->ax > e->walkSpeed){
-      e->ax = e->walkSpeed; 
-    }
-  } else {  
-    if(e->ax < -e->walkSpeed){
-      e->ax = -e->walkSpeed; 
-    }
-  }
-
-  // Apply gravity:
-  e->ay += gravity;
-
-
-  // Collision checks:
-  // Right
-  blocked = false;
-  if(e->ax > 0){
-    for(i = floor(e->x); i <= floor(e->x + e->ax); i++){
-      if((isSolid(i + 9, e->y)) || (isSolid(i + 9, floor(e->y + 7)))){
-        e->x = i;
-        blocked = true;
-        e->ax = 0;
-        break;
-      }
-    }
-    if(!blocked) e->x += e->ax;
-  }
-
-  // Left
-  blocked = false;
-  if(e->ax < 0){
-    for(i = floor(e->x); i >= floor(e->x + e->ax); i--){
-      if((isSolid(i-1, e->y)) || (isSolid(i-1, floor(e->y + 7)))){
-        e->x = i;
-        blocked = true;
-        e->ax = 0;
-        break;
-      }
-    }
-    if(!blocked) e->x += e->ax;
-  }
-
-  // Down
-  blocked = false;
-  if(e->ay > 0){
-    for(i = floor(e->y); i <= floor(e->y + e->ay); i++){
-      if((isSolid(e->x , i + 8)) || (isSolid(e->x + 8, i + 8))){
-        e->y = i;
-        blocked = true;
-        e->grounded = true;
-        e->ay = 0;
-        break;
-      } else {
-        e->grounded = false;
-      }
-    }
-    if(!blocked) e->y += e->ay;
-  }
-
-  // Up
-  blocked = false;
-  if(e->ay < 0){
-    for(i = floor(e->y); i >= floor(e->y + e->ay); i--){
-      if((isSolid(e->x, i-1)) || (isSolid(e->x + 8, i-1))){
-        e->y = i;
-        blocked = true;
-        e->ay = -e->ay;
-        break;
-      }
-    }
-    if(!blocked) e->y += e->ay;
-  }
-
-
-  // Handle falling out of world:
-  if(e->y > 128) e->y = -8;
-
-  // Add friction:
-  if(e->ax > 0){
-    e->ax -= groundFriction;
-  }
-  if(e->ax < 0){
-    e->ax += groundFriction;
-  }
-  if(abs(e->ax) < groundFriction){
-    e->ax = 0;
-  }
-}
-
-  
+void create(int type, float x, float y, struct Entity e[]);
 
 
 

numbers.h

@@ -27,7 +27,7 @@ void drawScore(long score){
     // blit a number here...
     // This is a real-time string compare, for better or for worse...
 
-  /*
+    /*
     if(charBuf[i] == '0')  
       Sprites::drawOverwrite(50 + ((i + pad) * 4), 0, num0, 0);
     if(charBuf[i] == '1')  
@@ -48,7 +48,8 @@ void drawScore(long score){
       Sprites::drawOverwrite(50 + ((i + pad) * 4), 0, num8, 0);
     if(charBuf[i] == '9')  
       Sprites::drawOverwrite(50 + ((i + pad) * 4), 0, num9, 0);
-  */
+
+    */
   }
 }