KOTORBASE: Implement combat rounds with minimal attack damage

src/engines/kotorbase/actionexecutor.cpp

@@ -159,7 +159,7 @@ void ActionExecutor::executeAttackObject(const Action &action, const ExecutionCo
 		return;
 
 	ctx.creature->popAction();
-	ctx.creature->playAttackAnimation();
+	ctx.creature->startCombat(action.object, ctx.area->_module->getNextCombatRound());
 }
 
 bool ActionExecutor::isLocationReached(const glm::vec2 &location, float range, const ExecutionContext &ctx) {

src/engines/kotorbase/area.cpp

@@ -800,6 +800,10 @@ Creature *Area::getNearestCreature(const Object *target, int UNUSED(nth), const
 	return result;
 }
 
+const std::vector<Creature *> &Area::getCreatures() const {
+	return _creatures;
+}
+
 void Area::processCreaturesActions(float dt) {
 	ActionExecutor::ExecutionContext ctx;
 	ctx.area = this;

src/engines/kotorbase/area.h

@@ -141,6 +141,7 @@ class Area : public Object, public Events::Notifyable {
 
 	Object *getObjectByTag(const Common::UString &tag);
 	Creature *getNearestCreature(const Object *target, int nth, const CreatureSearchCriteria &criteria) const;
+	const std::vector<Creature *> &getCreatures() const;
 
 	void addCreature(Creature *creature);
 	void addToObjectMap(Object *object);

src/engines/kotorbase/creature.cpp

@@ -754,6 +754,15 @@ void Creature::playAttackAnimation() {
 	_model->playAnimation("g8a1");
 }
 
+void Creature::playDodgeAnimation() {
+	if (!_model)
+		return;
+
+	int number = getWeaponAnimationNumber();
+	if (number != -1)
+		_model->playAnimation(Common::UString::format("g%dg1", number));
+}
+
 void Creature::playAnimation(const Common::UString &anim, bool restart, float length, float speed) {
 	if (_model)
 		_model->playAnimation(anim, restart, length, speed);
@@ -791,6 +800,36 @@ void Creature::updatePerception(Creature &object) {
 	}
 }
 
+bool Creature::isInCombat() const {
+	return _inCombat;
+}
+
+Object *Creature::getAttackTarget() const {
+	return _attackTarget;
+}
+
+int Creature::getAttackRound() const {
+	return _attackRound;
+}
+
+Object *Creature::getAttemptedAttackTarget() const {
+	return _attemptedAttackTarget;
+}
+
+void Creature::setAttemptedAttackTarget(Object *target) {
+	_attemptedAttackTarget = target;
+}
+
+void Creature::startCombat(Object *target, int round) {
+	_inCombat = true;
+	_attackTarget = target;
+	_attackRound = round;
+}
+
+void Creature::cancelCombat() {
+	_inCombat = false;
+}
+
 void Creature::handleObjectSeen(Object &object) {
 	bool inserted = _seenObjects.insert(&object).second;
 	if (inserted)
@@ -878,6 +917,41 @@ bool Creature::addItemToEquipment(const Common::UString &tag, InventorySlot slot
 	}
 }
 
+int Creature::getWeaponAnimationNumber() const {
+	const Item *rightWeapon = getEquipedItem(kInventorySlotRightWeapon);
+	const Item *leftWeapon = getEquipedItem(kInventorySlotLeftWeapon);
+
+	if (rightWeapon && !leftWeapon) {
+		switch (rightWeapon->getWeaponWield()) {
+			case kWeaponWieldBaton:
+				return 1;
+			case kWeaponWieldSword:
+				return 2;
+			case kWeaponWieldStaff:
+				return 3;
+			case kWeaponWieldPistol:
+				return 5;
+			case kWeaponWieldRifle:
+				return 7;
+			default:
+				return -1;
+		}
+	}
+
+	if (rightWeapon && leftWeapon) {
+		switch (rightWeapon->getWeaponWield()) {
+			case kWeaponWieldSword:
+				return 4;
+			case kWeaponWieldPistol:
+				return 6;
+			default:
+				return -1;
+		}
+	}
+
+	return 8;
+}
+
 } // End of namespace KotORBase
 
 } // End of namespace Engines

src/engines/kotorbase/creature.h

@@ -158,6 +158,7 @@ class Creature : public Object {
 	void playDefaultHeadAnimation();
 	void playDrawWeaponAnimation();
 	void playAttackAnimation();
+	void playDodgeAnimation();
 
 	void playAnimation(const Common::UString &anim,
 	                   bool restart = true,
@@ -189,6 +190,18 @@ class Creature : public Object {
 
 	void updatePerception(Creature &object);
 
+	// Combat
+
+	bool isInCombat() const;
+	Object *getAttackTarget() const;
+	int getAttackRound() const;
+	Object *getAttemptedAttackTarget() const;
+
+	void setAttemptedAttackTarget(Object *target);
+
+	void startCombat(Object *target, int round);
+	void cancelCombat();
+
 protected:
 	// Parts of a creature's body.
 	struct PartModels {
@@ -214,6 +227,13 @@ class Creature : public Object {
 	std::set<Object *> _seenObjects;
 	std::set<Object *> _heardObjects;
 
+	// Combat
+
+	bool _inCombat { false };
+	Object *_attackTarget { nullptr };
+	int _attackRound { 0 };
+	Object *_attemptedAttackTarget { nullptr };
+
 
 	bool _isPC; ///< Is the creature a PC?
 
@@ -269,6 +289,8 @@ class Creature : public Object {
 
 	void reloadEquipment();
 	bool addItemToEquipment(const Common::UString &tag, InventorySlot slot);
+
+	int getWeaponAnimationNumber() const;
 };
 
 } // End of namespace KotORBase

src/engines/kotorbase/module.cpp

@@ -30,6 +30,7 @@
 #include "src/common/filepath.h"
 #include "src/common/filelist.h"
 #include "src/common/configman.h"
+#include "src/common/debug.h"
 
 #include "src/aurora/types.h"
 #include "src/aurora/rimfile.h"
@@ -94,12 +95,12 @@ Module::Module(::Engines::Console &console) :
 		_partyLeaderController(this),
 		_partyController(this),
 		_cameraController(this),
+		_roundController(this),
 		_prevTimestamp(0),
 		_frameTime(0),
 		_inDialog(false),
 		_runScriptVar(-1),
-		_soloMode(false),
-		_round(this) {
+		_soloMode(false) {
 
 	loadSurfaceTypes();
 }
@@ -570,7 +571,7 @@ void Module::processEventQueue() {
 	handleEvents();
 	handleActions();
 
-	_round.update();
+	_roundController.update();
 
 	GfxMan.lockFrame();
 
@@ -719,6 +720,54 @@ void Module::openContainer(Placeable *placeable) {
 	updateFrameTimestamp();
 }
 
+void Module::notifyCombatRoundBegan(int round) {
+	for (auto c : _area->getCreatures()) {
+		if (!c->isInCombat() || c->getAttackRound() != round)
+			continue;
+
+		Object *target = c->getAttackTarget();
+		if (!target || c->getDistanceTo(target) > c->getMaxAttackRange())
+			continue;
+
+		c->setAttemptedAttackTarget(target);
+		c->makeLookAt(target);
+		c->playAttackAnimation();
+
+		Creature *targetCreature = ObjectContainer::toCreature(target);
+		if (targetCreature) {
+			targetCreature->makeLookAt(c);
+			targetCreature->playDodgeAnimation();
+		}
+	}
+}
+
+void Module::notifyCombatRoundEnded(int round) {
+	for (auto c : _area->getCreatures()) {
+		if (!c->isInCombat())
+			continue;
+
+		Object *target = c->getAttemptedAttackTarget();
+		if (!target)
+			continue;
+
+		int hp = target->getCurrentHitPoints() - 1;
+		int minHp = target->getMinOneHitPoints() ? 1 : 0;
+
+		if (hp <= minHp) {
+			hp = minHp;
+			c->cancelCombat();
+		}
+
+		target->setCurrentHitPoints(hp);
+
+		debugC(Common::kDebugEngineLogic, 1,
+			"Object \"%s\" was hit by \"%s\" during combat round %d, has %d HP",
+			target->getName().c_str(), c->getName().c_str(), round, hp);
+
+		c->setAttemptedAttackTarget(nullptr);
+	}
+}
+
 void Module::handleActions() {
 	uint32 now = EventMan.getTimestamp();
 
@@ -999,6 +1048,10 @@ void Module::toggleTriggers() {
 	_area->toggleTriggers();
 }
 
+int Module::getNextCombatRound() const {
+	return _roundController.getNextCombatRound();
+}
+
 void Module::loadSavedGame(SavedGame *save) {
 	try {
 		Common::ScopedPtr<CharacterGenerationInfo> info(save->createCharGenInfo());

src/engines/kotorbase/module.h

@@ -249,6 +249,7 @@ class Module : public Object, public ObjectContainer {
 	void toggleFlyCamera();
 	void toggleWalkmesh();
 	void toggleTriggers();
+	int getNextCombatRound() const;
 
 protected:
 	Common::ScopedPtr<IngameGUI> _ingame; ///< The ingame GUI.
@@ -340,13 +341,13 @@ class Module : public Object, public ObjectContainer {
 	PartyLeaderController _partyLeaderController;
 	PartyController _partyController;
 	CameraController _cameraController;
+	RoundController _roundController;
 
 	uint32 _prevTimestamp;
 	float _frameTime;
 	bool _inDialog;
 	int _runScriptVar;
 	bool _soloMode;
-	Round _round;
 
 	// Unloading
 
@@ -413,8 +414,11 @@ class Module : public Object, public ObjectContainer {
 	void handleDelayedInteractions();
 	void openContainer(Placeable *placeable);
 
+	void notifyCombatRoundBegan(int round);
+	void notifyCombatRoundEnded(int round);
 
-	friend class Round;
+
+	friend class RoundController;
 };
 
 } // End of namespace KotORBase

src/engines/kotorbase/object.cpp

@@ -22,6 +22,8 @@
  *  Object within an area in KotOR games.
  */
 
+#include "external/glm/geometric.hpp"
+
 #include "src/common/uuid.h"
 #include "src/common/util.h"
 #include "src/common/maths.h"
@@ -176,6 +178,12 @@ Location Object::getLocation() const {
 	return location;
 }
 
+float Object::getDistanceTo(const Object *other) const {
+	glm::vec2 origin(_position[0], _position[1]);
+	glm::vec2 target(other->_position[0], other->_position[1]);
+	return glm::length(target - origin);
+}
+
 int Object::getMaxHitPoints() {
 	return _maxHitPoints;
 }

src/engines/kotorbase/object.h

@@ -113,6 +113,8 @@ class Object : public Aurora::NWScript::Object, public ScriptContainer {
 	/** Create a Location out of the object's area, position and orientation. */
 	Location getLocation() const;
 
+	float getDistanceTo(const Object *other) const;
+
 	// Hit points
 
 	/** Get the maximum hit points for the objects. */

src/engines/kotorbase/partyleader.cpp

@@ -96,6 +96,7 @@ bool PartyLeaderController::processMovement(float frameTime) {
 	}
 
 	partyLeader->clearActions();
+	partyLeader->cancelCombat();
 
 	float x, y, _;
 	partyLeader->getPosition(x, y, _);