release

Ligh7bringer · Ligh7bringer · commit e1c1d421af0e · 2018-04-17T04:18:34.000+01:00
diff --git a/engine/lib_tile_level_loader/LevelSystem.h b/engine/lib_tile_level_loader/LevelSystem.h
@@ -29,7 +29,8 @@ class LevelSystem {
             INVISIBLE = '0',
             COIN = 'C',
             GEM = 'G',
-            POTION = 'Q'
+            POTION = 'Q',
+            HEART = 'H'
         };
     };
     struct platformTiles {
@@ -58,7 +59,8 @@ class LevelSystem {
             PLANT = 'p',
             BIRD = 'b',
             BOULDER = 'q',
-            SPIKE = 'f'
+            SPIKE = 'f',
+            FISH = 'n'
         };
     };
 
diff --git a/engine/src/engine.cpp b/engine/src/engine.cpp
@@ -117,7 +117,7 @@ void Engine::Start(unsigned int width, unsigned int height,
   //display logging level
   LOGCFG.headers = true; 
   //min logging level 
-  LOGCFG.level = DEBUG;
+  LOGCFG.level = ERROR;
 
   //initialise input manager
   InputManager::initialise();
diff --git a/res/levels/lvl1.txt b/res/levels/lvl1.txt
@@ -5,15 +5,15 @@
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
-0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxexxQxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx122223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxbxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxexxQxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx122223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx122223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx1223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsxxxsxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx12223xxxxxxxxxxxxxxxxxxCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGxxxxxxxxxxx12223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxSxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxCxxxxxxxxxxxxxxxxxxxxxxxx12223xxxxxxxxxxxxxxxxxxxxxxxxxx123xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxCxxxGxxxCxxxxxxxxsxCxxxCxsxxxxxxxxxxxxxxxxxxxxxxxCxxGxxCxxxxxxxxxxxxxpxxQxCxCxCxxCxxxCxxxCxxxxxxxxxxxxxGxxxxxxxxxxxCxxxxxxxxxxxExxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
-0xxxxxxxxxxxxxxxxxxxxxxxxCxxxxxxxxxxxxQxxxxxxxxxxxxxxxxxxxxxxxxxxxCxxGxxGxxCxx122222222223xxxxxx122222223xxxxxxxxxxxGxxxxxxxxxx12222223xGxGxxxxxxGx12223xxxxxxxxxx12222223xxxxxxxxxx1223xsxxxsxxxxFxxxxsxxs1223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
-0xxxxxxxxxxxxxxxxxxxxxxx22xxxxxxxxxxxx1xxxxxxxxxxxxxxxxxxxxxxxxGx1222222222222755555555556xxxxxx455555556xxxxxxx12222223xxxxxxx455555561223xxxxx12355556xMxxxxxxxM45555556xxFxxx12235555122223xxxxxxxxx123555556xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxCxxxxxxxxxxxxQxxxxxxxxxxxxxxxxxxxxxxxxxxxCxxGxxGxxCxx122222222223xxxxxx122222223xxxxxxxxxxxGxxxxxxxxxx12222223xGHGxxxxxxGH12223xxxxxxxxxx12222223xxxxxxxxxx1223xsxHxsxxxxFxxxxsxxs1223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxx22xxxxxxxxxxxx1xxxxxxxxxxxxxxxxxxxxxxxxGx1222222222222755555555556xxnxxx455555556xxxxxxx12222223xxxxxxx455555561223xxxxx12355556xMxxxxxxxM45555556xxFxxx12235555122223xxxxxxxxx123555556xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 0xxxxxxxxxxxxxxxxxxxxxxx22sxxxxxxxxxs22xexxxxxxex22sxxxxxxxxxs1225555555555555888888888889DDDDDD788888889xffffff45555556DDDDDDD788888888889xffff45688889DDDDDDDDDD78888889DDDDDD45568888455556DDDDDDDDD456888889xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000xxxxxx000000000000000000000000xxxxxxx000000000000xxxxx00000000xxxxxxxxxx00000000xxxxxx00000000000000xxxxxxxxx000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
diff --git a/res/levels/lvl2.txt b/res/levels/lvl2.txt
@@ -0,0 +1,19 @@
+0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx122222222222222222223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxQxxxxxsxxxsxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxexxx122222222222222222223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx1223455555555555555555556xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx4555555555555555555588889xxxxxxDxxxxpxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxbxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxIOOOOOOOOOOOOOOOOOOOOOOOOOOOPxxxxx122222223xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxIOOxxPxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxpxxxxxxxxxxxxxxxx0
+0xxxxxxxSxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxCxxxxxxxxx22xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGxGxxxxxxxxxxx122223xxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsxxxsxxxxxxxxxxxxxxx45xxxxGxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx12223xxxxxxxxxxxxxxxxxxxxxxxxxxxx0
+0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxex122223xCxxCxxsxxxxxsx75xsxxxxxsxxxxxxxxHxxxxxxxxQxxxxxGxxxxxxexxxxCxxxCxxxCxxxCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxEx120
+0xxxxxxxxxxxxxxxxxxxxxxxxQxxxxxxxxxxxxxxxxxxxxxxxexx1224555561222222222222235512222223xxxxxxxxxxxxxxxxxxxxxxxxxx12222223xHxxMxxxxxxxxMxGxxxxHxxxxxxxxxxCxCxxCxxxxxxxxxx12550
+0xxxxxxxxxxx2xxxxxxxxxxx22xxxxxxxxxxx1xxxxxxxxxxx1235555555555555555555555555555555556xMxxxxxMxxxMxxxxxxxxMxxFxx45555555223xxxxxxxxnxxx12222223xxxxxxx1222223xxxx12555555550
+0xxxxxxxxxx22sxxxxssxxxs22xxsxxxxxxs22xexxxexxxxx7888888888888888888888888888888888889DDDDDDDDDDDDDDDDDDDDDDDDDD788888885553DDDDDDDDDDD5555555612222234555556xfff45558888880
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000xxxxxxxxxxxxxxxxxxxxxxxxxx000000000000xxxxxxxxxxx0000000000000000000000000000000000000
diff --git a/res/sprites/player/heart.png b/res/sprites/player/heart.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efb13f024c31416fbf045a79dd5ef7e4f47e720a01f0835d91a379e6eafe15f6
+size 1297
diff --git a/src/components/cmp_player_attack.cpp b/src/components/cmp_player_attack.cpp
@@ -21,7 +21,7 @@ PlayerAttackComponent::PlayerAttackComponent(Entity* p) : Component(p), _cooldow
     _cooldown = 0;
 
     initAttacks();
-    changeAttack(FIREBALL);
+    changeAttack(DEFAULT);
     _lastAttack = _currentAttack;
 }
 
