X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Fhavocbot.qc;h=3aefc45a75323b45782bea68f59dacc6b986e490;hp=2505888ef01b421c56c5aa82a2c06e20de8fc080;hb=8f4d064a1d62a040e788fc0634baf93e888ba2f6;hpb=0117479ba4e6b21a3ba53f71b343b85398bdfedc

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 2505888ef..3aefc45a7 100644
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -35,8 +35,8 @@ void havocbot_ai()
 		if(self.waterlevel==WATERLEVEL_SWIMMING || self.aistatus & AI_STATUS_OUT_WATER)
 		{
 			// Look for the closest waypoint out of water
-			local entity newgoal, head;
-			local float bestdistance, distance;
+			entity newgoal, head;
+			float bestdistance, distance;
 
 			newgoal = world;
 			bestdistance = 10000;
@@ -119,8 +119,8 @@ void havocbot_ai()
 		self.aistatus |= AI_STATUS_ROAMING;
 		self.aistatus &~= AI_STATUS_ATTACKING;
 
-		local vector now,v,next;//,heading;
-		local float aimdistance,skillblend,distanceblend,blend;
+		vector now,v,next;//,heading;
+		float aimdistance,skillblend,distanceblend,blend;
 		next = now = ( (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5) - (self.origin + self.view_ofs);
 		aimdistance = vlen(now);
 		//heading = self.velocity;
@@ -168,17 +168,17 @@ void havocbot_ai()
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			{
 				e = get_weaponinfo(i);
-				if ((e.spawnflags & WEP_FLAG_RELOADABLE) && (self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo"))))
+				if ((self.weapons & W_WeaponBit(i)) && (e.spawnflags & WEP_FLAG_RELOADABLE) && (self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo"))))
 					self.switchweapon = i;
 			}
 		}
 	}
-};
+}
 
 void havocbot_keyboard_movement(vector destorg)
 {
-	local vector keyboard;
-	local float blend, maxspeed;
+	vector keyboard;
+	float blend, maxspeed;
 	float sk;
 
 	sk = skill + self.bot_moveskill;
@@ -196,7 +196,7 @@ void havocbot_keyboard_movement(vector destorg)
 		, time);
 	keyboard = self.movement * (1.0 / maxspeed);
 
-	local float trigger, trigger1;
+	float trigger, trigger1;
 	blend = bound(0,sk*0.1,1);
 	trigger = autocvar_bot_ai_keyboard_threshold;
 	trigger1 = 0 - trigger;
@@ -248,13 +248,13 @@ void havocbot_keyboard_movement(vector destorg)
 	blend = bound(0,vlen(destorg-self.origin)/autocvar_bot_ai_keyboard_distance,1); // When getting close move with 360 degree
 	//dprint("movement ", vtos(self.movement), " keyboard ", vtos(keyboard), " blend ", ftos(blend), "\n");
 	self.movement = self.movement + (keyboard - self.movement) * blend;
-};
+}
 
 void havocbot_bunnyhop(vector dir)
 {
-	local float bunnyhopdistance;
-	local vector deviation;
-	local float maxspeed;
+	float bunnyhopdistance;
+	vector deviation;
+	float maxspeed;
 	vector gco, gno;
 
 	if(autocvar_g_midair)
@@ -306,7 +306,7 @@ void havocbot_bunnyhop(vector dir)
 				// for a period of time
 				if(time - self.bot_timelastseengoal > autocvar_bot_ai_bunnyhop_firstjumpdelay)
 				{
-					local float checkdistance;
+					float checkdistance;
 					checkdistance = TRUE;
 
 					// don't run if it is too close
@@ -367,6 +367,7 @@ void havocbot_bunnyhop(vector dir)
 		self.bot_timelastseengoal = 0;
 	}
 
+#if 0
 	// Release jump button
 	if(!cvar("sv_pogostick"))
 	if(self.flags & FL_ONGROUND == 0)
@@ -392,23 +393,24 @@ void havocbot_bunnyhop(vector dir)
 
 		}
 	}
