From a97d8414cbe606cc9ca8ba0685c50a532fa923bb Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Fri, 17 May 2024 01:45:57 +0800 Subject: [PATCH 1/7] combat init --- src/Scene/TutorialScene.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Scene/TutorialScene.cpp b/src/Scene/TutorialScene.cpp index 90ed8c98..1f7ebe72 100644 --- a/src/Scene/TutorialScene.cpp +++ b/src/Scene/TutorialScene.cpp @@ -8,6 +8,7 @@ void TutorialScene::Start() { LOG_TRACE("Start"); m_Map->Init(100, 100); m_GameObjectManager->Start(m_Map); + m_EnemyObjectManager->Start(m_Map); m_UI.Start(m_Map, m_GameObjectManager); m_Player->setTotalCurrency(5000); m_Enemy->setTotalCurrency(5000); From f4d2a4c1dd7d93c29aca2ce37bb17ed82a72c9f7 Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Fri, 17 May 2024 11:05:29 +0800 Subject: [PATCH 2/7] composition avatar and combat --- assets/sprites/.DS_Store | Bin 8196 -> 8196 bytes assets/sprites/mech.png | Bin 22644 -> 0 bytes assets/sprites/mech_dead.png | Bin 0 -> 922 bytes assets/sprites/mech_open_fire.png | Bin 0 -> 536 bytes assets/sprites/mech_taken_damage.png | Bin 0 -> 862 bytes include/Avatar/Avatar.hpp | 20 ++++---- include/Avatar/Infantry.hpp | 6 +-- include/Avatar/Moving.hpp | 37 +++++++++++---- include/Avatar/Weapon.hpp | 10 +++- include/Mechanics/AvatarManager.hpp | 5 +- include/Mechanics/NemesisManager.hpp | 6 ++- include/Mechanics/UnitManager.hpp | 7 --- src/Avatar/Avatar.cpp | 66 ++++++++++++--------------- src/Avatar/Hunter.cpp | 11 ++--- src/Avatar/Runner.cpp | 22 ++++----- src/Mechanics/AvatarManager.cpp | 65 +++++++++++++++----------- src/Scene/TutorialScene.cpp | 7 ++- src/UI/UI.cpp | 2 +- 18 files changed, 148 insertions(+), 116 deletions(-) delete mode 100644 assets/sprites/mech.png create mode 100644 assets/sprites/mech_dead.png create mode 100644 assets/sprites/mech_open_fire.png create mode 100644 assets/sprites/mech_taken_damage.png diff --git a/assets/sprites/.DS_Store b/assets/sprites/.DS_Store index ea923d7749fe6f98a29e5ea54d5573c9772c2893..4cd0e8432987666a06e73fc8cbcd5e1da26f6155 100644 GIT binary patch delta 44 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 Yh@U=kdXHx%GTFd)``&Gp-iN>a4>ZV=D*ylh diff --git a/assets/sprites/mech_dead.png b/assets/sprites/mech_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..fe0853cd0b150d59319877f40b5f036762eddc27 GIT binary patch literal 922 zcmeAS@N?(olHy`uVBq!ia0vp^hCnRG!3HE-)4u%&QjEnx?oJHr&dIz4aspB#JkxxA z8MJ_G4hAMhAqHlU5+Gz~&tzZ$vl$rFfHVUG^8!YM>;fjZtl+&|t5G3DA(p z%#etZ2wxwoh+i z#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x! zEwNQn0$BtH5O0c3d|4@L;p!l8k%E4h-bUo-U3d5u9(QE(|*CAkg;TXsV!~ z;E9foE-n{WS5~G*2L&Yo(Gy;B3-|?3GKYXTQ#-o4fT-&Phl|TmPM7pUf2Ug}7+sbu zDp|(!rYomt=k43S-|e?`@ZsQKR8(MTX%P7Fm&IzGCf_ed(Kfrh(|1}V)<2LrZOU$a zF7we%fvNAAFEUlUyt;7PU5=A#U%J*a5L~eH6=kKy$ z>YQoc4T`kd3_s;IT13{)>2&_INl52VRjUrmaXqGbC%?62k5)&?Rj-)!#k2N7?WAqH zHw3WSoHsta+4p8*>FJP`2U-TXms6h3VQ2o6VK6ym>7vSAPcF@CUQu_^-%CA^(d~ob z%`1O5Df&oTYcBP<|MI7_Q|zkCXV&`2$GCJx{r?xiKA&;pH|w{Vv*t@4zpJsnH0;*3 z%FdE`(x<{cm;c_e>&^0K_U{F6z5aEm!Y3J5; zOFNjqOxtqn<7zXZdHTsVrI(wvHq;*FhK7{|TVweRm!?#$NGmw%5gWiFnV zKTG6H?B&@SGAinCf0uR_f2rswST;#p%Q^T>K=Xm!k;;p%bA3Cz@o>fOz->RXuevfW zZc5Ntd{|6y4L?ib_fqqaSq$%fo(ODmn4ROW=kW958DR_S>hfOA(%t%rop;-vgXver zcN+4hl)e1(I+$1XtESo2m-EkUW?U)LQ8BfFE60bAiIUbifGqQ0*g-y~F z)2%hHkM3T(^}!=yN3%yK&*X+FYzPUM^>4dN_T5#lexL5E+pkl!X`N?UM$d(_p8UEM xZ+KW2)CVgktDM{i3>FS%aOfbY1NxFbm=^hF&YYfd{Uaz=JYD@<);T3K0RUVv(f$Ac literal 0 HcmV?d00001 diff --git a/assets/sprites/mech_taken_damage.png b/assets/sprites/mech_taken_damage.png new file mode 100644 index 0000000000000000000000000000000000000000..96ffd13938ec65ac14951946bee85a3b3de51b17 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^@<1%j!3HE->_hZ{6k~CayA#8@b22Z1oPg8_&op0O z1}z|)gMo=rh=CcT1PB@0GZ|RGYz783AkDzQynqoQyMPHUE5Cpl&Xxu#oPH}-187KO zW=KRygs+cPa(=E}VoH8es$NBI0Z0LZO@$SZnVVXYs8ErclUHn2VXFjIVFhG^g!Ppa zz)DK8ZIvQ?0~DO|i&7QL^bGV2l1AfjnEKjFOT9D}DX)@^Za$ zW4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o3raHc^AtelCMM;V zme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjoGZknv$b36P8?Z_g zF{nK@`XI}Z90TzwSQO}0J1!f2c(B=VNya^72L^Jur;B5V2XAtM1Zzsmfr%__|5GxW zvlE*(w+S)dysltoG(Vz#gTQKmCGY%s4*wUg<*3Yzs7Xz>kD9rB0e5+5BZNIosaR`ggp zh0W8BJ#&GYgZJ(oz1w~qK2YH7#_%S2g4Trf!F&Y_k@f}IN(#))wlHh*_|x_&{~k@*w; zEAR+8EKAJU;bg*gF_L#p|KWy*$C|Alh{y>EeY*dEFDscTgetCurrentCell().x, 2) + + pow(cell.y - m_Moving->getCurrentCell().y, 2)); } void setSpriteSheet() { @@ -70,9 +68,13 @@ class Avatar : public Moving, m_Health = health; } + void DrawAvatar(); + +public: std::shared_ptr getAttackAndDamager() { return m_AttackAndDamage; } + std::shared_ptr getMoving() { return m_Moving; } protected: std::shared_ptr m_AvatarSpriteSheet = @@ -80,6 +82,8 @@ class Avatar : public Moving, std::shared_ptr m_SpriteSheetAnimation = std::make_shared(); + // moving + std::shared_ptr m_Moving = std::make_shared(); // health std::shared_ptr m_Health = std::make_shared(); // attack and damage diff --git a/include/Avatar/Infantry.hpp b/include/Avatar/Infantry.hpp index bc84e8cb..c1b7bf7f 100644 --- a/include/Avatar/Infantry.hpp +++ b/include/Avatar/Infantry.hpp @@ -9,15 +9,15 @@ class Infantry : public Avatar { public: Infantry() : Avatar() { - setMovementSpeed(4), + getMoving()->setMovementSpeed(4), m_Health = std::make_shared( std::make_shared(LivingStatus::NOT_BORN_YET), 100, 0.5); } Infantry(HouseType house) - : Avatar(UnitType::INFANTRY,house){ + : Avatar(UnitType::INFANTRY, house) { // setHp(50); - setMovementSpeed(4); + getMoving()->setMovementSpeed(4); } private: diff --git a/include/Avatar/Moving.hpp b/include/Avatar/Moving.hpp index 8db0fd5e..2d731c68 100644 --- a/include/Avatar/Moving.hpp +++ b/include/Avatar/Moving.hpp @@ -20,7 +20,6 @@ class Moving { std::vector m_lineVector; glm::vec2 m_CurrentLocation; - glm::vec2 m_DestinationLocation; MoveDirection m_CurrentDir = MoveDirection::IDLE; @@ -37,7 +36,7 @@ class Moving { }; Moving(){}; - virtual ~Moving(){}; + ~Moving(){}; glm::vec2 getCurrentCell() { return MapUtil::GlobalCoordToCellCoord(getCurrentLocation()); @@ -47,6 +46,25 @@ class Moving { m_CurrentLocation = location; } MoveDirection getCurrentDir() { return m_CurrentDir; } + void setCurrentDir(MoveDirection dir) { m_CurrentDir = dir; } + + void moveUpdate() { + if (ifArrivedAtNextCell()) { + m_PrevCell = getCurrentCell(); + if (!m_MovePath.empty()) { + setCurrentDir(m_MovePath.front()); + m_MovePath.pop_front(); + } else { + finishedmovingUpdate(); + } + } + moveToNextCell(); + } + + void finishedmovingUpdate() { + moveToCellCorner(AvatarStandingCorner::CENTER); + setCurrentDir(MoveDirection::IDLE); + } void moveToNextCell(); void moveToCellCorner(AvatarStandingCorner corner); @@ -59,13 +77,14 @@ class Moving { m_PrevCell = getCurrentCell(); } - void setMovementSpeed(float speed) { m_MovementSpeed = speed; } - - glm::vec2 getDestinationCell() { - return MapUtil::CellCoordToGlobal(m_DestinationLocation); - } - void setDestinationCell(glm::vec2 destination) { - m_DestinationLocation = MapUtil::GlobalCoordToCellCoord(destination); + bool ifMovePathEmpty() { + if (m_MovePath.empty()) { + return true; + } else { + return false; + } } + + void setMovementSpeed(float speed) { m_MovementSpeed = speed; } }; #endif // PRACTICALTOOLSFORSIMPLEDESIGN_MOVING_HPP diff --git a/include/Avatar/Weapon.hpp b/include/Avatar/Weapon.hpp index c4081c4a..5c66f555 100644 --- a/include/Avatar/Weapon.hpp +++ b/include/Avatar/Weapon.hpp @@ -14,12 +14,18 @@ enum class WeaponType { Art_105mm, Art_120mm, Nuke, - Grenade + Grenade, + NONE }; class Weapon { public: - Weapon() {} + Weapon() + : m_FireRange(1), + m_SoftAttack(10), + m_HardAttack(10), + m_FireRateInMs(10), + m_Type(WeaponType::NONE) {} Weapon(float firerate, float firerange, float softattack, float hardattack, WeaponType weapontype) : m_FireRange(firerange), diff --git a/include/Mechanics/AvatarManager.hpp b/include/Mechanics/AvatarManager.hpp index 7b356d93..518a7fbf 100644 --- a/include/Mechanics/AvatarManager.hpp +++ b/include/Mechanics/AvatarManager.hpp @@ -29,9 +29,10 @@ class AvatarManager { std::vector> getAvatarArray() { return m_AvatarArray; } - void forceMove(std::shared_ptr unit,glm::vec2 cell); + void forceMove(std::shared_ptr unit, glm::vec2 cell); + protected: - void giveOrderToAvatar(std::shared_ptr unit); + void giveOrderToMyAvatar(std::shared_ptr unit); void updateTileWhileAvatarMoving(std::shared_ptr unit); diff --git a/include/Mechanics/NemesisManager.hpp b/include/Mechanics/NemesisManager.hpp index e554bcde..a6e3fab9 100644 --- a/include/Mechanics/NemesisManager.hpp +++ b/include/Mechanics/NemesisManager.hpp @@ -33,8 +33,10 @@ class NemesisManager { if (ifAvatarHasNemesis(hunter) == false) { return false; } - if (hunter->getDistance(m_Nemesis[hunter]->getCurrentCell()) <= - hunter->getWeapon()->getFireRange()) // check with in range + if (hunter->getDistance( + m_Nemesis[hunter]->getMoving()->getCurrentCell()) <= + hunter->getWeapon()->getFireRange() * + CELL_SIZE.x) // check with in range { return true; } else { diff --git a/include/Mechanics/UnitManager.hpp b/include/Mechanics/UnitManager.hpp index 2007280a..b945048f 100644 --- a/include/Mechanics/UnitManager.hpp +++ b/include/Mechanics/UnitManager.hpp @@ -91,8 +91,6 @@ class UnitManager : public Player { return; } - - avatar->Start(m_StructureManager->getStructureArray() ->getPlayerBarrackCell()); // avatar @@ -109,11 +107,6 @@ class UnitManager : public Player { void spawn(std::shared_ptr m_Map, UnitType unit, HouseType house, glm::vec2 cellPos) { // 缺檢查敵方擁有建築的位置，並重生在該處 - if (house == HouseType::ENEMY) { - // m_Enemy->addUnitConstructCount(unit, 1); - } else { - // m_Player->setUnitConstructCount(unit, 1); - } switch (unit) { case UnitType::BARRACKS: { auto structure = std::make_shared(house); diff --git a/src/Avatar/Avatar.cpp b/src/Avatar/Avatar.cpp index 30ea5564..ab73d129 100644 --- a/src/Avatar/Avatar.cpp +++ b/src/Avatar/Avatar.cpp @@ -9,7 +9,12 @@ void Avatar::whenSelected() { } void Avatar::Update() { + + if (getMoving()->ifMovePathEmpty()) { + m_AvatarOrder = AvatarOrderType::NO_ORDER; + } switch (*m_Health->getLivingStatus()) { + DrawAvatar(); case (LivingStatus::DEAD): SetVisible(false); break; @@ -18,12 +23,14 @@ void Avatar::Update() { whenSelected(); if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { - + // open fire } else if (m_AvatarOrder == AvatarOrderType::MOVE) { - moveUpdate(); + m_Moving->moveUpdate(); } else if (m_AvatarOrder == AvatarOrderType::NO_ORDER) { - noOrderUpdate(); + noorderUpdate(); } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { + + // takendamage } else if (m_AvatarOrder == AvatarOrderType::SPAWNED) { spawnedUpdate(); } @@ -32,39 +39,15 @@ void Avatar::Update() { } } -void Avatar::noOrderUpdate() { - m_CurrentDir = MoveDirection::IDLE; +void Avatar::noorderUpdate() { + getMoving()->setCurrentDir(MoveDirection::IDLE); SetVisible(true); - m_Transform.translation = getCurrentLocation(); - - Draw(); + m_Transform.translation = getMoving()->getCurrentLocation(); } void Avatar::spawnedUpdate() { SetVisible(true); - m_Transform.translation = getCurrentLocation(); - - Draw(); -} -void Avatar::moveUpdate() { - - if (ifArrivedAtNextCell()) { - m_PrevCell = getCurrentCell(); - if (!m_MovePath.empty()) { - m_CurrentDir = m_MovePath.front(); - m_MovePath.pop_front(); - } else { - finishedmovingUpdate(); - m_CurrentDir = MoveDirection::IDLE; - m_AvatarOrder = AvatarOrderType::NO_ORDER; - } - } - moveToNextCell(); - - SetVisible(true); - m_Transform.translation = getCurrentLocation(); - - Draw(); + m_Transform.translation = getMoving()->getCurrentLocation(); } void Avatar::Start(glm::vec2 spawnlocationcell) { // destination = Barrack's @@ -73,9 +56,10 @@ void Avatar::Start(glm::vec2 spawnlocationcell) { // destination = Barrack's this->SetDrawable(customizeImage()); // setSpriteSheet(); SetVisible(true); - setMovementSpeed(4); + getMoving()->setMovementSpeed(4); m_AvatarOrder = AvatarOrderType::SPAWNED; - m_CurrentLocation = MapUtil::CellCoordToGlobal(spawnlocationcell); + getMoving()->getCurrentLocation() = + MapUtil::CellCoordToGlobal(spawnlocationcell); m_Transform.scale = {1, 1}; getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); @@ -124,9 +108,17 @@ void Avatar::DEBUG_printCurrentMoveDirection(MoveDirection Dir) { } } -void Avatar::finishedmovingUpdate() { - Moving::moveToCellCorner(AvatarStandingCorner::CENTER); - m_Transform.translation = getCurrentLocation(); - +void Avatar::DrawAvatar() { + m_Transform.translation = getMoving()->getCurrentLocation(); + if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_open_fire.png")); + } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_taken_damage.png")); + } else { + this->SetDrawable( + std::make_shared("../assets/sprites/mech_single.png")); + } Draw(); } diff --git a/src/Avatar/Hunter.cpp b/src/Avatar/Hunter.cpp index bdc4af69..338bc324 100644 --- a/src/Avatar/Hunter.cpp +++ b/src/Avatar/Hunter.cpp @@ -5,17 +5,16 @@ #include "Avatar/Hunter.hpp" void Hunter::customizeUpdate() { - glm::vec2 targetCell = m_target->getCurrentCell(); + glm::vec2 targetCell = m_target->getMoving()->getCurrentCell(); if (getDistance(targetCell) > ATTACK_RANGE - 1 && - lastTargetCell != m_target->getCurrentCell()) { + lastTargetCell != m_target->getMoving()->getCurrentCell()) { // glm::vec2 nextCell = // getNextCellByCurrent(getDirByRelativeCells(getCurrentCell(),targetCell),getCurrentCell()); - setDestinationCell(m_target->getCurrentCell()); - lastTargetCell = m_target->getCurrentCell(); + + lastTargetCell = m_target->getMoving()->getCurrentCell(); // setNewDestination(nextCell); } else if (getDistance(targetCell) < ATTACK_RANGE - 1) { - setDestinationCell(getCurrentCell()); - lastTargetCell = getCurrentCell(); + lastTargetCell = getMoving()->getCurrentCell(); attack(m_target); } } diff --git a/src/Avatar/Runner.cpp b/src/Avatar/Runner.cpp index 3fd11c99..b2edb930 100644 --- a/src/Avatar/Runner.cpp +++ b/src/Avatar/Runner.cpp @@ -6,30 +6,30 @@ void Runner::setBeingChase(std::shared_ptr hunter) { b_beingChase = true; m_hunter = hunter; - lastTargetCell = getCurrentCell(); + lastTargetCell = m_Moving->getCurrentCell(); } void Runner::customizeUpdate() { if (b_beingChase && *m_hunter->getHealth()->getLivingStatus() == LivingStatus::ALIVE) { - glm::vec2 hunterCell = m_hunter->getCurrentCell(); + glm::vec2 hunterCell = m_hunter->getMoving()->getCurrentCell(); if (getDistance(hunterCell) <= ATTACK_RANGE - 1 && - lastTargetCell == getCurrentCell()) { + lastTargetCell == getMoving()->getCurrentCell()) { edgeCount = 0; - MoveDirection Dir = oppositeDir(PathUtility::getDirByRelativeCells( - getCurrentCell(), hunterCell), - runMode::LIDL_RANDOM); + MoveDirection Dir = + oppositeDir(PathUtility::getDirByRelativeCells( + getMoving()->getCurrentCell(), hunterCell), + runMode::LIDL_RANDOM); DEBUG_printCurrentMoveDirection(Dir); - glm::vec2 nextCell = - getNextCellByCurrentPlus3(Dir, getCurrentCell(), 3, 1); + glm::vec2 nextCell = getNextCellByCurrentPlus3( + Dir, getMoving()->getCurrentCell(), 3, 1); while (nextCell.x < 0 || nextCell.y < 0) { edgeCount += rand() % 2 + 1; Dir = findNewDir(Dir, edgeCount); DEBUG_printCurrentMoveDirection(Dir); - nextCell = - getNextCellByCurrentPlus3(Dir, getCurrentCell(), 1, 3); + nextCell = getNextCellByCurrentPlus3( + Dir, getMoving()->getCurrentCell(), 1, 3); } lastTargetCell = nextCell; - setDestinationCell(nextCell); } } else { b_beingChase = false; diff --git a/src/Mechanics/AvatarManager.cpp b/src/Mechanics/AvatarManager.cpp index a1cf3cdf..54cade30 100644 --- a/src/Mechanics/AvatarManager.cpp +++ b/src/Mechanics/AvatarManager.cpp @@ -5,54 +5,67 @@ #include "Mechanics/AvatarManager.hpp" void AvatarManager::Update() { + m_NemesisManager->Update(); for (auto unit : m_AvatarArray) { unit->Update(); if (unit->getAvatarOrder() == AvatarOrderType::MOVE) { updateTileWhileAvatarMoving(unit); } if (unit->getSelected()) { - giveOrderToAvatar(unit); + giveOrderToMyAvatar(unit); } } } -void AvatarManager::giveOrderToAvatar(std::shared_ptr unit) { - if (Util::Input::IsKeyDown(Util::Keycode::MOUSE_RB)) { - auto dest = Util::Input::GetCursorPosition(); - auto queue = m_Navigator->findPath( - unit->getCurrentCell(), MapUtil::GlobalCoordToCellCoord( - MapUtil::ScreenToGlobalCoord(dest))); - // unit - unit->setMovePath(queue); +void AvatarManager::giveOrderToMyAvatar(std::shared_ptr unit) { + if (unit->getID().getHouseType() == HouseType::MY) { + if (Util::Input::IsKeyDown(Util::Keycode::MOUSE_RB)) { + auto dest = Util::Input::GetCursorPosition(); + auto queue = + m_Navigator->findPath(unit->getMoving()->getCurrentCell(), + MapUtil::GlobalCoordToCellCoord( + MapUtil::ScreenToGlobalCoord(dest))); + // unit + unit->getMoving()->setMovePath(queue); - if (m_Map->getTileByCellPosition(unit->getDestinationCell()) - ->ifEnemyAtTile()) { - m_NemesisManager->addNemesis( - unit, m_Map->getTileByCellPosition(unit->getDestinationCell()) - ->getAvatars()[0]); - } else { - unit->setAvatarOrder(AvatarOrderType::MOVE); + if (m_Map + ->getTileByCellPosition(MapUtil::GlobalCoordToCellCoord( + MapUtil::ScreenToGlobalCoord(dest))) + ->ifEnemyAtTile()) { + unit->setAvatarOrder(AvatarOrderType::MOVE); + m_NemesisManager->addNemesis( + unit, + m_Map + ->getTileByCellPosition(MapUtil::GlobalCoordToCellCoord( + MapUtil::ScreenToGlobalCoord(dest))) + ->getAvatars()[0]); + } else { + unit->setAvatarOrder(AvatarOrderType::MOVE); + } } } } -void AvatarManager::forceMove(std::shared_ptr unit,glm::vec2 cell){ - unit->setAvatarOrder(AvatarOrderType::MOVE); - auto queue = m_Navigator->findPath(unit->getCurrentCell(), cell); - unit->setMovePath(queue); - } +void AvatarManager::forceMove(std::shared_ptr unit, glm::vec2 cell) { + unit->setAvatarOrder(AvatarOrderType::MOVE); + auto queue = + m_Navigator->findPath(unit->getMoving()->getCurrentCell(), cell); + unit->getMoving()->setMovePath(queue); +} void AvatarManager::updateTileWhileAvatarMoving( std::shared_ptr avatar) { - if (avatar->ifArrivedAtNextCell()) { + if (avatar->getMoving()->ifArrivedAtNextCell()) { m_Map->removeAvatarsByCellPosition(avatar, unitArrayAndLocation[avatar]); - m_Map->setAvatarByCellPosition(avatar, avatar->getCurrentCell()); - unitArrayAndLocation[avatar] = avatar->getCurrentCell(); + m_Map->setAvatarByCellPosition(avatar, + avatar->getMoving()->getCurrentCell()); + unitArrayAndLocation[avatar] = avatar->getMoving()->getCurrentCell(); } } void AvatarManager::AppendAvatar(std::shared_ptr newAvatar) { m_AvatarArray.push_back(newAvatar); - unitArrayAndLocation[newAvatar] = newAvatar->getCurrentCell(); - m_Map->setAvatarByCellPosition(newAvatar, newAvatar->getCurrentCell()); + unitArrayAndLocation[newAvatar] = newAvatar->getMoving()->getCurrentCell(); + m_Map->setAvatarByCellPosition(newAvatar, + newAvatar->getMoving()->getCurrentCell()); } diff --git a/src/Scene/TutorialScene.cpp b/src/Scene/TutorialScene.cpp index 1f7ebe72..a8b55df6 100644 --- a/src/Scene/TutorialScene.cpp +++ b/src/Scene/TutorialScene.cpp @@ -26,6 +26,9 @@ void TutorialScene::Start() { */ m_GameObjectManager->spawn(m_Map, UnitType::INFANTRY, HouseType::MY, {5, 5}); + // combat test + m_EnemyObjectManager->spawn(m_Map, UnitType::INFANTRY, HouseType::ENEMY, + {6, 6}); stageStart(); } @@ -89,7 +92,7 @@ void TutorialScene::stageUpdate() { for (auto i : m_GameObjectManager->getAvatarManager()->getAvatarArray()) { if (i->getHouseType() == HouseType::MY) { - if (m_cellProp->isOverlaps(i->getCurrentCell()) || + if (m_cellProp->isOverlaps(i->getMoving()->getCurrentCell()) || Util::Input::IsKeyPressed(Util::Keycode::DEBUG_KEY)) { // change next stage's text&prop here m_Text->SetDrawable(std::make_unique( @@ -139,7 +142,7 @@ void TutorialScene::stageUpdate() { for (auto i : m_GameObjectManager->getAvatarManager()->getAvatarArray()) { if (i->getHouseType() == HouseType::MY) { - if (m_cellProp->isOverlaps(i->getCurrentCell())) { + if (m_cellProp->isOverlaps(i->getMoving()->getCurrentCell())) { avatarCount++; } } diff --git a/src/UI/UI.cpp b/src/UI/UI.cpp index beb9538d..59654d8f 100644 --- a/src/UI/UI.cpp +++ b/src/UI/UI.cpp @@ -442,7 +442,7 @@ std::shared_ptr UIClass::getUnitFromUI() { Avatar->Start({m_barrackCell.x + 1, m_barrackCell.y - 1}); - Avatar->setDestinationCell(m_barrackTargetCell); + // Avatar->setDestinationCell(m_barrackTargetCell); } printf("(UI)return to GOM success\n"); return Avatar; From f795f9b78fe838bc9167b27496283f539d524065 Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Fri, 17 May 2024 11:49:25 +0800 Subject: [PATCH 3/7] open fire and dead --- include/Avatar/AttackAndDamage.hpp | 8 +++---- include/Avatar/Weapon.hpp | 2 +- include/Mechanics/NemesisManager.hpp | 6 ++---- src/Avatar/Avatar.cpp | 31 +++++++++++++++++----------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/include/Avatar/AttackAndDamage.hpp b/include/Avatar/AttackAndDamage.hpp index cfb9dd9e..f98daba6 100644 --- a/include/Avatar/AttackAndDamage.hpp +++ b/include/Avatar/AttackAndDamage.hpp @@ -16,10 +16,10 @@ class AttackAndDamage { void damageTargetWithWeapon(std::shared_ptr target, std::shared_ptr weapon) { auto targethealth = target->getHealth(); - targethealth->addHP(-1 * (100 - targethealth->getArmorRate()) * - (1 / 100) * m_Weapon->getSoftAttack() + - targethealth->getArmorRate() * (1 / 100) * - m_Weapon->getHardAttack()); + auto damage = + ((1 - targethealth->getArmorRate()) * m_Weapon->getSoftAttack()) + + (targethealth->getArmorRate() * m_Weapon->getHardAttack()); + targethealth->addHP(-1 * damage); } void openFireToTarget(std::shared_ptr target) { diff --git a/include/Avatar/Weapon.hpp b/include/Avatar/Weapon.hpp index 5c66f555..36b32bab 100644 --- a/include/Avatar/Weapon.hpp +++ b/include/Avatar/Weapon.hpp @@ -24,7 +24,7 @@ class Weapon { : m_FireRange(1), m_SoftAttack(10), m_HardAttack(10), - m_FireRateInMs(10), + m_FireRateInMs(180), m_Type(WeaponType::NONE) {} Weapon(float firerate, float firerange, float softattack, float hardattack, WeaponType weapontype) diff --git a/include/Mechanics/NemesisManager.hpp b/include/Mechanics/NemesisManager.hpp index a6e3fab9..5e893f8a 100644 --- a/include/Mechanics/NemesisManager.hpp +++ b/include/Mechanics/NemesisManager.hpp @@ -53,10 +53,6 @@ class NemesisManager { hunter->setAvatarOrder(AvatarOrderType::OPEN_FIRE); prey->setAvatarOrder(AvatarOrderType::TAKEN_DAMAGE); hunter->getAttackAndDamager()->openFireToTarget(prey); - // 反擊 - prey->setAvatarOrder(AvatarOrderType::OPEN_FIRE); - hunter->setAvatarOrder(AvatarOrderType::TAKEN_DAMAGE); - prey->getAttackAndDamager()->openFireToTarget(prey); } if (*pair.second->getHealth()->getLivingStatus() == @@ -64,6 +60,7 @@ class NemesisManager { removeNemesis(hunter); hunter->setAvatarOrder(AvatarOrderType::NO_ORDER); prey->setAvatarOrder(AvatarOrderType::NO_ORDER); + break; } if (*pair.first->getHealth()->getLivingStatus() == @@ -71,6 +68,7 @@ class NemesisManager { removeNemesis(hunter); hunter->setAvatarOrder(AvatarOrderType::NO_ORDER); prey->setAvatarOrder(AvatarOrderType::NO_ORDER); + break; } } } diff --git a/src/Avatar/Avatar.cpp b/src/Avatar/Avatar.cpp index ab73d129..fa931b44 100644 --- a/src/Avatar/Avatar.cpp +++ b/src/Avatar/Avatar.cpp @@ -9,12 +9,12 @@ void Avatar::whenSelected() { } void Avatar::Update() { - + DrawAvatar(); if (getMoving()->ifMovePathEmpty()) { m_AvatarOrder = AvatarOrderType::NO_ORDER; } switch (*m_Health->getLivingStatus()) { - DrawAvatar(); + case (LivingStatus::DEAD): SetVisible(false); break; @@ -58,8 +58,8 @@ void Avatar::Start(glm::vec2 spawnlocationcell) { // destination = Barrack's SetVisible(true); getMoving()->setMovementSpeed(4); m_AvatarOrder = AvatarOrderType::SPAWNED; - getMoving()->getCurrentLocation() = - MapUtil::CellCoordToGlobal(spawnlocationcell); + getMoving()->setCurrentLocation( + MapUtil::CellCoordToGlobal(spawnlocationcell)); m_Transform.scale = {1, 1}; getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); @@ -110,15 +110,22 @@ void Avatar::DEBUG_printCurrentMoveDirection(MoveDirection Dir) { void Avatar::DrawAvatar() { m_Transform.translation = getMoving()->getCurrentLocation(); - if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { - this->SetDrawable(std::make_shared( - "../assets/sprites/mech_open_fire.png")); - } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { - this->SetDrawable(std::make_shared( - "../assets/sprites/mech_taken_damage.png")); - } else { + SetVisible(true); + if (getHealth()->getHP() < 50) { this->SetDrawable( - std::make_shared("../assets/sprites/mech_single.png")); + std::make_shared("../assets/sprites/mech_dead.png")); + } else { + + if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_open_fire.png")); + } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_taken_damage.png")); + } else { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_single.png")); + } } Draw(); } From cd6b3d07c33f124ee60c78c11b89e76a11e533fc Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Fri, 17 May 2024 12:16:54 +0800 Subject: [PATCH 4/7] struct and avatar comps --- include/Avatar/Avatar.hpp | 26 ++++++------ include/Mechanics/BuiltStructure.hpp | 53 ++++++++++++++----------- include/Mechanics/NemesisManager.hpp | 22 ++++++---- include/Mechanics/StructureManager.hpp | 9 +++-- include/Structure/Structure.hpp | 26 ++++++------ include/Structure/StructureOrder.hpp | 19 +++++---- include/Structure/WayPointStructure.hpp | 3 +- src/Avatar/Avatar.cpp | 25 +++++++----- src/Mechanics/AvatarManager.cpp | 8 ++-- src/Structure/Barracks.cpp | 6 +-- src/Structure/OreRefinery.cpp | 7 ++-- src/Structure/Structure.cpp | 19 +++++---- src/Structure/WarFactory.cpp | 4 +- src/Structure/WayPointStructure.cpp | 2 +- 14 files changed, 126 insertions(+), 103 deletions(-) diff --git a/include/Avatar/Avatar.hpp b/include/Avatar/Avatar.hpp index 525d6033..6c68c95c 100644 --- a/include/Avatar/Avatar.hpp +++ b/include/Avatar/Avatar.hpp @@ -15,11 +15,7 @@ #include "Selectable.hpp" #include "Util/Image.hpp" -class Avatar : public AttackAndDamage, - public AvatarOrder, - public Util::GameObject, - public Selectable, - public IHealthable { +class Avatar : public Util::GameObject, public Selectable, public IHealthable { public: Avatar(){}; @@ -59,22 +55,24 @@ class Avatar : public AttackAndDamage, "../assets/sprites/mech_single.png"); } - GameObjectID getID() { return m_ID; } - virtual void Update() override; - std::shared_ptr getHealth() override { return m_Health; } - void setHealth(std::shared_ptr health) override { - m_Health = health; - } - void DrawAvatar(); public: - std::shared_ptr getAttackAndDamager() { + GameObjectID getID() { return m_ID; } + + std::shared_ptr getAttackAndDamage() { return m_AttackAndDamage; } std::shared_ptr getMoving() { return m_Moving; } + std::shared_ptr getAvatarOrder() { return m_Order; } + + std::shared_ptr getHealth() override { return m_Health; } + + void setHealth(std::shared_ptr health) override { + m_Health = health; + } protected: std::shared_ptr m_AvatarSpriteSheet = @@ -82,6 +80,8 @@ class Avatar : public AttackAndDamage, std::shared_ptr m_SpriteSheetAnimation = std::make_shared(); + // order + std::shared_ptr m_Order = std::make_shared(); // moving std::shared_ptr m_Moving = std::make_shared(); // health diff --git a/include/Mechanics/BuiltStructure.hpp b/include/Mechanics/BuiltStructure.hpp index d6d38cf1..4d2b0a44 100644 --- a/include/Mechanics/BuiltStructure.hpp +++ b/include/Mechanics/BuiltStructure.hpp @@ -13,22 +13,23 @@ class BuiltStructure { virtual ~BuiltStructure() {} void buildNewStructure(std::shared_ptr m_Map, - std::shared_ptr newstruct,bool force=false) { + std::shared_ptr newstruct, + bool force = false) { std::vector coords = newstruct->GetAbsoluteOccupiedArea(); - if(!force){ + if (!force) { if (Util::Input::IsKeyPressed(Util::Keycode::MOUSE_LB)) { if (ifCanBuildStructureAtTile(m_Map, newstruct) == true) { m_BuiltStructure.push_back(newstruct); m_Map->builtStructureByCellPosition(newstruct, coords); - newstruct->setStructOrder( - StructureOrder::StructureOrderType::BUILT); + newstruct->getStructureOrder()->setStructOrder( + StructureOrderType::BUILT); } } - }else{ + } else { m_BuiltStructure.push_back(newstruct); m_Map->builtStructureByCellPosition(newstruct, coords); - newstruct->setStructOrder( - StructureOrder::StructureOrderType::BUILT); + newstruct->getStructureOrder()->setStructOrder( + StructureOrderType::BUILT); } } @@ -62,30 +63,34 @@ class BuiltStructure { m_BuiltStructure.push_back(structure); } - void updateAvatarSpawnLocation(std::vector> structure){ - for(auto i:structure){ - if(std::dynamic_pointer_cast(i)){ - if(i->getHouseType()==HouseType::ENEMY){ - m_EnemyBarrackCell=i->GetObjectLocation(); - m_EnemyWayPointCell=std::dynamic_pointer_cast(i)->GetWayPointLocation(); - } else{ - m_PlayerBarrackCell=i->GetObjectLocation(); - m_PlayerWayPointCell=std::dynamic_pointer_cast(i)->GetWayPointLocation(); + void updateAvatarSpawnLocation( + std::vector> structure) { + for (auto i : structure) { + if (std::dynamic_pointer_cast(i)) { + if (i->getHouseType() == HouseType::ENEMY) { + m_EnemyBarrackCell = i->GetObjectLocation(); + m_EnemyWayPointCell = std::dynamic_pointer_cast(i) + ->GetWayPointLocation(); + } else { + m_PlayerBarrackCell = i->GetObjectLocation(); + m_PlayerWayPointCell = + std::dynamic_pointer_cast(i) + ->GetWayPointLocation(); } } } } - glm::vec2 getEnemyBarrackCell(){return m_EnemyBarrackCell;} - glm::vec2 getEnemyWayPointCell(){return m_EnemyWayPointCell;} - glm::vec2 getPlayerBarrackCell(){return m_PlayerBarrackCell;} - glm::vec2 getPlayerWayPointCell(){return m_PlayerWayPointCell;} + glm::vec2 getEnemyBarrackCell() { return m_EnemyBarrackCell; } + glm::vec2 getEnemyWayPointCell() { return m_EnemyWayPointCell; } + glm::vec2 getPlayerBarrackCell() { return m_PlayerBarrackCell; } + glm::vec2 getPlayerWayPointCell() { return m_PlayerWayPointCell; } protected: std::vector> m_BuiltStructure; - glm::vec2 m_EnemyBarrackCell={-1,-1}; - glm::vec2 m_EnemyWayPointCell={-1,-1}; - glm::vec2 m_PlayerBarrackCell={-1,-1}; - glm::vec2 m_PlayerWayPointCell={-1,-1}; + glm::vec2 m_EnemyBarrackCell = {-1, -1}; + glm::vec2 m_EnemyWayPointCell = {-1, -1}; + glm::vec2 m_PlayerBarrackCell = {-1, -1}; + glm::vec2 m_PlayerWayPointCell = {-1, -1}; }; #endif // PRACTICALTOOLSFORSIMPLEDESIGN_BUILTSTRUCTURE_HPP diff --git a/include/Mechanics/NemesisManager.hpp b/include/Mechanics/NemesisManager.hpp index 5e893f8a..67cc0736 100644 --- a/include/Mechanics/NemesisManager.hpp +++ b/include/Mechanics/NemesisManager.hpp @@ -35,7 +35,7 @@ class NemesisManager { } if (hunter->getDistance( m_Nemesis[hunter]->getMoving()->getCurrentCell()) <= - hunter->getWeapon()->getFireRange() * + hunter->getAttackAndDamage()->getWeapon()->getFireRange() * CELL_SIZE.x) // check with in range { return true; @@ -50,24 +50,30 @@ class NemesisManager { auto hunter = pair.first; auto prey = pair.second; if (ifNemesisWithinWeaponRange(hunter)) { - hunter->setAvatarOrder(AvatarOrderType::OPEN_FIRE); - prey->setAvatarOrder(AvatarOrderType::TAKEN_DAMAGE); - hunter->getAttackAndDamager()->openFireToTarget(prey); + hunter->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::OPEN_FIRE); + prey->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::TAKEN_DAMAGE); + hunter->getAttackAndDamage()->openFireToTarget(prey); } if (*pair.second->getHealth()->getLivingStatus() == LivingStatus::DEAD) { removeNemesis(hunter); - hunter->setAvatarOrder(AvatarOrderType::NO_ORDER); - prey->setAvatarOrder(AvatarOrderType::NO_ORDER); + hunter->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::NO_ORDER); + prey->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::NO_ORDER); break; } if (*pair.first->getHealth()->getLivingStatus() == LivingStatus::DEAD) { removeNemesis(hunter); - hunter->setAvatarOrder(AvatarOrderType::NO_ORDER); - prey->setAvatarOrder(AvatarOrderType::NO_ORDER); + hunter->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::NO_ORDER); + prey->getAvatarOrder()->setAvatarOrder( + AvatarOrderType::NO_ORDER); break; } } diff --git a/include/Mechanics/StructureManager.hpp b/include/Mechanics/StructureManager.hpp index 43bf4aee..f00a4e7c 100644 --- a/include/Mechanics/StructureManager.hpp +++ b/include/Mechanics/StructureManager.hpp @@ -27,14 +27,15 @@ class StructureManager { newstruct->Start(); m_StructSelectingConstructionSite = newstruct; - newstruct->setStructOrder( - StructureOrder::StructureOrderType::SELECTING_SITE); + newstruct->getStructureOrder()->setStructOrder( + StructureOrderType::SELECTING_SITE); } void SelectingBuildSite() { // bulit or not - if (m_StructSelectingConstructionSite->getStructOrder() == - StructureOrder::StructureOrderType::SELECTING_SITE) { + if (m_StructSelectingConstructionSite->getStructureOrder() + ->getStructureOrderType() == + StructureOrderType::SELECTING_SITE) { m_StructureArray.buildNewStructure( m_Map, m_StructSelectingConstructionSite); } diff --git a/include/Structure/Structure.hpp b/include/Structure/Structure.hpp index 004e1d62..bfde5aba 100644 --- a/include/Structure/Structure.hpp +++ b/include/Structure/Structure.hpp @@ -8,13 +8,13 @@ #include "Display/SpriteSheet.hpp" #include "Display/SpriteSheetAnimation.hpp" #include "HighLight.h" +#include "Map/MapUtility.hpp" #include "Mechanics/GameObjectID.hpp" #include "Selectable.hpp" #include "Structure/StructureOrder.hpp" -#include "Util/Image.hpp" - #include "Unit/Health.hpp" #include "Unit/IHealthable.hpp" +#include "Util/Image.hpp" #include "Util/GameObject.hpp" #include "Util/Input.hpp" @@ -26,7 +26,6 @@ class Structure : public Util::GameObject, public Selectable, - public StructureOrder, public IHealthable { public: @@ -79,34 +78,34 @@ class Structure : public Util::GameObject, glm::vec2 GetObjectLocation() { return this->m_ObjectLocation; } virtual void SetAttachVisible(bool visible); glm::vec2 GetDrawLocation() { return m_DrawLocation; }; - void SetID(GameObjectID id) { m_ID = id; }; virtual void attachmentUpdate(); float getElectricPower() { return this->m_ElectricPower; } float getBuildingTime() { return this->m_BuildingTime; } float getBuildingCost() { return this->m_BuildingCost; } - HouseType getHouseType() { return this->m_ID.getHouseType(); } - glm::vec2 GlobalCoordToCellCoord(glm::vec2 globalCoord) { - return glm::vec2(int(globalCoord[0] / CELL_SIZE.x), - int(globalCoord[1] / CELL_SIZE.y)); - } + HouseType getHouseType() { return this->m_ID.getHouseType(); } - glm::vec2 GetObjectCell() { - return GlobalCoordToCellCoord(m_ObjectLocation); + glm::vec2 getLocationCell() { + return MapUtil::GlobalCoordToCellCoord(m_ObjectLocation); } std::vector GetAbsoluteOccupiedArea(); void SetRelativeOccupiedArea(std::vector Area) { m_RelativeOccupiedArea = Area; } +public: GameObjectID getID() { return m_ID; } - std::shared_ptr getHealth() override { return m_Health; } void setHealth(std::shared_ptr health) override { m_Health = health; } + std::shared_ptr getStructureOrder() { return m_Order; } + + std::shared_ptr getAttackAndDamage() { + return m_AttackAndDamage; + } protected: float m_ElectricPower; @@ -127,6 +126,9 @@ class Structure : public Util::GameObject, glm::vec2 m_ObjectLocation = {100, 100}; std::vector m_RelativeOccupiedArea = {{0, 0}}; + // structure order + std::shared_ptr m_Order = + std::make_shared(); // health std::shared_ptr m_Health = std::make_shared(); // attack and damage diff --git a/include/Structure/StructureOrder.hpp b/include/Structure/StructureOrder.hpp index 7a9b4eb0..a8a58c02 100644 --- a/include/Structure/StructureOrder.hpp +++ b/include/Structure/StructureOrder.hpp @@ -4,20 +4,19 @@ #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_STRUCTUREORDER_HPP #define PRACTICALTOOLSFORSIMPLEDESIGN_STRUCTUREORDER_HPP - +enum class StructureOrderType { + NOT_CONSTRUCTED_YET, + CONSTRUCTED, + SELECTING_SITE, + BUILT, + NO_ORDER +}; class StructureOrder { - public: StructureOrder() {} virtual ~StructureOrder() {} - enum class StructureOrderType { - NOT_CONSTRUCTED_YET, - CONSTRUCTED, - SELECTING_SITE, - BUILT, - NO_ORDER - }; - StructureOrderType getStructOrder() { return m_StructOrder; } + + StructureOrderType getStructureOrderType() { return m_StructOrder; } void setStructOrder(StructureOrderType structorder) { m_StructOrder = structorder; diff --git a/include/Structure/WayPointStructure.hpp b/include/Structure/WayPointStructure.hpp index aa02b718..54ac6044 100644 --- a/include/Structure/WayPointStructure.hpp +++ b/include/Structure/WayPointStructure.hpp @@ -47,7 +47,8 @@ class WayPointStructure : public Structure, public IWayPointStructure { break; } case LivingStatus::ALIVE: { - if (m_StructOrder == StructureOrderType::SELECTING_SITE) { + if (getStructureOrder()->getStructureOrderType() == + StructureOrderType::SELECTING_SITE) { this->updateMoveable(); } else { this->updateFixed(); diff --git a/src/Avatar/Avatar.cpp b/src/Avatar/Avatar.cpp index fa931b44..4659ec33 100644 --- a/src/Avatar/Avatar.cpp +++ b/src/Avatar/Avatar.cpp @@ -11,7 +11,7 @@ void Avatar::whenSelected() { void Avatar::Update() { DrawAvatar(); if (getMoving()->ifMovePathEmpty()) { - m_AvatarOrder = AvatarOrderType::NO_ORDER; + getAvatarOrder()->setAvatarOrder(AvatarOrderType::NO_ORDER); } switch (*m_Health->getLivingStatus()) { @@ -22,16 +22,20 @@ void Avatar::Update() { case (LivingStatus::ALIVE): whenSelected(); - if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { + if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::OPEN_FIRE) { // open fire - } else if (m_AvatarOrder == AvatarOrderType::MOVE) { + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::MOVE) { m_Moving->moveUpdate(); - } else if (m_AvatarOrder == AvatarOrderType::NO_ORDER) { + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::NO_ORDER) { noorderUpdate(); - } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::TAKEN_DAMAGE) { // takendamage - } else if (m_AvatarOrder == AvatarOrderType::SPAWNED) { + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::SPAWNED) { spawnedUpdate(); } @@ -57,7 +61,7 @@ void Avatar::Start(glm::vec2 spawnlocationcell) { // destination = Barrack's // setSpriteSheet(); SetVisible(true); getMoving()->setMovementSpeed(4); - m_AvatarOrder = AvatarOrderType::SPAWNED; + getAvatarOrder()->setAvatarOrder(AvatarOrderType::SPAWNED); getMoving()->setCurrentLocation( MapUtil::CellCoordToGlobal(spawnlocationcell)); m_Transform.scale = {1, 1}; @@ -115,11 +119,12 @@ void Avatar::DrawAvatar() { this->SetDrawable( std::make_shared("../assets/sprites/mech_dead.png")); } else { - - if (m_AvatarOrder == AvatarOrderType::OPEN_FIRE) { + + if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::OPEN_FIRE) { this->SetDrawable(std::make_shared( "../assets/sprites/mech_open_fire.png")); - } else if (m_AvatarOrder == AvatarOrderType::TAKEN_DAMAGE) { + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::TAKEN_DAMAGE) { this->SetDrawable(std::make_shared( "../assets/sprites/mech_taken_damage.png")); } else { diff --git a/src/Mechanics/AvatarManager.cpp b/src/Mechanics/AvatarManager.cpp index 54cade30..c8aaa4cd 100644 --- a/src/Mechanics/AvatarManager.cpp +++ b/src/Mechanics/AvatarManager.cpp @@ -8,7 +8,7 @@ void AvatarManager::Update() { m_NemesisManager->Update(); for (auto unit : m_AvatarArray) { unit->Update(); - if (unit->getAvatarOrder() == AvatarOrderType::MOVE) { + if (unit->getAvatarOrder()->getAvatarOrder() == AvatarOrderType::MOVE) { updateTileWhileAvatarMoving(unit); } if (unit->getSelected()) { @@ -32,7 +32,7 @@ void AvatarManager::giveOrderToMyAvatar(std::shared_ptr unit) { ->getTileByCellPosition(MapUtil::GlobalCoordToCellCoord( MapUtil::ScreenToGlobalCoord(dest))) ->ifEnemyAtTile()) { - unit->setAvatarOrder(AvatarOrderType::MOVE); + unit->getAvatarOrder()->setAvatarOrder(AvatarOrderType::MOVE); m_NemesisManager->addNemesis( unit, m_Map @@ -40,13 +40,13 @@ void AvatarManager::giveOrderToMyAvatar(std::shared_ptr unit) { MapUtil::ScreenToGlobalCoord(dest))) ->getAvatars()[0]); } else { - unit->setAvatarOrder(AvatarOrderType::MOVE); + unit->getAvatarOrder()->setAvatarOrder(AvatarOrderType::MOVE); } } } } void AvatarManager::forceMove(std::shared_ptr unit, glm::vec2 cell) { - unit->setAvatarOrder(AvatarOrderType::MOVE); + unit->getAvatarOrder()->setAvatarOrder(AvatarOrderType::MOVE); auto queue = m_Navigator->findPath(unit->getMoving()->getCurrentCell(), cell); unit->getMoving()->setMovePath(queue); diff --git a/src/Structure/Barracks.cpp b/src/Structure/Barracks.cpp index ca6b90af..95f28481 100644 --- a/src/Structure/Barracks.cpp +++ b/src/Structure/Barracks.cpp @@ -20,7 +20,7 @@ void Barracks::Start() { m_HighLight.SetHLScale(this->GetTransform().scale); whenSelected(); // State - setStructOrder(StructureOrderType::CONSTRUCTED); + getStructureOrder()->setStructOrder(StructureOrderType::CONSTRUCTED); // health Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); @@ -47,7 +47,7 @@ void Barracks::Start(glm::vec2 location) { SetVisible(true); m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet, false, INTERVAL, false); - setStructOrder(StructureOrderType::BUILT); + getStructureOrder()->setStructOrder(StructureOrderType::BUILT); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); -} \ No newline at end of file +} diff --git a/src/Structure/OreRefinery.cpp b/src/Structure/OreRefinery.cpp index d489d820..b6bd1020 100644 --- a/src/Structure/OreRefinery.cpp +++ b/src/Structure/OreRefinery.cpp @@ -20,7 +20,8 @@ void OreRefinery::Start() { m_HighLight.SetHLScale(this->GetTransform().scale); whenSelected(); // State - setStructOrder(StructureOrderType::NOT_CONSTRUCTED_YET); + getStructureOrder()->setStructOrder( + StructureOrderType::NOT_CONSTRUCTED_YET); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); } @@ -46,7 +47,7 @@ void OreRefinery::Start(glm::vec2 location) { SetVisible(true); m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet, false, INTERVAL, false); - setStructOrder(StructureOrderType::BUILT); + getStructureOrder()->setStructOrder(StructureOrderType::BUILT); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); -} \ No newline at end of file +} diff --git a/src/Structure/Structure.cpp b/src/Structure/Structure.cpp index a286c992..50d67eaa 100644 --- a/src/Structure/Structure.cpp +++ b/src/Structure/Structure.cpp @@ -11,7 +11,7 @@ void Structure::Start() { if (this->m_ID.getUnitType() == UnitType::NONE) { Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::NOT_BORN_YET)); - m_StructOrder = StructureOrderType::NO_ORDER; + getStructureOrder()->setStructOrder(StructureOrderType::NO_ORDER); } else { m_Transform.scale = {2.f, 2.f}; m_HighLight.SetDrawable( @@ -23,7 +23,7 @@ void Structure::Start() { SetSpriteSheet(); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); - m_StructOrder = StructureOrderType::SELECTING_SITE; + getStructureOrder()->setStructOrder(StructureOrderType::SELECTING_SITE); } } void Structure::Start(glm::vec2 location) { @@ -37,15 +37,15 @@ void Structure::Start(glm::vec2 location) { SetSpriteSheet(); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); - m_StructOrder = StructureOrderType::SELECTING_SITE; + getStructureOrder()->setStructOrder(StructureOrderType::SELECTING_SITE); this->SetObjectLocation(location); SetVisible(true); m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet, false, INTERVAL, false); - setStructOrder(StructureOrderType::BUILT); + getStructureOrder()->setStructOrder(StructureOrderType::BUILT); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); - } +} void Structure::Update() { switch (*getHealth()->getLivingStatus()) { @@ -54,9 +54,12 @@ void Structure::Update() { break; case LivingStatus::ALIVE: whenSelected(); - if (m_StructOrder == StructureOrderType::SELECTING_SITE) { + + if (getStructureOrder()->getStructureOrderType() == + StructureOrderType::SELECTING_SITE) { this->updateMoveable(); - } else if (m_StructOrder == StructureOrderType::BUILT) { + } else if (getStructureOrder()->getStructureOrderType() == + StructureOrderType::BUILT) { this->updateFixed(); } break; @@ -108,7 +111,7 @@ void Structure::attachmentUpdate() { std::vector Structure::GetAbsoluteOccupiedArea() { std::vector Area; for (auto i : m_RelativeOccupiedArea) { - Area.push_back({i.x + GetObjectCell().x, i.y + GetObjectCell().y}); + Area.push_back({i.x + getLocationCell().x, i.y + getLocationCell().y}); } return Area; } diff --git a/src/Structure/WarFactory.cpp b/src/Structure/WarFactory.cpp index 641fa3d4..32457ade 100644 --- a/src/Structure/WarFactory.cpp +++ b/src/Structure/WarFactory.cpp @@ -44,7 +44,7 @@ void WarFactory::Start(glm::vec2 location) { SetVisible(true); m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet, false, INTERVAL, false); - setStructOrder(StructureOrderType::BUILT); + getStructureOrder()->setStructOrder(StructureOrderType::BUILT); Structure::getHealth()->setLivingStatus( std::make_shared(LivingStatus::ALIVE)); -} \ No newline at end of file +} diff --git a/src/Structure/WayPointStructure.cpp b/src/Structure/WayPointStructure.cpp index 49461e1c..e13838bf 100644 --- a/src/Structure/WayPointStructure.cpp +++ b/src/Structure/WayPointStructure.cpp @@ -5,7 +5,7 @@ #include "Map/MapUtility.hpp" void WayPointStructure::whenSelected() { - if (this->getSelected() && this->getBuilt()) { + if (this->getSelected() && this->getStructureOrder()->getBuilt()) { if (Util::Input::IsKeyPressed(Util::Keycode(Util::Keycode::MOUSE_RB))) { this->SetWayPointLocationByCellCoord( MapUtil::GlobalCoordToCellCoord(MapUtil::ScreenToGlobalCoord( From 4ba8955e81136414e3d656de0e35042e0d3a3bac Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Sat, 18 May 2024 16:24:44 +0800 Subject: [PATCH 5/7] remove when dead --- include/Map/Map.hpp | 9 ++++-- include/Mechanics/BuiltStructure.hpp | 41 ++++++++++++++++++-------- include/Mechanics/StructureManager.hpp | 4 +-- include/Mechanics/UnitManager.hpp | 10 +++---- include/Structure/Structure.hpp | 2 +- include/Unit/Health.hpp | 16 ++++++---- include/pch.hpp | 4 +-- src/Mechanics/AvatarManager.cpp | 33 +++++++++++++++------ src/Structure/Structure.cpp | 2 +- 9 files changed, 80 insertions(+), 41 deletions(-) diff --git a/include/Map/Map.hpp b/include/Map/Map.hpp index 0bb97b6a..036f9400 100644 --- a/include/Map/Map.hpp +++ b/include/Map/Map.hpp @@ -45,11 +45,16 @@ class MapClass : public Core::Drawable { getTileByCellPosition(position)->setBuildable(false); getTileByCellPosition(position)->pushAvatars(avatar); } - void removeAvatarsByCellPosition(std::shared_ptr avatar, - glm::vec2 position) { + + void removeAvatarByCellPosition(std::shared_ptr avatar, + glm::vec2 position) { getTileByCellPosition(position)->removeAvatar(avatar); } + void removeStrcutureByCellPosition(glm::vec2 position) { + getTileByCellPosition(position)->removeStructure(); + } + protected: void InitGrid(); diff --git a/include/Mechanics/BuiltStructure.hpp b/include/Mechanics/BuiltStructure.hpp index 4d2b0a44..2759c33f 100644 --- a/include/Mechanics/BuiltStructure.hpp +++ b/include/Mechanics/BuiltStructure.hpp @@ -7,18 +7,22 @@ #include "Structure/Barracks.hpp" #include "Structure/Structure.hpp" #include "pch.hpp" + class BuiltStructure { public: BuiltStructure() {} virtual ~BuiltStructure() {} - - void buildNewStructure(std::shared_ptr m_Map, - std::shared_ptr newstruct, + void Start(std::shared_ptr map) { + m_Map = map; + StartBuiltStructure(); + } + void buildNewStructure(std::shared_ptr newstruct, bool force = false) { - std::vector coords = newstruct->GetAbsoluteOccupiedArea(); + std::vector coords = newstruct->getAbsoluteOccupiedArea(); if (!force) { if (Util::Input::IsKeyPressed(Util::Keycode::MOUSE_LB)) { - if (ifCanBuildStructureAtTile(m_Map, newstruct) == true) { + // check whehter or not can built at tile + if (ifCanBuildStructureAtTile(newstruct) == true) { m_BuiltStructure.push_back(newstruct); m_Map->builtStructureByCellPosition(newstruct, coords); newstruct->getStructureOrder()->setStructOrder( @@ -33,9 +37,8 @@ class BuiltStructure { } } - bool ifCanBuildStructureAtTile(std::shared_ptr m_Map, - std::shared_ptr newstruct) { - std::vector coords = newstruct->GetAbsoluteOccupiedArea(); + bool ifCanBuildStructureAtTile(std::shared_ptr newstruct) { + std::vector coords = newstruct->getAbsoluteOccupiedArea(); for (auto i : coords) { if (m_Map->getTileByCellPosition(i)->getBuildable() == false) { return false; @@ -49,14 +52,25 @@ class BuiltStructure { } void StartBuiltStructure() { - for (auto pair : m_BuiltStructure) { - pair->Start(); + for (auto structure : m_BuiltStructure) { + structure->Start(); } } void UpdateBuiltStructure() { - for (auto pair : m_BuiltStructure) { - pair->Update(); + // check whether the structure is dead or update + for (int i = 0; i < m_BuiltStructure.size(); i++) { + if (m_BuiltStructure[i]->getHealth()->ifDead()) { + // remove from map + for (auto a : m_BuiltStructure[i]->getAbsoluteOccupiedArea()) { + m_Map->removeStrcutureByCellPosition(a); + } + // remove from builtstructure array + m_BuiltStructure.erase(m_BuiltStructure.begin() + i); + i--; + } else { + m_BuiltStructure[i]->Update(); + } } } void add(std::shared_ptr structure) { @@ -86,7 +100,8 @@ class BuiltStructure { glm::vec2 getPlayerBarrackCell() { return m_PlayerBarrackCell; } glm::vec2 getPlayerWayPointCell() { return m_PlayerWayPointCell; } -protected: +private: + std::shared_ptr m_Map = std::make_shared(); std::vector> m_BuiltStructure; glm::vec2 m_EnemyBarrackCell = {-1, -1}; glm::vec2 m_EnemyWayPointCell = {-1, -1}; diff --git a/include/Mechanics/StructureManager.hpp b/include/Mechanics/StructureManager.hpp index f00a4e7c..60921b2b 100644 --- a/include/Mechanics/StructureManager.hpp +++ b/include/Mechanics/StructureManager.hpp @@ -12,7 +12,7 @@ class StructureManager { virtual ~StructureManager() {} void Start(std::shared_ptr map) { - m_StructureArray.StartBuiltStructure(); + m_StructureArray.Start(map); m_Map = map; } void Update() { @@ -37,7 +37,7 @@ class StructureManager { ->getStructureOrderType() == StructureOrderType::SELECTING_SITE) { m_StructureArray.buildNewStructure( - m_Map, m_StructSelectingConstructionSite); + m_StructSelectingConstructionSite); } } diff --git a/include/Mechanics/UnitManager.hpp b/include/Mechanics/UnitManager.hpp index b945048f..eb871591 100644 --- a/include/Mechanics/UnitManager.hpp +++ b/include/Mechanics/UnitManager.hpp @@ -112,35 +112,35 @@ class UnitManager : public Player { auto structure = std::make_shared(house); structure->Start(cellPos); m_StructureManager->getStructureArray()->buildNewStructure( - m_Map, structure, true); + structure, true); break; } case UnitType::ORE_REF: { auto structure = std::make_shared(house); structure->Start(cellPos); m_StructureManager->getStructureArray()->buildNewStructure( - m_Map, structure, true); + structure, true); break; } case UnitType::POWER_PLANT: { auto structure = std::make_shared(house); structure->Start(cellPos); m_StructureManager->getStructureArray()->buildNewStructure( - m_Map, structure, true); + structure, true); break; } case UnitType::WAR_FACT: { auto structure = std::make_shared(house); structure->Start(cellPos); m_StructureManager->getStructureArray()->buildNewStructure( - m_Map, structure, true); + structure, true); break; } case UnitType::ADV_POWER_PLANT: { auto structure = std::make_shared(house); structure->Start(cellPos); m_StructureManager->getStructureArray()->buildNewStructure( - m_Map, structure, true); + structure, true); break; } case UnitType::INFANTRY: { diff --git a/include/Structure/Structure.hpp b/include/Structure/Structure.hpp index bfde5aba..47d94eb0 100644 --- a/include/Structure/Structure.hpp +++ b/include/Structure/Structure.hpp @@ -90,7 +90,7 @@ class Structure : public Util::GameObject, glm::vec2 getLocationCell() { return MapUtil::GlobalCoordToCellCoord(m_ObjectLocation); } - std::vector GetAbsoluteOccupiedArea(); + std::vector getAbsoluteOccupiedArea(); void SetRelativeOccupiedArea(std::vector Area) { m_RelativeOccupiedArea = Area; } diff --git a/include/Unit/Health.hpp b/include/Unit/Health.hpp index f52529bd..c96c0d6c 100644 --- a/include/Unit/Health.hpp +++ b/include/Unit/Health.hpp @@ -40,21 +40,25 @@ class Health { void setHP(int hp) { m_HP = hp; - if (m_HP <= 0) { - m_LivingStatus = std::make_shared(LivingStatus::DEAD); - } + ifDead(); } void addHP(int value) { m_HP += value; - if (m_HP <= 0) { - m_LivingStatus = std::make_shared(LivingStatus::DEAD); - } + ifDead(); } int getHP() { return m_HP; } void setArmorRate(float armorrate) { m_ArmorRate = armorrate; } float getArmorRate() { return m_ArmorRate; } + bool ifDead() { + if (m_HP <= 0) { + m_LivingStatus = std::make_shared(LivingStatus::DEAD); + return true; + } else { + return false; + } + } private: std::shared_ptr m_LivingStatus = diff --git a/include/pch.hpp b/include/pch.hpp index 194373d7..1d9e82aa 100644 --- a/include/pch.hpp +++ b/include/pch.hpp @@ -19,8 +19,8 @@ #include -//suppose to be "GL/glut", yet GLUT/glut on mac -//#include +// suppose to be "GL/glut", yet GLUT/glut on mac +// #include #include #include diff --git a/src/Mechanics/AvatarManager.cpp b/src/Mechanics/AvatarManager.cpp index c8aaa4cd..1a3db282 100644 --- a/src/Mechanics/AvatarManager.cpp +++ b/src/Mechanics/AvatarManager.cpp @@ -6,13 +6,29 @@ void AvatarManager::Update() { m_NemesisManager->Update(); - for (auto unit : m_AvatarArray) { - unit->Update(); - if (unit->getAvatarOrder()->getAvatarOrder() == AvatarOrderType::MOVE) { - updateTileWhileAvatarMoving(unit); - } - if (unit->getSelected()) { - giveOrderToMyAvatar(unit); + for (int i = 0; i < m_AvatarArray.size(); i++) { + // if dead remove, else update it + if (m_AvatarArray[i]->getHealth()->ifDead()) { + // remove from map + m_Map->removeAvatarByCellPosition( + m_AvatarArray[i], + m_AvatarArray[i]->getMoving()->getCurrentCell()); + // remove from array + m_AvatarArray.erase(m_AvatarArray.begin() + i); + i--; + } else { + m_AvatarArray[i]->Update(); + + // update tile while avatar is moving + if (m_AvatarArray[i]->getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::MOVE) { + updateTileWhileAvatarMoving(m_AvatarArray[i]); + } + + // give order to avatar + if (m_AvatarArray[i]->getSelected()) { + giveOrderToMyAvatar(m_AvatarArray[i]); + } } } } @@ -55,8 +71,7 @@ void AvatarManager::forceMove(std::shared_ptr unit, glm::vec2 cell) { void AvatarManager::updateTileWhileAvatarMoving( std::shared_ptr avatar) { if (avatar->getMoving()->ifArrivedAtNextCell()) { - m_Map->removeAvatarsByCellPosition(avatar, - unitArrayAndLocation[avatar]); + m_Map->removeAvatarByCellPosition(avatar, unitArrayAndLocation[avatar]); m_Map->setAvatarByCellPosition(avatar, avatar->getMoving()->getCurrentCell()); unitArrayAndLocation[avatar] = avatar->getMoving()->getCurrentCell(); diff --git a/src/Structure/Structure.cpp b/src/Structure/Structure.cpp index 50d67eaa..df404de3 100644 --- a/src/Structure/Structure.cpp +++ b/src/Structure/Structure.cpp @@ -108,7 +108,7 @@ void Structure::attachmentUpdate() { m_HighLight.SetObjectLocation(this->GetDrawLocation()); m_HighLight.Draw(); } -std::vector Structure::GetAbsoluteOccupiedArea() { +std::vector Structure::getAbsoluteOccupiedArea() { std::vector Area; for (auto i : m_RelativeOccupiedArea) { Area.push_back({i.x + getLocationCell().x, i.y + getLocationCell().y}); From 0fb3adc94fbfa1feadbeee20ad8cd26149f65331 Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Sat, 18 May 2024 16:49:54 +0800 Subject: [PATCH 6/7] fix finished moving halfway --- src/Avatar/Avatar.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/Avatar/Avatar.cpp b/src/Avatar/Avatar.cpp index 4659ec33..2106e901 100644 --- a/src/Avatar/Avatar.cpp +++ b/src/Avatar/Avatar.cpp @@ -20,6 +20,7 @@ void Avatar::Update() { break; case (LivingStatus::ALIVE): + SetVisible(true); whenSelected(); if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::OPEN_FIRE) { @@ -27,6 +28,9 @@ void Avatar::Update() { } else if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::MOVE) { m_Moving->moveUpdate(); + if (getMoving()->getCurrentDir() == MoveDirection::IDLE) { + getAvatarOrder()->setAvatarOrder(AvatarOrderType::NO_ORDER); + } } else if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::NO_ORDER) { noorderUpdate(); @@ -45,12 +49,10 @@ void Avatar::Update() { void Avatar::noorderUpdate() { getMoving()->setCurrentDir(MoveDirection::IDLE); - SetVisible(true); m_Transform.translation = getMoving()->getCurrentLocation(); } void Avatar::spawnedUpdate() { - SetVisible(true); m_Transform.translation = getMoving()->getCurrentLocation(); } @@ -59,7 +61,6 @@ void Avatar::Start(glm::vec2 spawnlocationcell) { // destination = Barrack's // setCurrentCell() //CurrentCell = Structure's Location this->SetDrawable(customizeImage()); // setSpriteSheet(); - SetVisible(true); getMoving()->setMovementSpeed(4); getAvatarOrder()->setAvatarOrder(AvatarOrderType::SPAWNED); getMoving()->setCurrentLocation( @@ -114,23 +115,23 @@ void Avatar::DEBUG_printCurrentMoveDirection(MoveDirection Dir) { void Avatar::DrawAvatar() { m_Transform.translation = getMoving()->getCurrentLocation(); - SetVisible(true); - if (getHealth()->getHP() < 50) { - this->SetDrawable( - std::make_shared("../assets/sprites/mech_dead.png")); - } else { - if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::OPEN_FIRE) { - this->SetDrawable(std::make_shared( - "../assets/sprites/mech_open_fire.png")); - } else if (getAvatarOrder()->getAvatarOrder() == - AvatarOrderType::TAKEN_DAMAGE) { + if (getAvatarOrder()->getAvatarOrder() == AvatarOrderType::OPEN_FIRE) { + this->SetDrawable(std::make_shared( + "../assets/sprites/mech_open_fire.png")); + } else if (getAvatarOrder()->getAvatarOrder() == + AvatarOrderType::TAKEN_DAMAGE) { + if (getHealth()->getHP() < 50) { this->SetDrawable(std::make_shared( - "../assets/sprites/mech_taken_damage.png")); + "../assets/sprites/mech_dead.png")); } else { this->SetDrawable(std::make_shared( - "../assets/sprites/mech_single.png")); + "../assets/sprites/mech_taken_damage.png")); } + } else { + this->SetDrawable( + std::make_shared("../assets/sprites/mech_single.png")); } + Draw(); } From 165e2e818c77f299e31236c6672064c4a1f21b98 Mon Sep 17 00:00:00 2001 From: jonylu7 Date: Sat, 18 May 2024 17:14:55 +0800 Subject: [PATCH 7/7] success fully fix finished moving --- include/Avatar/Moving.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/Avatar/Moving.hpp b/include/Avatar/Moving.hpp index 2d731c68..e4585202 100644 --- a/include/Avatar/Moving.hpp +++ b/include/Avatar/Moving.hpp @@ -50,10 +50,10 @@ class Moving { void moveUpdate() { if (ifArrivedAtNextCell()) { + m_MovePath.pop_front(); m_PrevCell = getCurrentCell(); if (!m_MovePath.empty()) { setCurrentDir(m_MovePath.front()); - m_MovePath.pop_front(); } else { finishedmovingUpdate(); } @@ -73,7 +73,6 @@ class Moving { void setMovePath(std::deque movepath) { m_MovePath = movepath; m_CurrentDir = m_MovePath.front(); - m_MovePath.pop_front(); m_PrevCell = getCurrentCell(); }