X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fhavocbot%2Fhavocbot.qc;h=c995ce8c8fe64caf18ec1af14d3960e585790be9;hp=788ee1bc6e17917dee0478cdc85bb1bfdc07d2c3;hb=4096ab0591cbd7fac803e022375cd3c221511d8b;hpb=88a5c43608df68db1ca68cb8135cd2f057994c51

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index 788ee1bc6..c995ce8c8 100644
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -473,7 +473,7 @@ void havocbot_movetogoal(entity this)
 	// Jetpack navigation
 	if(this.navigation_jetpack_goal)
 	if(this.goalcurrent==this.navigation_jetpack_goal)
-	if(this.ammo_fuel)
+	if(GetResourceAmount(this, RESOURCE_FUEL))
 	{
 		if(autocvar_bot_debug_goalstack)
 		{
@@ -668,7 +668,7 @@ void havocbot_movetogoal(entity this)
 
 			return;
 		}
-		else if(this.health + this.armorvalue > ROCKETJUMP_DAMAGE())
+		else if(GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR) > ROCKETJUMP_DAMAGE())
 		{
 			if(this.velocity.z < 0)
 			{
@@ -1225,7 +1225,7 @@ void havocbot_chooseenemy(entity this)
 			traceline(this.origin+this.view_ofs, ( this.enemy.absmin + this.enemy.absmax ) * 0.5,false,NULL);
 			if (trace_ent == this.enemy || trace_fraction == 1)
 			if (vdist(((this.enemy.absmin + this.enemy.absmax) * 0.5) - this.origin, <, 1000))
-			if (this.health > 30)
+			if (GetResourceAmount(this, RESOURCE_HEALTH) > 30)
 			{
 				// remain tracking him for a shot while (case he went after a small corner or pilar
 				this.havocbot_chooseenemy_finished = time + 0.5;