From 9e5abeec358b448e092cba040ad28d92627d05f6 Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Fri, 22 Mar 2019 00:02:32 +0100
Subject: [PATCH] Fix for arrow cart at bank fights

---
 lib/CStack.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/CStack.cpp b/lib/CStack.cpp
index 659f0cb02..fdbb1a204 100644
--- a/lib/CStack.cpp
+++ b/lib/CStack.cpp
@@ -304,17 +304,30 @@ int32_t CStack::unitBaseAmount() const
 
 bool CStack::unitHasAmmoCart(const battle::Unit * unit) const
 {
-	bool hasAmmoCart = false;
-
 	for(const CStack * st : battle->stacks)
 	{
-		if(battle->battleMatchOwner(st, unit, true) && st->getCreature()->idNumber == CreatureID::AMMO_CART && st->alive())
+		if(battle->battleMatchOwner(st, unit, true) && st->getCreature()->idNumber == CreatureID::AMMO_CART)
 		{
-			hasAmmoCart = true;
-			break;
+			if(st->alive())
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
 	}
-	return hasAmmoCart;
+	//ammo cart works during creature bank battle while not on battlefield
+	auto ownerHero = battle->battleGetOwnerHero(unit);
+	if(ownerHero && ownerHero->artifactsWorn.find(ArtifactPosition::MACH2) != ownerHero->artifactsWorn.end())
+	{
+		if(battle->battleGetOwnerHero(unit)->artifactsWorn.at(ArtifactPosition::MACH2).artifact->artType->id == ArtifactID::AMMO_CART)
+		{
+			return true;
+		}
+	}
+	return false; //will be always false if trying to examine enemy hero in "special battle"
 }
 
 PlayerColor CStack::unitEffectiveOwner(const battle::Unit * unit) const