Added enemy reposition state

Author: GauravDe-git

Mini_Assailants/inc/Enemy.cpp

@@ -1,5 +1,4 @@
 #include "Enemy.hpp"
-#include "Enemy.hpp"
 
 #include <Graphics/ResourceManager.hpp>
 
@@ -18,8 +17,6 @@ static std::map<Enemy::State, std::string> g_stateNames =
 	{Enemy::State::Hurt, "Hurt"},
 };
 
-Enemy::Enemy() = default;
-
 Enemy::Enemy(const glm::vec2& pos,Type _type)
 	:Entity{ pos }
 	,type{ _type }
@@ -200,6 +197,9 @@ void Enemy::update(float deltaTime)
 	case State::Attack:
 		doAttack(deltaTime);
 		break;
+	case State::Reposition:
+		doReposition(deltaTime);
+		break;
 	case State::Hurt:
 		doHurt(deltaTime);
 		break;
@@ -225,6 +225,9 @@ void Enemy::draw(Image& image, const Camera& camera)
 	case State::Attack:
 		image.drawSprite(attackAnim, tempTransform);
 		break;
+	case State::Reposition:
+		image.drawSprite(chaseAnim, tempTransform);
+		break;
 	case State::Hurt:
 		image.drawSprite(hurtAnim, tempTransform);
 		break;
@@ -330,7 +333,7 @@ void Enemy::endState(State oldState)
 
 void Enemy::doMovement(float deltaTime)
 {
-	auto initialPos = transform.getPosition();
+	glm::vec2 initialPos = transform.getPosition();
 	const auto targetPos = target ? target->getPosition() : initialPos;
 
 	auto direction = targetPos - initialPos;
@@ -387,11 +390,21 @@ void Enemy::doChase(float deltaTime)
 
 void Enemy::doAttack(float deltaTime)
 {
-	if (target && glm::distance(transform.getPosition(), target->getPosition()) > attackDistance)
+	if (!target)
 	{
-		setState(State::Chase);
+		setState(State::Idle);
 	}
-	else
+	glm::vec2 targetPos = target ? target->getPosition() : transform.getPosition();
+	float xDifference = std::abs(transform.getPosition().x - targetPos.x);
+	float yDifference = std::abs(transform.getPosition().y - targetPos.y);
+
+	// If the target is too close in the x direction and y direction, move away
+	if (target && xDifference < 5.f && yDifference < attackDistance)
+	{
+		setState(State::Reposition);
+	}
+	// If the target is at the right distance, attack
+	else if (target && glm::distance(transform.getPosition(), targetPos) < attackDistance)
 	{
 		attackAnim.update(deltaTime);
 		if (attackAnim.getCurrentFrame() >= attackFrame)
@@ -402,11 +415,42 @@ void Enemy::doAttack(float deltaTime)
 		{
 			attackAnim.reset();
 			if (!target)
-			setState(State::Idle);
+				setState(State::Idle);
 		}
 	}
+	// If the target is too far, chase
+	else if (target && glm::distance(transform.getPosition(), targetPos) > attackDistance)
+	{
+		setState(State::Chase);
+	}
 }
 
+void Enemy::doReposition(float deltaTime)
+{
+	if (!target)
+	{
+		setState(State::Idle);
+	}
+	chaseAnim.update(deltaTime);
+	glm::vec2 targetPos = target ? target->getPosition() : transform.getPosition();
+	float xDifference = std::abs(transform.getPosition().x - targetPos.x);
+	float yDifference = std::abs(transform.getPosition().y - targetPos.y);
+
+	// Calculate the reposition point
+	glm::vec2 repositionPoint = targetPos + glm::vec2((targetPos.x < transform.getPosition().x) ? attackDistance : -attackDistance, 0);
+
+	// Move towards the reposition point
+	glm::vec2 direction = glm::normalize(repositionPoint - transform.getPosition());
+	transform.translate(direction * speed * deltaTime);
+
+	// If the target is at the right distance, go back to attacking
+	if (glm::distance(transform.getPosition(), targetPos) >= attackDistance)
+	{
+		setState(State::Attack);
+	}
+}
+
+
 void Enemy::doHurt(float deltaTime)
 {
 	hurtAnim.update(deltaTime);
@@ -434,11 +478,14 @@ void Enemy::doDead(float deltaTime)
 
 void Enemy::setFacingDirection(const glm::vec2& direction)
 {
-	if (direction.x < 0) {
-		transform.setScale(glm::vec2(1.0f, 1.0f));
-	}
-	else if (direction.x > 0) {
-		transform.setScale(glm::vec2(-1.0f, 1.0f));
+	if (getState() != State::Dead)
+	{
+		if (direction.x < 0) {
+			transform.setScale(glm::vec2(1.0f, 1.0f));
+		}
+		else if (direction.x > 0) {
+			transform.setScale(glm::vec2(-1.0f, 1.0f));
+		}
 	}
 }
 

Mini_Assailants/inc/Enemy.hpp

@@ -32,12 +32,12 @@ class Enemy : public Entity
 		Idle,
 		Chase,
 		Attack,
+		Reposition,
 		Hurt,
 		Dead,
 		JustDefeated
 	};
 
-	Enemy();
 	explicit Enemy(const glm::vec2& pos, Type type);
 
 	virtual void update(float deltaTime) override;
@@ -72,6 +72,7 @@ class Enemy : public Entity
 	void doIdle(float deltaTime);
 	void doChase(float deltaTime);
 	void doAttack(float deltaTime);
+	void doReposition(float deltaTime);
 	void doHurt(float deltaTime);
 	void doDead(float deltaTime);
 

Mini_Assailants/src/Player.cpp

@@ -302,7 +302,7 @@ void Player::endState(State oldState)
 
 void Player::doMovement(float deltaTime)
 {
-	const auto initialPos = transform.getPosition();
+	const glm::vec2 initialPos = transform.getPosition();
 	auto position = initialPos;
 
 	position.x += Input::getAxis("Horizontal") * speed * deltaTime;

Mini_Assailants/src/Todo.txt

@@ -1,25 +1,18 @@
 
- Maybe-Enemy shouldnt turn in direction of player in middle of attack
-      or when dying?
-
- - Change level looks like a button. (x)
- - Buttons sprites look bad, have artifacts compression. (x)
  - defender complaining about .exe .  ???? - added icon (x)
- - sfx like the coin/hp/mp too loud/harsh. (x)
 
  -AI, rathr than making it flinch back every time its hit, maybe have some value per monster type that makes it resistant to flinching, 
  and only have it flinch when its hit enough (and would reset after not being hit for N amount of time)
 that would give it some resistance to the spam attack problem
 being able to block might also be a thing
 would introduce light+heavy hit mechanics
 
-- One way to improve the ai is by adding collision. Just push the player out of the enemy when inside.
+-Add a pause menu. Maybe a button on top right, can be clicked, or press esc/p to go menu,
+ with options to go back to main menu or quit.
 
 QOL:
  Player Face Portrait
  Floating damage numbers.
- Add a pause menu. Maybe a button on top right, can be clicked, or press esc/p to go menu,
- with options to go back to main menu or quit.
 
  Change the stats like player hp,mp,dmg,enemy- hp,dmg using JSON instead 
  of hardcoding