Adjusted everything in an attempt to make development easier

Added lumberjackGame.c and moved everything to it
Added menu to lumberjack so I can menu

emulator/src/extensions/modes/ext_modes.c

@@ -23,6 +23,7 @@
 #include "jukebox.h"
 #include "mainMenu.h"
 #include "pong.h"
+#include "lumberjack.h"
 #include "touchTest.h"
 #include "tunernome.h"
 
@@ -58,6 +59,7 @@ static swadgeMode_t* allSwadgeModes[] = {
     &jukeboxMode,
     &mainMenuMode,
     &pongMode,
+    &lumberjackMode,
     &touchTestMode,
     &tunernomeMode,
 };

main/CMakeLists.txt

@@ -21,6 +21,10 @@ idf_component_register(SRCS "swadge2024.c"
                             "modes/dance/dance.c"
                             "modes/dance/portableDance.c"
                             "modes/demo/demoMode.c"
+                            "modes/lumberjack/lumberjack.c"
+                            "modes/lumberjack/lumberjackGame.c"
+                            "modes/lumberjack/lumberjackEntity.c"
+                            "modes/lumberjack/lumberjackPlayer.c"
                             "modes/jukebox/jukebox.c"
                             "modes/mainMenu/mainMenu.c"
                             "modes/pong/pong.c"
@@ -65,6 +69,7 @@ idf_component_register(SRCS "swadge2024.c"
                                 "./modes/pong"
                                 "./modes/tunernome"
                                 "./modes/mainMenu"
+                                "./modes/lumberjack"
                                 "./modes/demo"
                                 "./modes/quickSettings")
 

main/modes/lumberjack/lumberjack.h

@@ -6,8 +6,33 @@
 #include "lumberjackEntity.h"
 #include "lumberjackPlayer.h"
 
+const static char* LUM_TAG = "LUM";
 extern swadgeMode_t lumberjackMode;
 
+typedef enum{
+    LUMBERJACK_MENU,
+    LUMBERJACK_A,
+    LUMBERJACK_B,
+}lumberjackScreen_t;
+
+typedef enum{
+    LUMBERJACK_NONE,
+    LUMBERJACK_PANIC,
+    LUMBERJACK_ATTACK
+}lumberjackGameType_t;
+
+typedef struct
+{
+    menu_t* menu;
+    menuLogbookRenderer_t* menuLogbookRenderer;
+    font_t ibm;
+    font_t logbook;
+
+    //The pass throughs
+    p2pInfo p2p;
+    lumberjackScreen_t screen;
+
+} lumberjack_t;
 
 typedef struct 
 {
@@ -24,6 +49,7 @@ typedef struct
 
 typedef struct
 {
+    bool loaded;
     font_t ibm;
     p2pInfo p2p;
     menu_t* menu;
@@ -46,18 +72,23 @@ typedef struct
     lumberjackTile_t tile[400];
     uint8_t anim[400];
 
-    wsg_t playerSprites[63];
     wsg_t enemySprites[21];
+    wsg_t playerSprites[41];
 
     wsg_t alertSprite;
 
+    wsg_t slowload[400];
+
     lumberjackEntity_t* enemy[8];
 
     lumberjackEntity_t* localPlayer;
     lumberjackEntity_t* remotePlayer;
 
+    lumberjackGameType_t gameType;
+
 } lumberjackVars_t;
 
 
 
+
 #endif

main/modes/lumberjack/lumberjackEntity.c

@@ -12,7 +12,8 @@ void lumberjackSetupEnemy(lumberjackEntity_t* enemy, int character)
     enemy->ready = true; 
     enemy->showAlert = false;
     enemy->spriteOffset = 0;
-
+    enemy->cW = 15;
+    enemy->cH = 15;
     lumberjackUpdateEnemy(enemy, character);
 
 }
@@ -28,6 +29,7 @@ void lumberjackResetEnemy(lumberjackEntity_t* enemy)
     enemy->x = 0;
     enemy->upgrading = false;
 
+    lumberjackUpdateEnemy(enemy, enemy->type);
 }
 
 void lumberjackRespawnEnemy(lumberjackEntity_t* enemy, int side)
