most settings are saved after the game is exited now, added backgrounds for menu screens and some other minor changes

Ligh7bringer · Ligh7bringer · commit f6b1037198e2 · 2018-04-16T02:49:07.000+01:00
diff --git a/engine/src/engine.cpp b/engine/src/engine.cpp
@@ -110,6 +110,7 @@ void Engine::setView(const sf::View& view) {
 bool Engine::_pause = false;
 void Engine::Start(unsigned int width, unsigned int height,
                    const std::string& gameName, Scene* scn) {
+  Config::setCurrentLanguage(Config::getSetting("language"));
   _currentResolution.x = width;
   _currentResolution.y = height;
 
@@ -165,6 +166,7 @@ void Engine::Start(unsigned int width, unsigned int height,
         _pause = false;
       }
       if(event.type == Event::Resized) {
+          LOG(DEBUG) << "RESIZED";
         //resize view when window is resized so textures are not stretched
         auto old = _window->getView();
         auto oldPos = Vector2f(old.getViewport().left, old.getViewport().top);
diff --git a/res/lang/bg.txt b/res/lang/bg.txt
@@ -18,3 +18,5 @@ walkl=Ляво
 walkr=Дясно
 jump=Скачане
 shoot=Стреляне
+anykey=Press any key...
+done=Готово!
diff --git a/res/lang/en.txt b/res/lang/en.txt
@@ -18,3 +18,5 @@ walkl=Walk left
 walkr=Walk right
 jump=Jump
 shoot=Shoot
+anykey=Press any key...
+done=Key set!
diff --git a/res/sprites/backgrounds/menu-bg-2.png b/res/sprites/backgrounds/menu-bg-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ff03fbb53912405b9937c6b6d1aa12a47bfc7d143892de596609d1f37be6be6
+size 608965
diff --git a/res/sprites/backgrounds/options-bg.jpg b/res/sprites/backgrounds/options-bg.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96eaf67405d733761012321443f96de89cb8b5b483f22e7bdb3ac7c63551bdde
+size 556254
diff --git a/res/sprites/player/healing-particle.png b/res/sprites/player/healing-particle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c0345aa73b744ab7f6607b115858cb7fa89f49b9986a0be5ea42e135ef2a613
+size 260
diff --git a/res/sprites/player/money-particle.png b/res/sprites/player/money-particle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cecc4b791947720762858069b670d41c204147978502c6b3b655f28beea2c410
+size 556
diff --git a/src/GUI/button.cpp b/src/GUI/button.cpp
@@ -14,6 +14,7 @@ Button::Button(const Vector2f& pos, const Vector2f& size, const std::string& tex
     _panel.setTextSize(30);
     _panel.setGUI(false);
     _panel.setBorder(2, Color::Magenta);
+    _panel.setTextColour(Color::White);
     _position = pos;
     _clicked = false;
 }
@@ -68,12 +69,14 @@ void Button::onClick() {
 
 //called when the mouse is on top the button
 void Button::onHover() {
-    _panel.setPanelColour(Color::Red);
+    _panel.setBorder(4.f, Color(54, 18, 179));
+    _panel.setPanelColour(Color(0, 204, 255));
 }
 
 //called when the mouse is NOT on top of the button
 void Button::reset() {
-    _panel.setPanelColour(Color::Green);
+    _panel.setPanelColour(Color(0, 46, 138));
+    _panel.setBorder(0, Color::Transparent);
 }
 
 //returns the "hitbox" of the mouse
@@ -111,3 +114,7 @@ const std::string &Button::getSelection() const {
     static const std::string ret = std::string();
     return ret;
 }
+
+void Button::setSelection(const std::string &sel) {
+    //do nothing
+}
diff --git a/src/GUI/button.h b/src/GUI/button.h
@@ -31,4 +31,5 @@ class Button {
     void addLabel(const std::string& text);
 
     virtual const std::string& getSelection() const;
+    virtual void setSelection(const std::string& sel);
 };
diff --git a/src/GUI/menu.cpp b/src/GUI/menu.cpp
@@ -115,5 +115,13 @@ void Menu::repositionMenu() {
     }
 }
 
+void Menu::setSelection(unsigned int id, const std::string &sel) {
+    _buttons[id]->setSelection(sel);
+}
+
+void Menu::setTitleSize(int size) {
+    _title.setTextSize(size);
+}
+
 
 
diff --git a/src/GUI/menu.h b/src/GUI/menu.h
@@ -19,6 +19,8 @@ class Menu {
     void setOffset(const sf::Vector2f& offset);
     void setPosition(const sf::Vector2f& pos);
     void repositionMenu();
+    void setSelection(unsigned int id, const std::string& sel);
+    void setTitleSize(int size);
 
 private:
     unsigned int _id;
diff --git a/src/GUI/option_button.h b/src/GUI/option_button.h
@@ -16,7 +16,7 @@ class OptionButton : public Button {
     void addOption(const std::string& option);
     void addOptions(const std::vector<std::string>& options);
     const std::string& getSelection() const override;
-    void setSelection(const std::string& sel);
+    void setSelection(const std::string& sel) override;
 };
 
 
diff --git a/src/GUI/panel.cpp b/src/GUI/panel.cpp
@@ -15,7 +15,6 @@ using namespace sf;
 //initialise everything needed
 Panel::Panel(const Vector2f &pos, const Vector2f &size) : _size(size), _position(pos) {
     _font = Resources::get<sf::Font>(Config::getDefaultFont());
-    LOG(DEBUG) << Config::getDefaultFont();
     _text.setFont(*_font);
     _text.setCharacterSize(32);
     _text.setFillColor(Color::Black);
diff --git a/src/components/cmp_pickup.cpp b/src/components/cmp_pickup.cpp
@@ -27,9 +27,15 @@ void PickUpComponent::update(double dt) {
                 auto livesComp = player->get_components<PlayerLivesComponent>()[0];
                 //and increase lives
                 livesComp->increaseLives(_health);
-                auto particles = player->addComponent<ParticleSystemComponent>(ParticleSystem::FLOATING, "heart-particle.png");
+                auto particles = player->addComponent<ParticleSystemComponent>(ParticleSystem::FLOATING, "healing-particle.png");
                 particles->setRepeat(false);
-                particles->setColour(sf::Color::Red);
+                particles->setColour(sf::Color::Green);
+                particles->setEmitterSize(sf::Vector2f(50.f, 64.f));
+                particles->setEmissionRate(8.f);
+            } else {
+                auto particles = player->addComponent<ParticleSystemComponent>(ParticleSystem::FLOATING, "money-particle.png");
+                particles->setRepeat(false);
+                particles->setColour(sf::Color::Yellow);
                 particles->setEmitterSize(sf::Vector2f(50.f, 64.f));
                 particles->setEmissionRate(8.f);
             }
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(SHOCK);
+    changeAttack(FIREBALL);
     _lastAttack = _currentAttack;
 }
 
@@ -67,7 +67,7 @@ void PlayerAttackComponent::fire() {
         if(_currentAttack.type == FIREBALL) {
             auto ps = bullet->addComponent<ParticleSystemComponent>(ParticleSystem::TRAIL, "smoke.png");
             ps->setColour(sf::Color(192, 192, 192));
-            ps->setEmissionRate(100.0f);
+            ps->setEmissionRate(500.0f);
         }
 
         _cooldown = _currentAttack.cooldown;
diff --git a/src/scenes/scene_game_over.cpp b/src/scenes/scene_game_over.cpp
@@ -7,12 +7,18 @@ using namespace sf;
 
 //initialise panel
 void GameOverScene::Load() {
+    Vector2f windowSize(Engine::getWindowSize());
+    auto center = windowSize / 2.f;
+    _view = View(center, windowSize);
+    Engine::setView(_view);
+
     Vector2f pos(Engine::getWindowSize());
     pos /= 2.f;
     _panel = Panel(pos, Vector2f(600.f, 200.f));
     _panel.setPositionOfCentre(pos);
     _panel.setTextSize(40);
     _panel.setGUI(false);
+    _panel.setPanelColour(Color(102, 178, 255));
 
     restartLevelbtn = Button(Vector2f(pos.x-100, pos.y+100), Vector2f(200.f, 35.f), Config::getLocalisedString("restart"));
     mainMenubtn = Button(Vector2f(pos.x-300, pos.y+100), Vector2f(200.f, 35.f), Config::getLocalisedString("main_menu"));
diff --git a/src/scenes/scene_menu.cpp b/src/scenes/scene_menu.cpp
@@ -1,21 +1,31 @@
+#include <texture_manager.h>
+#include <system_renderer.h>
 #include "scene_menu.h"
 #include "../game.h"
 #include "../../engine/lib_settings_parser/settings_parser.h"
 #include "../Log.h"
 #include "../config.h"
+#include "../components/cmp_animated_sprite.h"
 
 using namespace std;
 using namespace sf;
 
+sf::Sprite _bg;
+
 void MenuScene::Load() {
     Vector2f windowSize(Engine::getWindowSize());
     auto center = windowSize / 2.f;
     _view = View(center, windowSize);
     Engine::setView(_view);
 
+    _bg = Sprite(TextureManager::getTexture("menu-bg-2.png"));
+    _bg.setOrigin(Vector2f(_bg.getTexture()->getSize()) / 2.f);
+    _bg.setPosition(center);
+
     _mainMenu = Menu();
     _mainMenu.setPosition(Vector2f(500, 200));
     _mainMenu.addTitle("Spell Knight");
+    _mainMenu.setTitleSize(45);
     _mainMenu.addButton(Config::getLocalisedString("play")); //id = 0
     _mainMenu.addButton(Config::getLocalisedString("options")); //id = 1
     _mainMenu.addButton(Config::getLocalisedString("exit")); //id = 2
@@ -24,12 +34,13 @@ void MenuScene::Load() {
 }
 
 void MenuScene::Update(const double& dt) {
+    _parBackground.update(dt);
     _mainMenu.update(dt);
 
-    if(_mainMenu.getMenuResponse() == 0) {
+    if(_mainMenu.getMenuResponse() == 0) { //play button
         Engine::ChangeScene((Scene*)&level1);
     }
-    if(_mainMenu.getMenuResponse() == 1) {
+    if(_mainMenu.getMenuResponse() == 1) { //options button
         Engine::ChangeScene((Scene*)&options);
     }
     if(_mainMenu.getMenuResponse() == 2) {
@@ -41,6 +52,8 @@ void MenuScene::Update(const double& dt) {
 }
 
 void MenuScene::Render() {
+    //make sure background is drawn before the menu
+    Engine::GetWindow().draw(_bg);
     _mainMenu.render();
     Scene::Render();
 }
diff --git a/src/scenes/scene_options.cpp b/src/scenes/scene_options.cpp
@@ -1,12 +1,14 @@
 #include <input_manager.h>
+#include <texture_manager.h>
 #include "scene_options.h"
 #include "../game.h"
 #include "../config.h"
 
-
 using namespace std;
 using namespace sf;
 
+Sprite _background;
+
 void OptionsScene::Load() {
     _sceneID = "options";
     _delay = 0.3f;
@@ -20,18 +22,25 @@ void OptionsScene::Load() {
     _view = View(center, windowSize);
     Engine::setView(_view);
 
+    _background = Sprite(TextureManager::getTexture("options-bg.jpg"));
+    _background.setOrigin(Vector2f(_background.getTexture()->getSize()) / 2.f);
+    _background.setPosition(center);
+
     _flag = false;
 
     Vector2f pos(Vector2f(500, 200));
     _optionsMenu = Menu();
     _optionsMenu.setPosition(Vector2f(pos));
     _optionsMenu.addTitle(Config::getLocalisedString("options"));
 
-    std::vector<std::string> languages = { "English", "Bulgarian" };
+    std::vector<std::string> languages = { "en.txt", "bg.txt" };
     std::vector<std::string> resolutions = { "1280 x 720", "720 x 480", "1366 x 768", "1920 x 1080" };
 
     _optionsMenu.addOptionButton(languages); //id=0
+    _optionsMenu.setSelection(0, Config::getSetting("language"));
     _optionsMenu.addOptionButton(resolutions); //id=1
+    auto res_str = Config::getSetting("width") + " x " + Config::getSetting("height");
+    _optionsMenu.setSelection(1, res_str);
     _optionsMenu.addButton(Config::getLocalisedString("toggle")); //id=2
     _optionsMenu.addButton(Config::getLocalisedString("walkl")); //id=3
     _optionsMenu.addButton(Config::getLocalisedString("walkr")); //id=4
@@ -58,6 +67,7 @@ void OptionsScene::Update(const double& dt) {
            {
                string selection = _optionsMenu.getSelectedOption(0);
                Config::setCurrentLanguage(_langData[selection]);
+               Config::setSetting("language", _langData[selection]);
                break;
            }
        case 1: //resolution button pressed; set the correct resolution
@@ -91,7 +101,7 @@ void OptionsScene::Update(const double& dt) {
     if (_flag) {
         if (!Engine::getKeys().empty()) {
             InputManager::addKey(_actionData[_id], Event::KeyPressed, Engine::getKeys()[0]);
-            _optionsMenu.addLabel(_id, "Done!");
+            _optionsMenu.addLabel(_id, Config::getLocalisedString("done"));
             _flag = false;
         }
     }
@@ -100,6 +110,7 @@ void OptionsScene::Update(const double& dt) {
 }
 
 void OptionsScene::Render() {
+    Engine::GetWindow().draw(_background);
     _optionsMenu.render();
     Scene::Render();
 }
@@ -121,10 +132,10 @@ void OptionsScene::initActions() {
 void OptionsScene::updateButton(unsigned int id) {
     _flag = true;
     _id = id;
-    _optionsMenu.addLabel(id, "Press any key");
+    _optionsMenu.addLabel(id, Config::getLocalisedString("anykey"));
 }
 
 void OptionsScene::initLang() {
-    _langData["English"] = "en.txt";
-    _langData["Bulgarian"] = "bg.txt";
+    _langData["en.txt"] = "en.txt";
+    _langData["bg.txt"] = "bg.txt";
 }

Original file line number	Diff line number	Diff line change
`@@ -115,5 +115,13 @@ void Menu::repositionMenu() {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
	`118`	`+void Menu::setSelection(unsigned int id, const std::string &sel) {`
	`119`	`+ _buttons[id]->setSelection(sel);`
	`120`	`+}`
	`121`	`+`
	`122`	`+void Menu::setTitleSize(int size) {`
	`123`	`+ _title.setTextSize(size);`
	`124`	`+}`
	`125`	`+`
`118`	`126`
`119`	`127`