Merge pull request #100 from ntut-Tu/main

修正編譯錯誤&AI Base 位置修改
jonylu7 · Jun 18, 2024 · 2cb8b26 · 2cb8b26
2 parents 4805e33 + a0a3f5e
commit 2cb8b26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/include/AI/AIScripts.hpp b/include/AI/AIScripts.hpp
@@ -18,7 +18,7 @@ class AIScript {
     std::shared_ptr<MapClass> m_Map;
     std::shared_ptr<AIGroupCommander> m_AIGroupCommander;
 
-    glm::vec2 m_baseCell = {20, 30};
+    glm::vec2 m_baseCell = {30, 35};
     int constructCountX = 0;
     int constructCountY = 0;
 

diff --git a/include/Mechanics/UnitManager.hpp b/include/Mechanics/UnitManager.hpp
@@ -50,7 +50,7 @@ class UnitManager : public Player {
     }
 
 
-    int updateCurrency();
+    void updateCurrency();
 
     void spawnToWayPoint(UnitType unit, HouseType house);
     void spawn(UnitType unit, HouseType house, glm::vec2 cellPos);

diff --git a/src/AI/AIScripts.cpp b/src/AI/AIScripts.cpp
@@ -227,7 +227,7 @@ void AIScript::UpdateSpawnScript(SpawnMode spawnMode) {
             m_EnemyObjectManager->setBarrackWayPointByCell(
                 {m_baseCell.x - 1 +
                      5 * (m_EnemyObjectManager->getAvatarCount() % 3),
-                 m_baseCell.y - 1});
+                 m_baseCell.y - 1  + 5 * (m_EnemyObjectManager->getAvatarCount() % 6 ==0)});
 
             m_EnemyObjectManager->spawnToWayPoint(m_selectedAvatarType,
                                                   HouseType::ENEMY);

diff --git a/src/Mechanics/UnitManager.cpp b/src/Mechanics/UnitManager.cpp
@@ -117,7 +117,7 @@ void UnitManager::Update() {
     m_StructureManager->SelectingBuildSite();
 }
 
-int UnitManager::updateCurrency() {
+void UnitManager::updateCurrency() {
     for (auto i :
          m_StructureManager->getStructureArray()->getBuiltStructureArray()) {
         if (std::dynamic_pointer_cast<OreRefinery>(i)) {