-};
+#endif
+}
 
 void havocbot_movetogoal()
 {
-	local vector destorg;
-	local vector diff;
-	local vector dir;
-	local vector flatdir;
-	local vector m1;
-	local vector m2;
-	local vector evadeobstacle;
-	local vector evadelava;
-	local float s;
-	local float maxspeed;
-	local vector gco;
-	//local float dist;
-	local vector dodge;
+	vector destorg;
+	vector diff;
+	vector dir;
+	vector flatdir;
+	vector m1;
+	vector m2;
+	vector evadeobstacle;
+	vector evadelava;
+	float s;
+	float maxspeed;
+	vector gco;
+	//float dist;
+	vector dodge;
 	//if (self.goalentity)
 	//	te_lightning2(self, self.origin, (self.goalentity.absmin + self.goalentity.absmax) * 0.5);
 	self.movement = '0 0 0';
@@ -491,8 +493,8 @@ void havocbot_movetogoal()
 		{
 			if(fabs(self.velocity_z)<50)
 			{
-				local entity head, newgoal;
-				local float distance, bestdistance;
+				entity head, newgoal;
+				float distance, bestdistance;
 
 				for (head = findchain(classname, "waypoint"); head; head = head.chain)
 				{
@@ -575,8 +577,8 @@ void havocbot_movetogoal()
 			else
 				dir = normalize(( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ) - self.origin);
 
-			local vector xyvelocity = self.velocity; xyvelocity_z = 0;
-			local float xyspeed = xyvelocity * dir;
+			vector xyvelocity = self.velocity; xyvelocity_z = 0;
+			float xyspeed = xyvelocity * dir;
 
 			if(xyspeed < (maxspeed / 2))
 			{
@@ -724,7 +726,7 @@ void havocbot_movetogoal()
 			}
 
 			// avoiding dangers and obstacles
-			local vector dst_ahead, dst_down;
+			vector dst_ahead, dst_down;
 			makevectors(self.v_angle_y * '0 1 0');
 			dst_ahead = self.origin + self.view_ofs + (self.velocity * 0.4) + (v_forward * 32 * 3);
 			dst_down = dst_ahead + '0 0 -1500';
@@ -763,7 +765,7 @@ void havocbot_movetogoal()
 			// (only when the bot is on the ground or jumping intentionally)
 			self.aistatus &~= AI_STATUS_DANGER_AHEAD;
 
-			if(trace_fraction == 1 && self.jumppadcount == 0)
+			if(trace_fraction == 1 && self.jumppadcount == 0 && !self.goalcurrent.wphardwired )
 			if(self.flags & FL_ONGROUND || self.aistatus & AI_STATUS_RUNNING || self.BUTTON_JUMP == TRUE)
 			{
 				// Look downwards
@@ -786,14 +788,9 @@ void havocbot_movetogoal()
 						if(tracebox_hits_trigger_hurt(dst_ahead, self.mins, self.maxs, trace_endpos))
 						{
 							// Remove dangerous dynamic goals from stack
-							dprint("bot ", self.netname, " removed the goal ", self.goalcurrent.classname, " ", etos(self.goalcurrent), " because it leads to a dangerous path\n");
-							navigation_poproute();
-							if(self.goalcurrent)
-								gco = (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5;
-
-							// try to stop
-							flatdir = '0 0 0';
-							evadeobstacle = normalize(self.velocity) * -1;
+							dprint("bot ", self.netname, " avoided the goal ", self.goalcurrent.classname, " ", etos(self.goalcurrent), " because it led to a dangerous path; goal stack cleared\n");
+							navigation_clearroute();
+							return;
 						}
 					}
 				}
@@ -854,13 +851,13 @@ void havocbot_movetogoal()
 	if ((dir * v_up) >= autocvar_sv_jumpvelocity*0.5 && (self.flags & FL_ONGROUND)) self.BUTTON_JUMP=1;
 	if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.BUTTON_JUMP=TRUE;
 	if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill+self.bot_dodgeskill,10);
-};
+}
 
 void havocbot_chooseenemy()
 {
-	local entity head, best, head2;
-	local float rating, bestrating, i, hf;
-	local vector eye, v;
+	entity head, best, head2;
+	float rating, bestrating, i, hf;
+	vector eye, v;
 	if (autocvar_bot_nofire || IS_INDEPENDENT_PLAYER(self))
 	{
 		self.enemy = world;
@@ -887,7 +884,7 @@ void havocbot_chooseenemy()
 			if (self.health > 30)
 			{
 				// remain tracking him for a shot while (case he went after a small corner or pilar
-				self.havocbot_chooseenemy_finished = time + autocvar_bot_ai_enemydetectioninterval;
+				self.havocbot_chooseenemy_finished = time + 0.5;
 				return;
 			}
 			// enemy isn't visible, or is far away, or we're injured severely
@@ -950,7 +947,7 @@ void havocbot_chooseenemy()
 
 	self.enemy = best;
 	self.havocbot_stickenemy = TRUE;
-};
+}
 
 float havocbot_chooseweapon_checkreload(float new_weapon)
 {
@@ -963,7 +960,7 @@ float havocbot_chooseweapon_checkreload(float new_weapon)
 	// if this weapon is scheduled for reloading, don't switch to it during combat
 	if (self.weapon_load[new_weapon] < 0)
 	{
-		local float i, other_weapon_available;
+		float i, other_weapon_available;
 		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 		{
 			// if we are out of ammo for all other weapons, it's an emergency to switch to anything else
@@ -979,7 +976,7 @@ float havocbot_chooseweapon_checkreload(float new_weapon)
 
 void havocbot_chooseweapon()
 {
-	local float i;
+	float i;
 
 	// ;)
 	if(g_weaponarena == WEPBIT_TUBA)
@@ -1009,11 +1006,11 @@ void havocbot_chooseweapon()
 	if(i < 1)
 		return;
 
-	local float w;
-	local float distance; distance=bound(10,vlen(self.origin-self.enemy.origin)-200,10000);
+	float w;
+	float distance; distance=bound(10,vlen(self.origin-self.enemy.origin)-200,10000);
 
 	// Should it do a weapon combo?
-	local float af, ct, combo_time, combo;
+	float af, ct, combo_time, combo;
 
 	af = ATTACK_FINISHED(self);
 	ct = autocvar_bot_ai_weapon_combo_threshold;
@@ -1077,11 +1074,11 @@ void havocbot_chooseweapon()
 			}
 		}
 	}
-};
+}
 
 void havocbot_aim()
 {
-	local vector selfvel, enemyvel;
+	vector selfvel, enemyvel;
 //	if(self.flags & FL_INWATER)
 //		return;
 	if (time < self.nextaim)
@@ -1099,7 +1096,7 @@ void havocbot_aim()
 	}
 	else
 		lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5, '0 0 0');
-};
+}
 
 float havocbot_moveto_refresh_route()
 {
@@ -1114,7 +1111,7 @@ float havocbot_moveto_refresh_route()
 
 float havocbot_moveto(vector pos)
 {
-	local entity wp;
+	entity wp;
 
 	if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
 	{
@@ -1156,7 +1153,7 @@ float havocbot_moveto(vector pos)
 			debuggoalstack();
 
 		// Heading
-		local vector dir = ( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ) - (self.origin + self.view_ofs);
+		vector dir = ( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ) - (self.origin + self.view_ofs);
 		dir_z = 0;
 		bot_aimdir(dir, -1);
 
@@ -1248,9 +1245,9 @@ vector havocbot_dodge()
 	// LordHavoc: disabled because this is too expensive
 	return '0 0 0';
 #if 0
-	local entity head;
-	local vector dodge, v, n;
-	local float danger, bestdanger, vl, d;
+	entity head;
+	vector dodge, v, n;
+	float danger, bestdanger, vl, d;
 	dodge = '0 0 0';
 	bestdanger = -20;
 	// check for dangerous objects near bot or approaching bot
@@ -1293,4 +1290,4 @@ vector havocbot_dodge()
 	}
 	return dodge;
 #endif
-};
+}