Merge pull request #95 from ntut-Tu/main

sandbox update
jonylu7 · Jun 14, 2024 · 0f01b52 · 0f01b52
2 parents 3641f01 + e63c78e
commit 0f01b52
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/AI/AIScripts.cpp b/src/AI/AIScripts.cpp
@@ -128,6 +128,9 @@ void AIScript::setCost(float cost, SpawnMode spawnMode) {
 
 void AIScript::buildBasic() {
     if (m_selectedBuildingType != UnitType::NONE) {
+        if(m_selectedBuildingType != UnitType::ORE_REF && m_EnemyObjectManager->getTotalCurrency() > 2000+100){
+            spawnUnit();
+        }
         return;
     }
     if (m_EnemyObjectManager->getUnitConstructCount(UnitType::POWER_PLANT) <
@@ -190,6 +193,12 @@ void AIScript::UpdateSpawnScript(SpawnMode spawnMode) {
         if (m_selectedBuildingType == UnitType::NONE) {
             return;
         }
+        if (constructCountX > 10) {
+            constructCountY += 5;
+            constructCountX = 0;
+        } else {
+            constructCountX += 5;
+        }
         m_EnemyObjectManager->spawn(
             m_selectedBuildingType, HouseType::ENEMY,
             {m_baseCell.x + constructCountX, m_baseCell.y + constructCountY});
@@ -198,12 +207,6 @@ void AIScript::UpdateSpawnScript(SpawnMode spawnMode) {
         setCDTime(0.f, SpawnMode::BUILDINGS);
         m_selectedBuildingType = UnitType::NONE;
 
-        if (constructCountX > 10) {
-            constructCountY += 5;
-            constructCountX = 0;
-        } else {
-            constructCountX += 5;
-        }
     }
     if (spawnMode == SpawnMode::AVATAR) {
         if (m_selectedAvatarType == UnitType::NONE) {

diff --git a/src/Scene/SandBoxScene.cpp b/src/Scene/SandBoxScene.cpp
@@ -58,6 +58,7 @@ void SandBoxScene::Update() {
         m_GameObjectManager->spawnToWayPoint(
             m_UI->getUnitTypeReadyToBeSpawned(), HouseType::MY);
     }
+
     if (m_stage == Stages::FORMAL_UPDATE) {
         if (m_GameObjectManager->getAvatarManager()->getAvatarArray().empty() &&
                 m_GameObjectManager->getStructureManager()
@@ -134,6 +135,7 @@ void SandBoxScene::stageStart() {
         m_stage = Stages::END;
         break;
     }
+
     case Stages::FORMAL_START: {
         m_GameObjectManager->spawn(UnitType::INFANTRY, HouseType::MY, {7, 9});
         m_EnemyObjectManager->spawn(UnitType::INFANTRY, HouseType::ENEMY,