* thank the tank can handle multiple enemies and arrow attacks, rhythm of the knight only awards achievement once

Author: WALL OF JUSTICE

src/actarrow.cpp

@@ -1215,6 +1215,21 @@ void actArrow(Entity* my)
 						}
 					}
 
+					if ( hit.entity->behavior == &actPlayer )
+					{
+						if ( parent )
+						{
+							if ( hitstats->defending )
+							{
+								updateAchievementThankTheTank(hit.entity->skill[2], parent, false);
+							}
+							else
+							{
+								achievementThankTheTankPair[hit.entity->skill[2]].erase(parent->getUID());
+							}
+						}
+					}
+
 					bool armorDegraded = false;
 
 					// hit armor degrade

src/entity.cpp

@@ -10962,10 +10962,6 @@ void Entity::attack(int pose, int charge, Entity* target)
 						messagePlayerMonsterEvent(playerhit, color, *myStats, Language::get(698), Language::get(699), MSG_ATTACKS);
 						if ( playerhit >= 0 )
 						{
-							if ( !achievementStatusThankTheTank[playerhit] )
-							{
-								achievementThankTheTankPair[playerhit] = std::make_pair(0, 0);
-							}
 							if ( behavior == &actMonster )
 							{
 								updateAchievementBaitAndSwitch(playerhit, false);
@@ -11044,6 +11040,7 @@ void Entity::attack(int pose, int charge, Entity* target)
 						{
 							achievementStatusRhythmOfTheKnight[playerhit] = false;
 							achievementRhythmOfTheKnightVec[playerhit].clear();
+							achievementThankTheTankPair[playerhit].erase(this->getUID());
 							//messagePlayer(0, "used AC!");
 						}
 					}

src/game.cpp

@@ -1538,9 +1538,6 @@ void gameLogic(void)
 					if ( achievementStatusThankTheTank[c] )
 					{
 						steamAchievementClient(c, "BARONY_ACH_THANK_THE_TANK");
-						achievementStatusThankTheTank[c] = false;
-						achievementThankTheTankPair[c].first = 0;
-						achievementThankTheTankPair[c].second = 0;
 					}
 
 					int bodyguards = 0;

src/scores.cpp

@@ -40,7 +40,8 @@ Sint32 conductGameChallenges[NUM_CONDUCT_CHALLENGES] = { 0 }; // additional 'con
 Sint32 gameStatistics[NUM_GAMEPLAY_STATISTICS] = { 0 }; // general saved game statistics to be stored in here.
 std::vector<std::pair<Uint32, Uint32>> achievementRhythmOfTheKnightVec[MAXPLAYERS] = {};
 bool achievementStatusRhythmOfTheKnight[MAXPLAYERS] = { false };
-std::pair<Uint32, Uint32> achievementThankTheTankPair[MAXPLAYERS] = { std::make_pair(0, 0) };
+bool achievementRhythmOfTheKnight[MAXPLAYERS] = { false };
+std::map<Uint32, Uint32> achievementThankTheTankPair[MAXPLAYERS];
 bool achievementStatusBaitAndSwitch[MAXPLAYERS] = { false };
 Uint32 achievementBaitAndSwitchTimer[MAXPLAYERS] = { 0 };
 std::unordered_set<int> clientLearnedAlchemyIngredients[MAXPLAYERS];
@@ -3453,11 +3454,11 @@ void setDefaultPlayerConducts()
 	for ( int c = 0; c < MAXPLAYERS; ++c )
 	{
 		achievementStatusRhythmOfTheKnight[c] = false;
+		achievementRhythmOfTheKnight[c] = false;
 		achievementStatusStrobe[c] = false;
 		achievementStatusThankTheTank[c] = false;
 		achievementRhythmOfTheKnightVec[c].clear();
-		achievementThankTheTankPair[c].first = 0;
-		achievementThankTheTankPair[c].second = 0;
+		achievementThankTheTankPair[c].clear();
 		achievementStrobeVec[c].clear();
 		achievementStatusBaitAndSwitch[c] = false;
 		achievementBaitAndSwitchTimer[c] = 0;
@@ -4023,7 +4024,11 @@ void updateAchievementRhythmOfTheKnight(int player, Entity* target, bool playerI
 						{
 							//messagePlayer(0, "achievement get!, time taken %f", timeTaken);
 							achievementStatusRhythmOfTheKnight[player] = true;
-							steamAchievementClient(player, "BARONY_ACH_RHYTHM_OF_THE_KNIGHT");
+							if ( !achievementRhythmOfTheKnight[player] )
+							{
+								steamAchievementClient(player, "BARONY_ACH_RHYTHM_OF_THE_KNIGHT");
+								achievementRhythmOfTheKnight[player] = true;
+							}
 						}
 						achievementRhythmOfTheKnightVec[player].clear();
 					}
@@ -4100,40 +4105,39 @@ void updateAchievementThankTheTank(int player, Entity* target, bool targetKilled
 	{
 		return;
 	}
-	if ( !target )
+	if ( !target || target->behavior != &actMonster )
 	{
 		return;
 	}
-	if ( achievementStatusThankTheTank[player] || multiplayer == CLIENT )
+	if ( multiplayer == CLIENT )
 	{
 		return;
 	}
 
+
+	auto& entry = achievementThankTheTankPair[player][target->getUID()];
 	if ( !targetKilled )
 	{
-		achievementThankTheTankPair[player] = std::make_pair(ticks, target->getUID()); // track the monster UID defending against
+		entry = ticks;
 		//messagePlayer(0, "pair: %d, %d", achievementThankTheTankPair[player].first, achievementThankTheTankPair[player].second);
 	}
-	else if ( achievementThankTheTankPair[player].first != 0
-		&& achievementThankTheTankPair[player].second != 0 ) // check there is a ticks/UID entry.
+	else if ( entry != 0 ) // check there is a ticks/UID entry.
 	{
 		if ( players[player] && players[player]->entity )
 		{
 			if ( players[player]->entity->checkEnemy(target) )
 			{
-				if ( target->getUID() == achievementThankTheTankPair[player].second )
+				// check timestamp within 3 seconds.
+				if ( (ticks - entry) / 50.f < 3.f )
 				{
-					// same target dying, check timestamp within 3 seconds.
-					if ( (ticks - achievementThankTheTankPair[player].first) / 50.f < 3.f )
+					achievementStatusThankTheTank[player] = true;
+					achievementThankTheTankPair[player].erase(target->getUID());
+					if ( players[player]->mechanics.allowedRaiseBlockingAgainstEntity(*target) )
 					{
-						achievementStatusThankTheTank[player] = true;
-						if ( players[player]->mechanics.allowedRaiseBlockingAgainstEntity(*target) )
+						int skillLVL = 3 * (stats[player]->getProficiency(PRO_SHIELD) / 20);
+						if ( local_rng.rand() % (5 + skillLVL) == 0 )
 						{
-							int skillLVL = 3 * (stats[player]->getProficiency(PRO_SHIELD) / 20);
-							if ( local_rng.rand() % (5 + skillLVL) == 0 )
-							{
-								players[player]->entity->increaseSkill(PRO_SHIELD);
-							}
+							players[player]->entity->increaseSkill(PRO_SHIELD);
 						}
 					}
 				}

src/scores.hpp

@@ -288,7 +288,8 @@ extern Sint32 conductGameChallenges[NUM_CONDUCT_CHALLENGES];
 extern Sint32 gameStatistics[NUM_GAMEPLAY_STATISTICS];
 extern std::vector<std::pair<Uint32, Uint32>> achievementRhythmOfTheKnightVec[MAXPLAYERS];
 extern bool achievementStatusRhythmOfTheKnight[MAXPLAYERS];
-extern std::pair<Uint32, Uint32> achievementThankTheTankPair[MAXPLAYERS];
+extern bool achievementRhythmOfTheKnight[MAXPLAYERS];
+extern std::map<Uint32, Uint32> achievementThankTheTankPair[MAXPLAYERS];
 extern bool achievementStatusBaitAndSwitch[MAXPLAYERS];
 extern Uint32 achievementBaitAndSwitchTimer[MAXPLAYERS];
 extern std::unordered_set<int> clientLearnedAlchemyIngredients[MAXPLAYERS];