Merge branch 'main' into lastlastfix

jonylu7 · Jun 18, 2024 · 4729a41 · 4729a41
2 parents f9f0783 + 440a237
commit 4729a41
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,6 @@
 # Purpose
-
+讓我認識到....不要選一個系統太複雜的遊戲
 # Goal
 
 # Methodology
-
-## Packages used
-1. openGL version 4.1
-2. PTSD game Engine
-3. SDL2
-4. Imgui
+肝、血和淚
diff --git a/include/Map/Map.hpp b/include/Map/Map.hpp
@@ -90,6 +90,10 @@ class MapClass : public Core::Drawable {
         return NullPos;
     }
 
+
+    int getWidth() { return m_MapWdith; }
+    int getHeight() { return m_MapHeight; }
+
 protected:
     void InitGrid();
 

diff --git a/include/Map/Tile.hpp b/include/Map/Tile.hpp
@@ -75,9 +75,11 @@ class TileClass {
                 m_Avatars.erase(it);
                 i--;
 
+
                 // if (m_Avatars.size() < 4 && m_TerrainBuildable) {
                 //     setWalkable(true);
                 // }
+
                 if (m_Avatars.size() == 0) {
                     setBuildable(true);
                 }

diff --git a/src/Mechanics/AvatarManager.cpp b/src/Mechanics/AvatarManager.cpp
@@ -128,6 +128,11 @@ void AvatarManager::assignOrderToMyAvatar(std::shared_ptr<Avatar> avatar) {
 
             auto destcell = MapUtil::GlobalCoordToCellCoord(
                 MapUtil::ScreenToGlobalCoord(Util::Input::GetCursorPosition()));
+            if (destcell.x < 0 || destcell.y < 0 ||
+                destcell.x > m_Map->getWidth() / 2 - 1 ||
+                destcell.y > m_Map->getHeight() / 2 - 1) {
+                return;
+            }
 
             assignMoveOrderToAvatar(avatar, destcell);
             assignAttackOrderToAvatar(avatar, destcell);

diff --git a/src/Mechanics/AvatarNavigator.cpp b/src/Mechanics/AvatarNavigator.cpp
@@ -7,12 +7,15 @@
 std::deque<MoveDirection> AvatarNavigator::findPath(glm::vec2 currentcell,
                                                     glm::vec2 destinationcell) {
     glm::vec2 ogcell = currentcell;
+
     std::vector<std::deque<MoveDirection>> dirQueComp = {
         std::deque<MoveDirection>(), std::deque<MoveDirection>()};
+
     if (m_Map->getTileByCellPosition(destinationcell)->getWalkable() == false) {
         return dirQueComp[0];
     }
 
+
     for (int s = 0; s < 2; s++) {
         Side whichSideToTouchObstacle = static_cast<Side>(s);
         int count = 0;
@@ -53,6 +56,7 @@ std::deque<MoveDirection> AvatarNavigator::findPath(glm::vec2 currentcell,
                     dirQueComp[s].push_back(i);
                     currentcell =
                         PathUtility::getNextCellByCurrent(i, currentcell);
+
                 }
             }
         }
@@ -69,6 +73,7 @@ std::vector<MoveDirection>
 AvatarNavigator::moveAlongsideObstacle(Side side, glm::vec2 currentcell,
                                        MoveDirection currentdir,
                                        glm::vec2 destinationcell) {
+    glm::vec2 ogcell = currentcell;
 
     std::vector<MoveDirection> path;
     while (!(canResumeWalkingStraight(currentcell, destinationcell) ||
@@ -87,7 +92,9 @@ AvatarNavigator::moveAlongsideObstacle(Side side, glm::vec2 currentcell,
         path.push_back(currentdir);
         currentcell =
             PathUtility::getNextCellByCurrent(currentdir, currentcell);
-        if (path.size() > 15) {
+
+        if (path.size() > 30 || ogcell == currentcell) {
+
             return path;
         }
     }

diff --git a/src/Scene/TutorialScene.cpp b/src/Scene/TutorialScene.cpp
@@ -71,7 +71,8 @@ void TutorialScene::stageStart() {
     m_PlayerObjectivesText->SetVisible(true);
     m_PlayerObjectivesText->setMovingRelativeToCamera(false);
     Util::Transform trans;
-    trans.translation = {40, 5};
+
+    trans.translation = {540, 5};
     trans.scale = {0.7, 0.7};
     m_PlayerObjectivesText->SetTransform(trans);