@@ -87,7 +87,7 @@ void PlayerAttackComponent::initAttacks() {
     Attack fireball;
     fireball.type = FIREBALL;
     fireball.damage = 4;
-    fireball.cooldown = 2.5f;
+    fireball.cooldown = 1.6f;
     fireball.spriteSize = Vector2f(64.f, 22.f);
     fireball.spriteSheet = "fireball2.png";
     fireball.frameCount = 8;
@@ -111,7 +111,7 @@ void PlayerAttackComponent::initAttacks() {
     Attack icicle;
     icicle.type = ICICLE;
     icicle.damage = 2;
-    icicle.cooldown = 1.5f;
+    icicle.cooldown = 1.2f;
     icicle.spriteSize = Vector2f(64.f, 45.f);
     icicle.spriteSheet = "icicle.png";
     icicle.frameCount = 8;
@@ -123,7 +123,7 @@ void PlayerAttackComponent::initAttacks() {
     Attack shock;
     shock.type = SHOCK;
     shock.damage = 3;
-    shock.cooldown = 1.75f;
+    shock.cooldown = 1.4f;
     shock.spriteSize = Vector2f(64.f, 45.f);
     shock.spriteSheet = "shock.png";
     shock.frameCount = 4;
diff --git a/src/components/cmp_player_lives.cpp b/src/components/cmp_player_lives.cpp
@@ -9,7 +9,7 @@ using namespace sf;
 * Component which handles the lives of the player and draws them on the screen.
 */
 
-PlayerLivesComponent::PlayerLivesComponent(Entity* p, unsigned int lives) : Component(p), _maxLives(8), _lives(lives),
+PlayerLivesComponent::PlayerLivesComponent(Entity* p, unsigned int lives) : Component(p), _maxLives(5), _lives(lives),
                                                     _panel(Panel(Vector2f(0, 0), Vector2f(100.f, 32.f))) {
     _panel.setPanelColour(Color(192, 192, 192, 128));
     TEXT = Config::getLocalisedString("hp") + " ";
diff --git a/src/game.h b/src/game.h
@@ -1,13 +1,15 @@
 #pragma once
 
 #include "scenes/scene_level1.h"
+#include "scenes/scene_level2.h"
 #include "scenes/scene_menu.h"
 #include "scenes/scene_game_over.h"
 #include "scenes/scene_options.h"
 #include "scenes/scene_highscore.h"
 
 extern MenuScene menu;
 extern Level1Scene level1;
+extern Level2Scene level2;
 extern GameOverScene gameOver;
 extern OptionsScene options;
 extern HighScoreScene highScore;
diff --git a/src/misc/entity_factory.cpp b/src/misc/entity_factory.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<Entity> EntityFactory::makeSlime(Scene* scene, const Vector2f& p
     anim->setNumberOfFrames(4);
     // Add HurtComponent
     slime->addComponent<HurtComponent>();
-    slime->addComponent<EnemyHealthComponent>(1);
+    slime->addComponent<EnemyHealthComponent>(2);
     slime->addComponent<PhysicsComponent>(Vector2f(32.f, 32.f));
     //slime->addComponent<SteeringComponent>(scene->ents.find("player")[0]);
     slime->addComponent<RoamingComponent>(distance, time, false);
@@ -177,7 +177,6 @@ std::shared_ptr<Entity> EntityFactory::makePotion(Scene *scene, const sf::Vector
     auto row = rand() % 4;
 
     auto pu = potion->addComponent<PowerUpComponent>(10, attack->getAttack(row).type);
-    pu->giveHealth(10);
 
     auto anim = potion->addComponent<AnimatedSpriteComponent>(Vector2f(32.f, 32.f));
     anim->setSpritesheet(TextureManager::getTexture("potions.png"));
@@ -295,3 +294,15 @@ void EntityFactory::makeWalls(Scene* scene) {
 
 
 }
+
+std::shared_ptr<Entity> EntityFactory::makeHeart(Scene *scene, const sf::Vector2f &pos) {
+    auto heart = scene->makeEntity();
+    heart->setPosition(pos);
+
+    auto sprite = heart->addComponent<AnimatedSpriteComponent>(Vector2f(32.f, 32.f));
+    sprite->setSpritesheet(TextureManager::getTexture("heart.png"));
+    auto pu = heart->addComponent<PickUpComponent>(10);
+    pu->giveHealth(1);
+
+    return heart;
+}
diff --git a/src/misc/entity_factory.h b/src/misc/entity_factory.h
@@ -20,4 +20,5 @@ class EntityFactory {
     static std::shared_ptr<Entity> makeMovingPlatform(Scene* scene, const sf::Vector2f& pos, const sf::Vector2f& distance, float time);
     static std::shared_ptr<Entity> makeFallingPlatform(Scene* scene, const sf::Vector2f& pos);
     static std::shared_ptr<Entity> makeSpike(Scene* scene, const sf::Vector2f& pos);
+    static std::shared_ptr<Entity> makeHeart(Scene *scene, const sf::Vector2f &pos);
 };
diff --git a/src/platformer_main.cpp b/src/platformer_main.cpp
@@ -10,6 +10,7 @@ using namespace std;
 
 MenuScene menu;
 Level1Scene level1;
+Level2Scene level2;
 GameOverScene gameOver;
 OptionsScene options;
 HighScoreScene highScore;
diff --git a/src/scenes/scene_game_over.cpp b/src/scenes/scene_game_over.cpp
@@ -5,6 +5,7 @@
 
 using namespace sf;
 
+bool _nextLevel = false;
 //initialise panel
 void GameOverScene::Load() {
     _init = true;
@@ -40,16 +41,20 @@ void GameOverScene::Update(const double& dt) {
     mainMenubtn.update(dt);
     //allow the user to go back to the menu or restart the level
     if(Keyboard::isKeyPressed(Keyboard::Return) || restartLevelbtn.isClicked()) {
-        Engine::ChangeScene((Scene*)&level1);
+        if(_nextLevel){
+            Engine::ChangeScene((Scene*) &level2);
+        }
+        else {
+            Engine::ChangeScene((Scene*)&level1);
+        }
         //Engine::ChangeScene((Scene*)&currentLevel)
     }
 
     if(Keyboard::isKeyPressed(Keyboard::Escape) || mainMenubtn.isClicked()) {
         Engine::ChangeScene((Scene*)&menu);
     }
     if(nextLevelbtn.isClicked()){
-        //Engine::ChangeScene((Scene*)&level1);
-        //Engine::ChangeScene((Scene*)&level(levelInt++))
+        Engine::ChangeScene((Scene*)&level2);
     }
     //update everything else
     _panel.update(dt);
@@ -81,6 +86,7 @@ void GameOverScene::setText(const std::string& text) {
 void GameOverScene::nextLevel(){
   // maybe check if there is a next level and if there isnt
   // another level then dont render next level btn
+    _nextLevel = !_nextLevel;
   Vector2f pos(Engine::getWindowSize());
   pos /= 2.f;
   nextLevelbtn = Button(Vector2f(pos.x+100, pos.y+100), Vector2f(200.f, 35.f), Config::getLocalisedString("next_level"));
diff --git a/src/scenes/scene_level1.cpp b/src/scenes/scene_level1.cpp
@@ -63,6 +63,7 @@ void Level1Scene::Restart() {
 
     // Create player
     player = EntityFactory::makePlayer(this, ls::getPosition(ls::baseTiles::START)[0]);
+    //player = EntityFactory::makePlayer(this, Vector2f(5500.f,100.f));
 
     // Create some enemies
     auto slimePos = LevelSystem::getPosition(LevelSystem::enemyTiles::SLIME);
@@ -109,10 +110,15 @@ void Level1Scene::Restart() {
     EntityFactory::makePortal(this, portalPos[0]);
 
     //make fish
-    auto waterTiles = LevelSystem::getPosition(ls::baseTiles::DEADFALL);
-    auto fishPos = waterTiles[2];
+    auto waterTiles = LevelSystem::getPosition(ls::enemyTiles::FISH);
+    auto fishPos = waterTiles[0];
     EntityFactory::makeFish(this, fishPos);
 
+    //make heart
+    auto heartPos = ls::getPosition(ls::groundTiles::HEART);
+    for(auto hp : heartPos)
+        EntityFactory::makeHeart(this, hp);
+
     //get positions of moving tiles
     auto platformTile = LevelSystem::getPosition(ls::platformTiles::PLATFORM_MOVING);
     //create platforms
diff --git a/src/scenes/scene_level2.cpp b/src/scenes/scene_level2.cpp
diff --git a/src/scenes/scene_level2.h b/src/scenes/scene_level2.h
diff --git a/src/states/fish_states.cpp b/src/states/fish_states.cpp
