Merge branch 'main' of https://github.com/TudorPirauI/ProjectModernCpp

Author: eduard214

.idea/QtSettings.xml

@@ -5,7 +5,7 @@ project(Eter)
 set(CMAKE_CXX_STANDARD 23)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") # -Wall -Wextra
-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
 
 include(ProcessorCount)
 ProcessorCount(N)
@@ -28,11 +28,11 @@ if (NOT catch2_POPULATED)
     add_subdirectory(${catch2_SOURCE_DIR} ${catch2_BINARY_DIR} EXCLUDE_FROM_ALL)
 endif ()
 
-find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
+#find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia)
+#
+#set(CMAKE_AUTOMOC ON)
+#set(CMAKE_AUTOUIC ON)
+#set(CMAKE_AUTORCC ON)
 
 add_executable(Eter src/main.cpp
         src/Player/Player.cpp
@@ -49,6 +49,6 @@ add_executable(Eter src/main.cpp
         src/Interface/MainWindow.h
 )
 
-target_link_libraries(Eter PRIVATE Qt6::Widgets Qt6::Multimedia)
+#target_link_libraries(Eter PRIVATE Qt6::Widgets Qt6::Multimedia)
 
 #add_subdirectory(tests) # todo fix this for windows

CMakeLists.txt

@@ -3,7 +3,9 @@
 #include <fstream>
 #include <iostream>
 #include <ranges>
+#include <stack>
 
+#include "../MagicPower/ElementPower.h"
 #include "../MagicPower/Wizard.h"
 #include "../Player/Player.h"
 
@@ -267,6 +269,85 @@ bool Board::VerifyWizardPower(const WizardPower power, const Position &position,
 
     return false;
 }
+bool Board::VerifyElementalPower(const ElementIndexPower &power, const Position &position,
+                                 const PlayerTurn &playerTurn) {
+    switch (power) {
+        case ElementIndexPower::ControlledExplosion: {
+            // To do
+        }
+        case ElementIndexPower::Destruction: {
+            // to do
+        }
+        case ElementIndexPower::Flames: {
+            // to do
+        }
+        case ElementIndexPower::Lava: {
+            // to do
+        }
+        case ElementIndexPower::FromAshes: {
+            // to do
+        }
+        case ElementIndexPower::Sparks: {
+            // to do
+        }
+        case ElementIndexPower::Blizzard: {
+            // to do
+        }
+        case ElementIndexPower::Gale: {
+            // to do
+        }
+        case ElementIndexPower::Hurricane: {
+            // to do
+        }
+        case ElementIndexPower::Gust: {
+            // to do
+        }
+        case ElementIndexPower::Mirage: {
+            // to do
+        }
+        case ElementIndexPower::Storm: {
+            // to do
+        }
+        case ElementIndexPower::Tide: {
+            // to do
+        }
+        case ElementIndexPower::Fog: {
+            // to do
+        }
+        case ElementIndexPower::Wave: {
+            // to do
+        }
+        case ElementIndexPower::Whirlpool: {
+            // to do
+        }
+        case ElementIndexPower::Tsunami: {
+            // to do
+        }
+        case ElementIndexPower::Waterfall: {
+            // to do
+        }
+        case ElementIndexPower::Support: {
+            // to do
+        }
+        case ElementIndexPower::Earthquake: {
+            // to do
+        }
+        case ElementIndexPower::Shattering: {
+            // to do
+        }
+        case ElementIndexPower::Granite: {
+            // to do
+        }
+        case ElementIndexPower::Avalanche: {
+            // to do
+        }
+        case ElementIndexPower::Boulder: {
+            // to do
+        }
+        default:;
+    }
+    return false;
+}
 
 int Board::GetMaxBoardSize() const { return m_MaxBoardSize; }
 

src/GameBoard/Board.cpp

@@ -8,6 +8,7 @@
 #include <unordered_map>
 
 #include "../Card/Card.h"
+#include "../MagicPower/ElementPower.h"
 #include "../MagicPower/Wizard.h"
 #include "../Player/Player.h"
 
@@ -59,6 +60,8 @@ class Board {
     void     UpdateDiagonals();
 
     bool VerifyWizardPower(WizardPower power, const Position &position, PlayerTurn playerTurn);
+    bool VerifyElementalPower(const ElementIndexPower &power, const Position &position,
+                              const PlayerTurn &playerTurn);
 };
 
 #endif // BOARD_H

src/GameBoard/Board.h

@@ -7,34 +7,34 @@
 
 #include <string>
 
+enum class ElementIndexPower {
+    ControlledExplosion,
+    Destruction,
+    Flames,
+    Lava,
+    FromAshes,
+    Sparks,
+    Blizzard,
+    Gale,
+    Hurricane,
+    Gust,
+    Mirage,
+    Storm,
+    Tide,
+    Fog,
+    Wave,
+    Whirlpool,
+    Tsunami,
+    Waterfall,
+    Support,
+    Earthquake,
+    Shattering,
+    Granite,
+    Avalanche,
+    Boulder
+};
+
 class ElementPower {
-public:
-    enum class ElementIndexPower {
-        ControlledExplosion,
-        Destruction,
-        Flames,
-        Lava,
-        FromAshes,
-        Sparks,
-        Blizzard,
-        Gale,
-        Hurricane,
-        Gust,
-        Mirage,
-        Storm,
-        Tide,
-        Fog,
-        Wave,
-        Whirlpool,
-        Tsunami,
-        Waterfall,
-        Support,
-        Earthquake,
-        Shattering,
-        Granite,
-        Avalanche,
-        Boulder
-    };
 
 private:
     ElementIndexPower RandomPower();