Pango - 2nd PR (#306)

Lots of Pango improvements

main/modes/games/pango/paEntity.h

@@ -24,7 +24,8 @@ typedef enum
     PA_ENTITY_BREAK_BLOCK,
     PA_ENTITY_BLOCK_FRAGMENT,
     ENTITY_HIT_BLOCK,
-    ENTITY_DEAD
+    ENTITY_DEAD,
+    PA_ENTITY_SCORE_DISPLAY
 } paEntityIndex_t;
 
 typedef enum
@@ -64,10 +65,11 @@ typedef enum
 
 typedef void (*pa_updateFunction_t)(struct paEntity_t* self);
 typedef void (*pa_collisionHandler_t)(struct paEntity_t* self, struct paEntity_t* other);
-typedef bool (*PA_TILE_CollisionHandler_t)(struct paEntity_t* self, uint8_t tileId, uint8_t tx, uint8_t ty,
-                                           uint8_t direction);
+typedef bool (*pa_tileCollisionHandler_t)(struct paEntity_t* self, uint8_t tileId, uint8_t tx, uint8_t ty,
+                                          uint8_t direction);
 typedef void (*pa_fallOffTileHandler_t)(struct paEntity_t* self);
 typedef void (*pa_overlapTileHandler_t)(struct paEntity_t* self, uint8_t tileId, uint8_t tx, uint8_t ty);
+typedef void (*pa_drawHandler_t)(struct paEntity_t* self);
 
 struct paEntity_t
 {
@@ -107,11 +109,7 @@ struct paEntity_t
     uint8_t homeTileX;
     uint8_t homeTileY;
 
-    int16_t jumpPower;
-
     bool visible;
-    uint8_t hp;
-    int8_t invincibilityFrames;
     uint16_t scoreValue;
 
     uint8_t targetTileX;
@@ -126,9 +124,9 @@ struct paEntity_t
     paEntityManager_t* entityManager;
 
     pa_collisionHandler_t collisionHandler;
-    PA_TILE_CollisionHandler_t tileCollisionHandler;
-    pa_fallOffTileHandler_t fallOffTileHandler;
+    pa_tileCollisionHandler_t tileCollisionHandler;
     pa_overlapTileHandler_t overlapTileHandler;
+    pa_drawHandler_t drawHandler;
 };
 
 //==============================================================================
@@ -185,7 +183,13 @@ void killPlayer(paEntity_t* self);
 void drawEntityTargetTile(paEntity_t* self);
 
 bool pa_hitBlockTileCollisionHandler(paEntity_t* self, uint8_t tileId, uint8_t tx, uint8_t ty, uint8_t direction);
+void pa_executeSpawnBlockCombo(paEntity_t* self, uint8_t tx, uint8_t ty, uint16_t scoreIndex);
 void pa_updateBreakBlock(paEntity_t* self);
 void pa_updateBlockFragment(paEntity_t* self);
+void pa_updateScoreDisplay(paEntity_t* self);
+void pa_defaultEntityDrawHandler(paEntity_t* self);
+void pa_scoreDisplayDrawHandler(paEntity_t* self);
+int16_t pa_enemySetAggroStateTimer(paEntity_t* self);
+uint16_t pa_correctPlayerFacingDirection(int16_t btnState, uint16_t currentFacingDirection);
 
 #endif

main/modes/games/pango/paEntityManager.c

