diff --git a/assets/egg.png b/assets/egg.png new file mode 100644 index 0000000..f0a12bf Binary files /dev/null and b/assets/egg.png differ diff --git a/assets/heart.png b/assets/heart.png new file mode 100644 index 0000000..867809b Binary files /dev/null and b/assets/heart.png differ diff --git a/assets/title_screen.png b/assets/title_screen.png new file mode 100644 index 0000000..e8bb2f3 Binary files /dev/null and b/assets/title_screen.png differ diff --git a/assets/title_screen_backup.aseprite b/assets/title_screen_backup.aseprite new file mode 100644 index 0000000..21d6030 Binary files /dev/null and b/assets/title_screen_backup.aseprite differ diff --git a/include/HealthComponent.h b/include/HealthComponent.h index d53ce06..db456dd 100644 --- a/include/HealthComponent.h +++ b/include/HealthComponent.h @@ -28,7 +28,7 @@ public: if(player) { x = 10; } else { - x = 750; + x = 730; } for(int i = 0; i < health; i++) { @@ -48,8 +48,8 @@ public: void createHeartComponents(int x) { auto& heart(manager->addEntity()); - heart.addComponent(x,5,1); - heart.addComponent("assets/chicken_neutral_knight.png"); + heart.addComponent(x,5,2); + heart.addComponent("assets/heart.png"); heart.addGroup((size_t)GroupLabel::HEARTS); } diff --git a/src/Game.cpp b/src/Game.cpp index 46354a4..b6adde5 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -108,9 +108,9 @@ void Game::init(const char* title, int xpos, int ypos, int width, int height, bo //adding textures to the library in AssetManager - assets->addTexture("player1", "assets/chicken_neutral_knight.png"); - assets->addTexture("player2", "assets/chicken_neutral.png"); - //assets->addTexture("bigEgg", "assets/bigger_egg.png"); // commented out cause png wasn't in assets + assets->addTexture("player1", "assets/chicken_neutral_knight.png"); + assets->addTexture("player2", "assets/chicken_neutral.png"); + assets->addTexture("egg", "assets/egg.png"); //ecs implementation diff --git a/src/KeyboardController.cpp b/src/KeyboardController.cpp index 698876b..8ddd753 100644 --- a/src/KeyboardController.cpp +++ b/src/KeyboardController.cpp @@ -55,11 +55,11 @@ void KeyboardController::update() //TODO: adding actual projectile textures if(fireVelocity.x > 0) { Game::assets->createProjectile(Vector2D(player->position.x, player->position.y), fireVelocity, - false,1, 180, 1, "assets/chicken_neutral_knight.png"); + false,1, 180, 1, "assets/egg.png"); } else { Game::assets->createProjectile(Vector2D(player->position.x, player->position.y), fireVelocity, - true,1, 180, 1, "assets/chicken_neutral_knight.png"); + true,1, 180, 1, "assets/egg.png"); } lastFireTime = currentTicks;