Merge pull request #91 from ntut-Tu/main

overlaps fixed
jonylu7 · Jun 13, 2024 · 5da849c · 5da849c
2 parents 0615b20 + d8864d0
commit 5da849c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/include/AI/AIGroupCommander.hpp b/include/AI/AIGroupCommander.hpp
@@ -157,22 +157,19 @@ class AIGroupCommander {
         glm::vec2 targetCell = {-1.f,-1.f};
         //issue: empty group should delete before this
         if(false&&static_cast<int>(m_offensiveGroup.size())>=static_cast<int>(m_PlayerUnitManager->getAvatarManager()->getAvatarArray().size())){
-            if(!m_PlayerUnitManager->getStructureManager()->getStructureArray()->getBuiltStructureArray().empty()){
-                targetCell=m_PlayerUnitManager->getStructureManager()->getStructureArray()->getBuiltStructureArray().front()->getCurrentLocationInCell();
-            }
-            for(auto i : m_PlayerUnitManager->getStructureManager()->getStructureArray()->getBuiltStructureArray()){
-                if(unit->getDistance(i->getCurrentLocationInCell())<unit->getDistance(targetCell)){
-                    //attack
-                    targetCell = i->getCurrentLocationInCell();
-                }
-            }
+            targetCell = m_Map->findEnemyInRange(200,unit->getCurrentLocationInCell(),HouseType::ENEMY);
+            //attack
+            m_AIAvatarManager->assignAttackOrderToAvatar(unit,targetCell,HouseType::ENEMY);
         }else{
             if(!m_PlayerUnitManager->getAvatarManager()->getAvatarArray().empty()){
                 targetCell=m_PlayerUnitManager->getAvatarManager()->getAvatarArray().front()->getCurrentLocationInCell();
             }
             for(auto i : m_PlayerUnitManager->getAvatarManager()->getAvatarArray()){
                 if(i->getDistance(unit->getCurrentLocationInCell())<unit->getDistance(targetCell)){
                     //attack
+                    if(m_AIAvatarManager->ifAvatarHasNemesis(m_Map->getTileByCellPosition(targetCell)->getAvatars().front())){
+                        continue;
+                    }
                     targetCell = i->getCurrentLocationInCell();
                 }
             }

diff --git a/include/Map/MapUtility.hpp b/include/Map/MapUtility.hpp
@@ -37,10 +37,5 @@ class MapUtil {
         int _y = location.y / CELL_SIZE.y;
         return {_x * CELL_SIZE.x, _y * CELL_SIZE.y};
     }
-    static float findDistance(glm::vec2 cell1, glm::vec2 cell2) {
-        float dx = cell2.x - cell1.x;
-        float dy = cell2.y - cell1.y;
-        return sqrt(dx * dx + dy * dy);
-    }
 };
 #endif // PRACTICALTOOLSFORSIMPLEDESIGN_MAPUTILITY_HPP
diff --git a/include/Mechanics/AvatarManager.hpp b/include/Mechanics/AvatarManager.hpp
@@ -43,6 +43,9 @@ class AvatarManager {
     bool ifAvatarHasNemesis(std::shared_ptr<Avatar> unit){
         return m_NemesisManager->ifAvatarHasNemesis(unit);
     }
+    bool ifAvatarHasHunter(std::shared_ptr<Avatar> unit){
+        return m_NemesisManager->ifAvatarHasNemesis(unit);
+    }
     glm::vec2 getAvatarNemesisCell(std::shared_ptr<Avatar> unit){
         return m_NemesisManager->getNemesisCell(unit);
     }

diff --git a/include/Structure/Structure.hpp b/include/Structure/Structure.hpp
@@ -113,7 +113,9 @@ class Structure : public Util::GameObject, public Selectable, public Huntable {
     glm::vec2 getCurrentLocationInCell() override {
         return getAbsoluteOccupiedArea()[0];
     };
-
+    glm::vec2 getTopRightCell(){
+        return getAbsoluteOccupiedArea()[-1];
+    };
 protected:
     float m_ElectricPower;
     float m_BuildingTime;

diff --git a/include/Util/Prop.hpp b/include/Util/Prop.hpp
@@ -37,10 +37,10 @@ class Prop : public Structure {
         m_Transform.translation = m_DrawLocation;
     }
     bool ifOverlaps(glm::vec2 cell) {
-        if ((cell.x > getLocationCell().x - m_Size.x &&
-             cell.x < getLocationCell().x) &&
-            (cell.y > getLocationCell().y - m_Size.y &&
-             cell.y < getLocationCell().y)) {
+        if ((cell.x >= getLocationCell().x - m_Size.x &&
+             cell.x <= getLocationCell().x) &&
+            (cell.y >= getLocationCell().y - m_Size.y &&
+             cell.y <= getLocationCell().y)) {
             return true;
         }
         return false;

diff --git a/src/Scene/TutorialScene.cpp b/src/Scene/TutorialScene.cpp
@@ -158,7 +158,7 @@ void TutorialScene::initStage3() {
     m_cellProp->setHighLightImage("../assets/sprites/Task/Task_Cell_Text3.png");
     m_cellProp->setScale({1, 1});
     m_cellProp->setObjectLocation({850, 850}, 0);
-    m_cellProp->Start({4, 4});
+    m_cellProp->Start({2, 2});
     m_stage = TutorialStages::STAGE3;
 }