@@ -49,7 +51,7 @@ void lumberjackRespawnEnemy(lumberjackEntity_t* enemy, int side)
     else
 {
         enemy->direction = -1; // This needs to be decided ahead of time
-        enemy->x = 200;
+        enemy->x = 279;
         enemy->vx = 0;// -enemy->maxVX;
         enemy->flipped = true;        
     }
@@ -77,25 +79,32 @@ void lumberjackUpdateEnemy(lumberjackEntity_t* enemy, int newIndex)
         enemy->spriteOffset = 0;
         enemy->maxLevel = 2;
 
+        enemy->cW = 15;
+        enemy->cH = 15;
+
     }
     else if (newIndex == 1)
     {
         enemy->width = 15;
         enemy->height = 15;
         enemy->tileHeight = 1;
-        enemy->maxVX = 8;
+        enemy->maxVX = 6;
         enemy->spriteOffset = 7;
         enemy->maxLevel = 2;
+        enemy->cW = 15;
+        enemy->cH = 15;
 
     }
     else if (newIndex == 2)
     {
         enemy->width = 15;
         enemy->height = 15;
         enemy->tileHeight = 1;
-        enemy->maxVX = 10;
+        enemy->maxVX = 8;
         enemy->spriteOffset = 14;
         enemy->maxLevel = 2;
+        enemy->cW = 15;
+        enemy->cH = 15;
 
     }
 
@@ -108,8 +117,31 @@ void lumberjackDoEnemyControls(lumberjackEntity_t* enemy)
 {
     //pick between types I guess
     //if enemy->type 1, 2, or 3... continue
+    //enemy->direction = -1;
 
-
+}
+
+void lumberjackUpdateEnemyCollision(lumberjackEntity_t* enemy)
+{
+    enemy->cX = enemy->x;
+    enemy->cY = enemy->y;
+}
+
+void lumberjackUpdatePlayerCollision(lumberjackEntity_t* player)
+{
+    player->cX = player->cX + 2;
+    player->cW = player->width -4;
+
+    if (player->state == LUMBERJACK_DUCK)
+    {
+        player->cY = player->cY + 8;
+        player->cH = player->height -16;
+    }
+    else
+    {
+        player->cY = player->cY + 4;
+        player->cH = player->height -8;
+    }
 }
 
 

main/modes/lumberjack/lumberjackEntity.h

@@ -22,13 +22,18 @@ typedef struct
     int x;
     int y;
     int spriteOffset;
-    float vx;
+    int vx;
     float vy;
-    float maxVX;
+    int maxVX;
     int type;
     int maxLevel;
     int respawn;
 
+    int cX;
+    int cY;
+    int8_t cW;
+    int8_t cH;
+
     bool upgrading;
     bool ready; //Ready to be placed because it's not in game
     bool showAlert;
@@ -40,6 +45,8 @@ typedef struct
     int direction;
     int animationSpeed;
     int64_t timerFrameUpdate;
+    char name[16];
+
 } lumberjackEntity_t;
 
 void lumberjackSetupEnemy(lumberjackEntity_t* enemy, int character);
@@ -50,4 +57,8 @@ bool checkCollision(lumberjackEntity_t* AA, lumberjackEntity_t* BB);
 void lumberjackUpdateEnemy(lumberjackEntity_t* enemy, int newIndex);
 void lumberjackDoEnemyControls(lumberjackEntity_t* enemy);
 
+
+void lumberjackUpdateEnemyCollision(lumberjackEntity_t* enemy);
+void lumberjackUpdatePlayerCollision(lumberjackEntity_t* player);
+
 #endif