print

jonylu7 · Apr 30, 2024 · 11be6e5 · 11be6e5
1 parent 32e8fa9
commit 11be6e5
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 44 deletions.
diff --git a/include/Map/Tile.hpp b/include/Map/Tile.hpp
@@ -79,6 +79,9 @@ class TileClass {
                 if (m_Avatars.size() < 4) {
                     setWalkable(true);
                 }
+                if (m_Avatars.size() == 0) {
+                    setBuildable(true);
+                }
                 return;
             }
         }
@@ -106,6 +109,8 @@ class TileClass {
         return *this;
     }
 
+    bool checkedEnemy() { if (m_Structure->getHouse() ==) }
+
 private:
     bool m_TerrainWalkable;
     bool m_TerrainBuildable;

diff --git a/include/Mechanics/House.hpp b/include/Mechanics/House.hpp
@@ -17,7 +17,7 @@ class House {
     HouseType getHouse() { return m_house; }
     void setHouse(HouseType house) { m_house = house; }
 
-private:
+protected:
     HouseType m_house;
 };
 

diff --git a/include/Mechanics/Spawning.hpp b/include/Mechanics/Spawning.hpp
@@ -34,6 +34,10 @@ class Spawning {
         // unit
         unit->setMovePath(queue);
         unit->setnewDestinationIsSetted(false);
+
+        if (m_Map->getTileByCellPosition(unit->getDestinationCell())
+                ->checkedEnemy()) {
+        }
     }
 
     void keepUpdatingUnitsPosition(std::shared_ptr<Avatar> unit) {

diff --git a/include/Structure/Structure.hpp b/include/Structure/Structure.hpp
@@ -25,13 +25,12 @@ class Structure : public Util::GameObject,
                   public AttackAndDamageUnit {
 
 public:
-    enum class updateMode { Invisidable, Moveable, Fixed };
     Structure()
         : electricPower(0.F),
           buildingTime(0.F),
           buildingCost(0.F),
           m_ID(GameObjectID(unitType::null, HouseType::NONE)) {
-        m_CurrentState = updateMode::Invisidable;
+        m_CurrentState = unitStatus::NotBornedYet;
     };
 
     Structure(float electricPower, float buildingTime, float buildingCost,
@@ -58,8 +57,7 @@ class Structure : public Util::GameObject,
         m_StructureSpriteSheet->Start(
             "../assets/sprites/Barracks_SpriteSheet.png", 48, 48, 13, 0);
     }
-    updateMode GetCurrentUpdateMode() const { return m_CurrentState; };
-    void SetCurrentUpdateMode(updateMode mode) { m_CurrentState = mode; };
+
     virtual void SetObjectLocation(glm::vec2 location);
 
     glm::vec2 GetObjectLocation() { return this->ObjectLocation; }
@@ -70,7 +68,7 @@ class Structure : public Util::GameObject,
 
     virtual void attachmentUpdate();
     bool getConstructed() {
-        if (m_CurrentState == updateMode::Fixed) {
+        if (m_CurrentState == unitStatus::Alive) {
             return true;
         } else {
             return false;
@@ -94,7 +92,6 @@ class Structure : public Util::GameObject,
     }
 
 protected:
-    updateMode m_CurrentState = updateMode::Invisidable;
     float electricPower;
     float buildingTime;
     float buildingCost;

diff --git a/include/Unit/AttackAndDamageUnit.hpp b/include/Unit/AttackAndDamageUnit.hpp
@@ -8,6 +8,18 @@
 
 class AttackAndDamageUnit {
 public:
+    enum class unitStatus {
+        Death,
+        Alive,
+        NotBornedYet,
+    };
+    enum class unitOrder {
+        ATTACK,
+        NOORDER,
+        MOVE,
+        MOVE_ATTACK,
+        Struct_MOVEABLE
+    };
     AttackAndDamageUnit() {}
     virtual ~AttackAndDamageUnit() {}
 
@@ -27,7 +39,21 @@ class AttackAndDamageUnit {
         return;
     }
 
-private:
+    void UpdateDeath() {
+        if (m_HP <= 0) {
+            m_CurrentState = unitStatus::Death;
+        }
+    }
+
+    unitStatus GetCurrentUpdateMode() const { return m_CurrentState; };
+    unitOrder GetCurrentOrder() const { return m_CurrentOrder; }
+
+    void SetCurrentUpdateMode(unitStatus mode) { m_CurrentState = mode; };
+    void SetCurrentOrder(unitOrder order) { m_CurrentOrder = order; };
+
+protected:
+    unitStatus m_CurrentState = unitStatus::NotBornedYet;
+    unitOrder m_CurrentOrder = unitOrder::NOORDER;
     int m_HP;
     Weapon m_Weapon;
     float m_ArmorRate;

diff --git a/include/Unit/Avatar.hpp b/include/Unit/Avatar.hpp
@@ -19,7 +19,6 @@ class Avatar : public PathfindingUnit,
                public Selectable {
 
 public:
-    enum class UnitMode { DEAD, MOVE, IDLE, MOVE_ATTACK, ALIVE };
     Avatar(){};
     ~Avatar() override{};
 
@@ -38,7 +37,6 @@ class Avatar : public PathfindingUnit,
 
     void DEBUG_printCurrentMoveDirection(MoveDirection Dir);
 
-    UnitMode getUnitMode() { return m_currentMode; }
     virtual void customizeUpdate() {
         if (1 == 1) {
         }
@@ -62,6 +60,5 @@ class Avatar : public PathfindingUnit,
 
 private:
     bool b_justStarted = true;
-    UnitMode m_currentMode;
 };
 #endif // PRACTICALTOOLSFORSIMPLEDESIGN_DUMMY_HPP
diff --git a/src/Structure/Structure.cpp b/src/Structure/Structure.cpp
@@ -15,34 +15,32 @@ void Structure::Start() {
     SetZIndex(DEFAULT_ZINDEX);
     this->SetAttachVisible(false);
     SetSpriteSheet();
-    m_CurrentState = updateMode::Moveable;
+    m_CurrentState = unitStatus::Strucutre_Moveable;
 }
 void Structure::Update() {
 
     switch (m_CurrentState) {
-    case updateMode::Invisidable: {
-        this->updateInvinsible();
-        break;
-    }
-    case updateMode::Fixed: {
+    case unitStatus::NotBornedYet {
+        this->updateInvinsible(); break;
+    } case unitStatus::Alive: {
         whenSelected();
         this->updateFixed();
         break;
     }
-    case updateMode::Moveable: {
-        this->updateMoveable();
-        break;
+    if( unitStatus::Strucutre_Moveable: {
+            this->updateMoveable();
+            break;
     }
     }
 }
 void Structure::updateFixed() {
     // Attachment and self readjust location and draw---------------
     attachmentUpdate();
     if (m_SpriteSheetAnimation->getFinished()) {
-        m_StructureSpriteSheet->DrawSpriteByIndex(
-            m_StructureSpriteSheet->getSize() - 1, m_Transform, DEFAULT_ZINDEX);
+    m_StructureSpriteSheet->DrawSpriteByIndex(
+        m_StructureSpriteSheet->getSize() - 1, m_Transform, DEFAULT_ZINDEX);
     } else {
-        m_SpriteSheetAnimation->Draw(m_Transform, DEFAULT_ZINDEX);
+    m_SpriteSheetAnimation->Draw(m_Transform, DEFAULT_ZINDEX);
     }
     // Script when select--------------------
 }
@@ -58,10 +56,10 @@ void Structure::updateMoveable() {
     m_StructureSpriteSheet->DrawSpriteByIndex(
         m_StructureSpriteSheet->getSize() - 1, m_Transform, DEFAULT_ZINDEX);
     if (Util::Input::IsKeyPressed(Util::Keycode::MOUSE_LB)) {
-        this->SetObjectLocation(location);
-        m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet,
-                                                         true, INTERVAL, false);
-        this->SetCurrentUpdateMode(updateMode::Fixed);
+    this->SetObjectLocation(location);
+    m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet,
+                                                     true, INTERVAL, false);
+    this->SetCurrentUpdateMode(updateMode::Fixed);
     }
 }
 
@@ -84,7 +82,7 @@ void Structure::attachmentUpdate() {
 std::vector<glm::vec2> Structure::GetAbsoluteOccupiedArea() {
     std::vector<glm::vec2> Area;
     for (auto i : m_relativeOccupiedArea) {
-        Area.push_back({i.x + GetObjectCell().x, i.y + GetObjectCell().y});
+    Area.push_back({i.x + GetObjectCell().x, i.y + GetObjectCell().y});
     }
     return Area;
 }
diff --git a/src/Unit/Avatar.cpp b/src/Unit/Avatar.cpp
@@ -57,30 +57,25 @@ void Avatar::whenSelected() {
 
 void Avatar::Update() {
     whenSelected();
-    switch (m_currentMode) {
-    case (UnitMode::DEAD): {
+    switch (m_CurrentState) {
+    case (unitStatus::Death):
         SetVisible(false);
         break;
-    }
-    case (UnitMode::MOVE): {
-        aliveUpdate();
-        break;
-    }
-    case (UnitMode::MOVE_ATTACK): {
+
+    case (unitStatus::Alive):
         aliveUpdate();
-        customizeUpdate();
         break;
-    }
+
         // attack
     }
 }
 
 void Avatar::aliveUpdate() {
+    walkTowardNextCell();
     if (arrivedAtNextCell() || b_justStarted) {
-        walkTowardNextCell();
         b_justStarted = false;
         setCurrentCell(MapUtil::GlobalCoordToCellCoord(getCurrentLocation()));
-        // setCurrentDir(m_wayPointUnit.getFirstCellDir());
+
         setNextCell(
             PathUtility::getNextCellByCurrent(getCurrentDir(), getNextCell()));
         // printf("(aliveUpdate) getting new dir\n");
@@ -91,10 +86,9 @@ void Avatar::aliveUpdate() {
             m_currentDir = MoveDirection::IDLE;
         }
     }
-    // m_wayPointUnit.Update();
 
     SetVisible(true);
-    m_Transform.translation = getCurrentLocation();
+    m_Transform.translation = m_currentLocation;
 
     Draw();
     //        m_SpriteSheetAnimation->Draw(m_Transform, DEFAULT_ZINDEX);

diff --git a/src/Unit/PathFindingUnit.cpp b/src/Unit/PathFindingUnit.cpp
@@ -66,7 +66,6 @@ bool PathfindingUnit::arrivedAtNextCell() {
         return true;
     } else {
         m_moveDistance += m_MovementSpeed;
+        return false;
     }
-
-    return false;
 }