From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 22 Oct 2013 17:37:34 +0000 (+0200)
Subject: Boost if the top priority is unique. Combats unnecessary randomness.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93414ac9a17c04a3a4b3b73437bc946480b0f570;p=xonotic%2Fxonotic-data.pk3dir.git

Boost if the top priority is unique. Combats unnecessary randomness.
---

diff --git a/qcsrc/server/item_ammo.qc b/qcsrc/server/item_ammo.qc
index e663bb316..5ccb27e03 100644
--- a/qcsrc/server/item_ammo.qc
+++ b/qcsrc/server/item_ammo.qc
@@ -168,6 +168,8 @@ void item_ammo_pick()
 	for (a = ammolist; a; a = a.chain)
 	{
 		float totalsum = 0;
+		float maxprio = -1;
+		float maxprio_count = 0;
 		for (i = 0; i < ITEM_AMMO_COUNT; ++i)
 		{
 			float weight = a.(Item_CounterField(item_ammo_type(i)));
@@ -200,6 +202,13 @@ void item_ammo_pick()
 				a.item_ammo_priority[i] = 3;
 			else
 				a.item_ammo_priority[i] = 2;
+			if (a.item_ammo_priority[i] > maxprio)
+			{
+				maxprio = a.item_ammo_priority[i];
+				maxprio_count = 1;
+			}
+			else if (a.item_ammo_priority[i] == maxprio)
+				++maxprio_count;
 			totalsum += sum;
 		}
 		for (i = 0; i < ITEM_AMMO_COUNT; ++i)
@@ -207,6 +216,8 @@ void item_ammo_pick()
 			float weight = a.(Item_CounterField(item_ammo_type(i)));
 			if (a.item_ammo_weight[i] == 0)
 				a.item_ammo_weight[i] = pow(totalsum, autocvar_g_balance_ammodistribution_outer_nonmatch_exponent) * weight;
+			if (a.item_ammo_priority[i] == maxprio && maxprio_count == 1)
+				a.item_ammo_priority[i] += 0.5;
 		}
 	}