@@ -68,22 +68,17 @@ void pa_deactivateAllEntities(paEntityManager_t* entityManager, bool excludePlay
     for (uint8_t i = 0; i < MAX_ENTITIES; i++)
     {
         paEntity_t* currentEntity = &(entityManager->entities[i]);
-        currentEntity->active     = false;
 
-        // clear out invisible block tiles that are placed for every Break Block object
-        // if(currentEntity->type == PA_ENTITY_BREAK_BLOCK){
-        //     pa_setTile(currentEntity->tilemap, PA_TO_TILECOORDS(currentEntity->x >> SUBPIXEL_RESOLUTION),
-        //     PA_TO_TILECOORDS(currentEntity->y >> SUBPIXEL_RESOLUTION), PA_TILE_EMPTY);
-        // }
-
-        if (currentEntity->type == ENTITY_HIT_BLOCK && currentEntity->jumpPower == PA_TILE_SPAWN_BLOCK_0)
+        if (currentEntity->active == false || (excludePlayer && currentEntity == entityManager->playerEntity))
         {
-            entityManager->gameData->remainingEnemies--;
+            continue;
         }
 
-        if (excludePlayer && currentEntity == entityManager->playerEntity)
+        currentEntity->active = false;
+
+        if (currentEntity->type == ENTITY_HIT_BLOCK && currentEntity->state == PA_TILE_SPAWN_BLOCK_0)
         {
-            currentEntity->active = true;
+            entityManager->gameData->remainingEnemies--;
         }
     }
 
@@ -99,13 +94,7 @@ void pa_drawEntities(paEntityManager_t* entityManager)
 
         if (currentEntity.active && currentEntity.visible)
         {
-            drawWsg(entityManager->wsgManager->sprites[currentEntity.spriteIndex].wsg,
-                    (currentEntity.x >> SUBPIXEL_RESOLUTION)
-                        - entityManager->wsgManager->sprites[currentEntity.spriteIndex].originX
-                        - entityManager->tilemap->mapOffsetX,
-                    (currentEntity.y >> SUBPIXEL_RESOLUTION) - entityManager->tilemap->mapOffsetY
-                        - entityManager->wsgManager->sprites[currentEntity.spriteIndex].originY,
-                    currentEntity.spriteFlipHorizontal, currentEntity.spriteFlipVertical, 0);
+            currentEntity.drawHandler(&currentEntity);
         }
     }
 }
