Fix Bounty Initialization Logic

Split up the bounty thinkers from the target selection, as now even without bounty targets, there can still be money dropping and thus the thinkers need to be initialized regardless.

zscript/accensus/merchant/EventHandler.zsc

@@ -292,21 +292,27 @@ class MerchantHandler : EventHandler
 			PokerTick();
 		}
 
-		if (level.time == 35 && (MoneyMode == 1 || (MoneyMode == 2 && !SpawnedTiberium)))
+		if (level.time == 35)
 		{
-			int count = 1;
-			for (int i = 0; i < 2; ++i)
+			InitBounty();
+
+			if (MoneyMode == 1 || (MoneyMode == 2 && !SpawnedTiberium))
 			{
-				if (random() <= AceCore.GetscaledChance(0, 64, 5, 15 + (5 * i)))
-				{
-					count++;
-				}
-				else
+				int count = 1;
+				for (int i = 0; i < 2; ++i)
 				{
-					break;
+					if (random() <= AceCore.GetscaledChance(0, 64, 5, 15 + (5 * i)))
+					{
+						count++;
+					}
+					else
+					{
+						break;
+					}
 				}
+
+				InitBountyTargets(count);
 			}
-			InitBounty(count);
 		}
 	}
 

zscript/accensus/merchant/econ/bounty.zsc

@@ -2,7 +2,7 @@ extend class MerchantHandler
 {
 	Array<class<BountyThinker> > bountyThinkers;
 
-	private void InitBounty(int count)
+	private void InitBounty()
 	{
 		bountyThinkers.clear();
 
@@ -13,7 +13,10 @@ extend class MerchantHandler
 				bountyThinkers.Push((class<BountyThinker>)(AllClasses[i]));
 			}
 		}
+	}
 
+	private void InitBountyTargets(int count)
+	{
 		Array<Actor> chosenActors;
 
 		ThinkerIterator it = ThinkerIterator.Create('Actor', Thinker.STAT_DEFAULT);