diff --git a/sources/Runner/LobbyScene.cpp b/sources/Runner/LobbyScene.cpp index 8c8daa9d..677360eb 100644 --- a/sources/Runner/LobbyScene.cpp +++ b/sources/Runner/LobbyScene.cpp @@ -41,13 +41,25 @@ namespace BBM .addComponent() .addComponent("assets/backgrounds/menu.png"); scene->addEntity("white background") - .addComponent(200, 300, 0) + .addComponent(200, 300 - 50, 0) .addComponent(Vector2f(), Vector2f(1525, 550), RAY::Color(WHITE).setA(150)); + scene->addEntity("white background") + .addComponent(1920 / 2 - 500, 1080 - 100, 0) + .addComponent(Vector2f(), Vector2f(1000, 100), RAY::Color(WHITE).setA(150)); + scene->addEntity("white background") + .addComponent(1920 / 2.75 - 10, 80, 0) + .addComponent(Vector2f(), Vector2f(650, 130), RAY::Color(WHITE).setA(150)); scene->addEntity("lobby text") - .addComponent(1920 / 2.75, 100, 0) + .addComponent(1920 / 2.75, 80, 0) .addComponent("Get Ready", 120, RAY::Vector2(), ORANGE); + scene->addEntity("lobby text") + .addComponent(1920 / 2.75, 1080 - 80, 0) + .addComponent("Join: A Button / Space / Right Ctrl", 30, RAY::Vector2(), BLACK); + scene->addEntity("lobby text") + .addComponent(1920 / 4 + 100, 1080 - 40, 0) + .addComponent("Change Skin: B Button / Shift / Left Ctrl", 30, RAY::Vector2(), BLACK); auto &play = scene->addEntity("play button") - .addComponent(1920 / 2.5, 1080 - 180, 0) + .addComponent(1920 / 2.5, 1080 - 180 - 50, 0) .addComponent("assets/buttons/button_new_game.png") .addComponent([](WAL::Entity &entity, WAL::Wal &wal) { @@ -106,7 +118,7 @@ namespace BBM texture->use("assets/buttons/button_htp_hovered.png"); }); auto &lavaOption = scene->addEntity("lava option text") - .addComponent(1920 / 6, 1.85 * 1080 / 3, 0) + .addComponent(1920 / 6, 1.85 * 1080 / 3 - 50, 0) .addComponent("Lava: Off", 70, RAY::Vector2(), BLACK) .addComponent([](WAL::Entity &entity, WAL::Wal &wal) { @@ -130,7 +142,7 @@ namespace BBM }); auto &heightOption = scene->addEntity("Height option text") - .addComponent(1920 / 6, 2.1 * 1080 / 3, 0) + .addComponent(1920 / 6, 2.1 * 1080 / 3 - 50, 0) .addComponent("2nd Level: Off", 70, RAY::Vector2(), BLACK) .addComponent([](WAL::Entity &entity, WAL::Wal &wal) { @@ -154,7 +166,7 @@ namespace BBM }); auto &aiMore = scene->addEntity("AI+") - .addComponent(1920 / 1.75, 1.85 * 1080 / 3, 0) + .addComponent(1920 / 1.75, 1.85 * 1080 / 3 - 50, 0) .addComponent("assets/buttons/cpu_add.png") .addComponent([](WAL::Entity &entity, WAL::Wal &wal) { @@ -172,7 +184,7 @@ namespace BBM }); auto &aiLess = scene->addEntity("AI-") - .addComponent(1920 / 1.75, 2.10 * 1080 / 3, 0) + .addComponent(1920 / 1.75, 2.10 * 1080 / 3 - 50, 0) .addComponent("assets/buttons/cpu_remove.png") .addComponent([](WAL::Entity &entity, WAL::Wal &wal) { @@ -191,13 +203,13 @@ namespace BBM for (int i = 0; i < 4; i++) { auto &playerTile = scene->addEntity("player tile") - .addComponent(224 * (i + 1) + 200 * i, 1080 / 3, 0) + .addComponent(224 * (i + 1) + 200 * i, 1080 / 3 - 50, 0) .addComponent(RAY::Vector2(224 * (i + 1) + 200 * i, 1080 / 3), RAY::Vector2(200, 200), RAY::Color(0, 0, 0, 0)); auto &player = scene->addEntity("player") - .addComponent(224 * (i + 1) + 200 * i, 1080 / 3, 0) + .addComponent(224 * (i + 1) + 200 * i, 1080 / 3 - 50, 0) .addComponent("assets/player/icons/none.png"); auto &ready = scene->addEntity("ready") - .addComponent(224 * (i + 1) + 200 * i, 1080 / 3, 0) + .addComponent(224 * (i + 1) + 200 * i, 1080 / 3 - 50, 0) // todo check why it does this | hacky way to fix ready texture .addComponent(); player.addComponent(i, ready, playerTile);