@@ -207,9 +196,7 @@ paEntity_t* pa_createPlayer(paEntityManager_t* entityManager, uint16_t x, uint16
     entity->gravityEnabled     = false;
     entity->gravity            = 4;
     entity->falling            = false;
-    entity->jumpPower          = 0;
     entity->spriteFlipVertical = false;
-    entity->hp                 = 1;
     entity->animationTimer     = 0; // Used as a cooldown for shooting square wave balls
     entity->state              = PA_PL_ST_NORMAL;
     entity->stateTimer         = -1;
@@ -219,8 +206,8 @@ paEntity_t* pa_createPlayer(paEntityManager_t* entityManager, uint16_t x, uint16
     entity->updateFunction       = &pa_updatePlayer;
     entity->collisionHandler     = &pa_playerCollisionHandler;
     entity->tileCollisionHandler = &pa_playerTileCollisionHandler;
-    entity->fallOffTileHandler   = &defaultFallOffTileHandler;
     entity->overlapTileHandler   = &pa_playerOverlapTileHandler;
+    entity->drawHandler          = &pa_defaultEntityDrawHandler;
     return entity;
 }
 
@@ -260,8 +247,8 @@ paEntity_t* createCrabdozer(paEntityManager_t* entityManager, uint16_t x, uint16
     entity->updateFunction       = &updateCrabdozer;
     entity->collisionHandler     = &pa_enemyCollisionHandler;
     entity->tileCollisionHandler = &pa_enemyTileCollisionHandler;
-    entity->fallOffTileHandler   = &defaultFallOffTileHandler;
     entity->overlapTileHandler   = &pa_defaultOverlapTileHandler;
+    entity->drawHandler          = &pa_defaultEntityDrawHandler;
 
     return entity;
 }
@@ -288,16 +275,17 @@ paEntity_t* pa_createBreakBlock(paEntityManager_t* entityManager, uint16_t x, ui
     entity->gravity              = 0;
     entity->spriteFlipHorizontal = false;
     entity->spriteFlipVertical   = false;
-    entity->scoreValue           = 100;
+    entity->scoreValue           = 0;
     entity->animationTimer       = 0;
     entity->type                 = PA_ENTITY_BREAK_BLOCK;
     entity->spriteIndex          = PA_SP_BREAK_BLOCK;
     entity->facingDirection      = PA_DIRECTION_NONE;
     entity->updateFunction       = &pa_updateBreakBlock;
     entity->collisionHandler     = &pa_dummyCollisionHandler;
     entity->tileCollisionHandler = &pa_dummyTileCollisionHandler;
-    entity->fallOffTileHandler   = &defaultFallOffTileHandler;
     entity->overlapTileHandler   = &pa_defaultOverlapTileHandler;
+    entity->drawHandler          = &pa_defaultEntityDrawHandler;
+    entity->state                = 0;
 
     pa_setTile(entityManager->tilemap, PA_TO_TILECOORDS(x), PA_TO_TILECOORDS(y), PA_TILE_EMPTY);
 
@@ -323,7 +311,7 @@ paEntity_t* pa_createBlockFragment(paEntityManager_t* entityManager, uint16_t x,
     entity->xMaxSpeed            = 132;
     entity->yMaxSpeed            = 132;
     entity->gravityEnabled       = true;
-    entity->gravity              = 0;
+    entity->gravity              = 4;
     entity->spriteFlipHorizontal = false;
     entity->spriteFlipVertical   = false;
     entity->scoreValue           = 100;
@@ -334,8 +322,8 @@ paEntity_t* pa_createBlockFragment(paEntityManager_t* entityManager, uint16_t x,
     entity->updateFunction       = &pa_updateBlockFragment;
     entity->collisionHandler     = &pa_dummyCollisionHandler;
     entity->tileCollisionHandler = &pa_dummyTileCollisionHandler;
-    entity->fallOffTileHandler   = &defaultFallOffTileHandler;
     entity->overlapTileHandler   = &pa_defaultOverlapTileHandler;
+    entity->drawHandler          = &pa_defaultEntityDrawHandler;
 
     return entity;
 }
@@ -370,10 +358,48 @@ paEntity_t* createHitBlock(paEntityManager_t* entityManager, uint16_t x, uint16_
     entity->type                 = ENTITY_HIT_BLOCK;
     entity->spriteIndex          = PA_SP_BLOCK;
     entity->animationTimer       = 0;
+    entity->scoreValue           = 0;
     entity->updateFunction       = &updateHitBlock;
     entity->collisionHandler     = &pa_dummyCollisionHandler;
     entity->tileCollisionHandler = &pa_hitBlockTileCollisionHandler;
     entity->overlapTileHandler   = &pa_defaultOverlapTileHandler;
+    entity->drawHandler          = &pa_defaultEntityDrawHandler;
+
+    return entity;
+}
+
+paEntity_t* pa_createScoreDisplay(paEntityManager_t* entityManager, uint16_t x, uint16_t y)
+{
+    paEntity_t* entity = pa_findInactiveEntity(entityManager);
+
+    if (entity == NULL)
+    {
+        return NULL;
+    }
+
+    entity->active  = true;
+    entity->visible = true;
+    entity->x       = x << SUBPIXEL_RESOLUTION;
+    entity->y       = y << SUBPIXEL_RESOLUTION;
+
+    entity->xspeed         = 0;
+    entity->yspeed         = 0;
+    entity->gravityEnabled = false;
+    entity->gravity        = 0;
+
+    entity->spriteFlipHorizontal = false;
+    entity->spriteFlipVertical   = false;
+
+    entity->type                 = PA_ENTITY_SCORE_DISPLAY;
+    entity->spriteIndex          = 0;
+    entity->animationTimer       = 0;
+    entity->scoreValue           = 0;
+    entity->stateTimer           = 0;
+    entity->updateFunction       = &pa_updateScoreDisplay;
+    entity->collisionHandler     = &pa_dummyCollisionHandler;
+    entity->tileCollisionHandler = &pa_hitBlockTileCollisionHandler;
+    entity->overlapTileHandler   = &pa_defaultOverlapTileHandler;
+    entity->drawHandler          = &pa_scoreDisplayDrawHandler;
 
     return entity;
 }

main/modes/games/pango/paEntityManager.h

@@ -64,5 +64,6 @@ void pa_freeEntityManager(paEntityManager_t* entityManager);
 paEntity_t* pa_spawnEnemyFromSpawnBlock(paEntityManager_t* entityManager);
 paEntity_t* pa_createBreakBlock(paEntityManager_t* entityManager, uint16_t x, uint16_t y);
 paEntity_t* pa_createBlockFragment(paEntityManager_t* entityManager, uint16_t x, uint16_t y);
+paEntity_t* pa_createScoreDisplay(paEntityManager_t* entityManager, uint16_t x, uint16_t y);
 
 #endif