From: Mario <mario@smbclan.net>
Date: Sun, 3 Jun 2018 11:40:58 +0000 (+1000)
Subject: Some minor tweaks to jetpack navigation
X-Git-Tag: xonotic-v0.8.5~2115
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd31c0a69e9e4e4a03fcdaf6e86f93c0f7c49d47;p=xonotic%2Fxonotic-data.pk3dir.git

Some minor tweaks to jetpack navigation
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index c79ed40a4..36f25d79f 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1256,7 +1256,6 @@ void navigation_routerating(entity this, entity e, float f, float rangebias)
 	//print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n");
 
 	// Evaluate path using jetpack
-	if(g_jetpack)
 	if(this.items & IT_JETPACK)
 	if(autocvar_bot_ai_navigation_jetpack)
 	if(vdist(this.origin - goal_org, >, autocvar_bot_ai_navigation_jetpack_mindistance))
@@ -1318,7 +1317,7 @@ void navigation_routerating(entity this, entity e, float f, float rangebias)
 			LOG_DEBUG("jetpack ai: required fuel ", ftos(fuel), " this.ammo_fuel ", ftos(this.ammo_fuel));
 
 			// enough fuel ?
-			if(this.ammo_fuel>fuel)
+			if(this.ammo_fuel>fuel || (this.items & IT_UNLIMITED_WEAPON_AMMO))
 			{
 				// Estimate cost
 				// (as onground costs calculation is mostly based on distances, here we do the same establishing some relationship