JABot improvements. Bot gets angry when hurt, and will chase an enemy across the map until it is dead. Bot will use tball self to teleport away when its health is critically low.

Author: Vortex-Quake2

src/ai/ai.h

@@ -132,4 +132,7 @@ void		debug_printf(char *fmt, ...);
 void		safe_cprintf (edict_t *ent, int printlevel, char *fmt, ...);
 void		safe_centerprintf (edict_t *ent, char *fmt, ...);
 void		safe_bprintf (int printlevel, char *fmt, ...);
-void		AI_DebugPrintf(char* fmt, ...);//GHz
+void		AI_DebugPrintf(char* fmt, ...);//GHz
+
+//ai_class_dmbot.c
+void		BOT_DMclass_Pain(edict_t* self, edict_t* other, float kick, int damage);//GHz

src/ai/ai_class_dmbot.c

@@ -105,7 +105,7 @@ void BOT_DMclass_Move(edict_t *self, usercmd_t *ucmd)
 	// Falling off ledge
 	if(!self->groundentity && !self->ai.is_step && !self->ai.is_swim )
 	{
-		gi.dprintf("falling off a ledge...\n");
+		//gi.dprintf("falling off a ledge...\n");
 		AI_ChangeAngle(self);
 		if (current_link_type == LINK_JUMPPAD ) {
 			//gi.dprintf("walk forward\n");
@@ -127,7 +127,7 @@ void BOT_DMclass_Move(edict_t *self, usercmd_t *ucmd)
 	{
 		trace_t trace;
 		vec3_t  v1, v2;
-		gi.dprintf("jumping over\n");
+		//gi.dprintf("jumping over\n");
 		//check floor in front, if there's none... Jump!
 		VectorCopy( self->s.origin, v1 );
 		VectorCopy( self->ai.move_vector, v2 );
@@ -137,7 +137,7 @@ void BOT_DMclass_Move(edict_t *self, usercmd_t *ucmd)
 		trace = gi.trace( v1, tv(-2, -2, -AI_JUMPABLE_HEIGHT), tv(2, 2, 0), v1, self, MASK_AISOLID );
 		if( !trace.startsolid && trace.fraction == 1.0 )
 		{
-			gi.dprintf("jump!\n");
+			//gi.dprintf("jump!\n");
 			//jump!
 			ucmd->forwardmove = 400;
 			//prevent double jumping on crates
@@ -315,6 +315,20 @@ void BOT_DMclass_CombatMovement( edict_t *self, usercmd_t *ucmd )
 
 	AI_DebugPrintf("BOT_DMclass_CombatMovement()\n");
 
+	//if (CanTball(self, false))
+	//	gi.dprintf("bot can tball\n");
+	//gi.dprintf("bot has %d tballs\n", self->client->pers.inventory[ITEM_INDEX(Fdi_TBALL)]);
+	//GHz: health critically low and have a tball?
+	if (self->health <= 0.2 * self->max_health && CanTball(self, false) && self->client->pers.inventory[ITEM_INDEX(Fdi_TBALL)])
+	{
+		//gi.dprintf("bot tried to tball\n");
+		// use tball to teleport away!
+		self->client->pers.inventory[ITEM_INDEX(Fdi_TBALL)]--;
+		Tball_Aura(self, self->s.origin);
+		// if we were angry at someone, forget it so that we can focus on rearming/healing
+		self->enemy = NULL;
+	}
+
 	if(!self->enemy) {
 
 		//do whatever (tmp move wander)
@@ -387,7 +401,7 @@ qboolean BOT_DMclass_FindEnemy(edict_t* self)
 	vec3_t		dist;
 
 	// we already set up an enemy this frame (reacting to attacks)
-	if (self->enemy != NULL)
+	if (self->enemy && self->enemy->inuse && visible(self, self->enemy))//GHz: don't bother finding a new enemy if the last one is still visible
 		return true;
 
 	if (level.time < pregame_time->value) // No enemies in pregame lol
@@ -779,8 +793,15 @@ void BOT_DMclass_WeightPlayers(edict_t *self)
 				}
 			} 
 		}
-		else	//if not at ctf every player has some value
-			self->ai.status.playersWeights[i] = 0.3;
+		else
+		{
+			// GHz: chase enemies!
+			if (self->enemy && self->enemy->inuse && AIEnemies[i] == self->enemy)
+				self->ai.status.playersWeights[i] = 0.9;
+			else
+				//if not at ctf every player has some value
+				self->ai.status.playersWeights[i] = 0.3;
+		}
 
 	}
 }
@@ -971,7 +992,8 @@ void BOT_DMclass_UpdateStatus( edict_t *self )
 {
 	AI_DebugPrintf("BOT_DMclass_UpdateStatus()\n");
 
-	self->enemy = NULL;
+	if (!G_EntIsAlive(self->enemy))//GHz: stay angry at this entity--used for LR goal setting
+		self->enemy = NULL;
 	self->movetarget = NULL;
 
 	// Set up for new client movement: jalfixme
@@ -1146,4 +1168,33 @@ void BOT_DMclass_InitPersistant(edict_t *self)
 	}
 }
 
+//==========================================
+// BOT_DMclass_Pain
+//==========================================
+qboolean CanTball(edict_t* ent, qboolean print);
+void BOT_DMclass_Pain(edict_t* self, edict_t* other, float kick, int damage)
+{
+	if (!self->ai.is_bot)
+		return;
+	if (!G_EntIsAlive(other))
+		return;
+	if (other->flags & FL_GODMODE)
+		return;
+	if (OnSameTeam(self, other))
+		return;
+
+	self->enemy = other;
 
+	if (AIDevel.debugChased && bot_showcombat->value)
+	{
+		if (other->ai.is_bot)
+			safe_cprintf(AIDevel.chaseguy, PRINT_HIGH, "%s: is angry at %s!\n",
+				self->ai.pers.netname, other->ai.pers.netname);
+		else if (other->client)
+			safe_cprintf(AIDevel.chaseguy, PRINT_HIGH, "%s: is angry at %s!\n",
+				self->ai.pers.netname, other->client->pers.netname);
+		else
+			safe_cprintf(AIDevel.chaseguy, PRINT_HIGH, "%s: is angry at %s!\n",
+				self->ai.pers.netname, other->classname);
+	}
+}

src/ai/ai_main.c

@@ -298,13 +298,15 @@ void AI_PickLongRangeGoal(edict_t *self)
 
 		if(cost == INVALID || cost < 4) // ignore invalid and very short hops
 			continue;
-
+		
 		//precomputed player weights
 		weight = self->ai.status.playersWeights[i];
 
 		//weight *= random(); // Allow random variations
 		weight /= cost; // Check against cost of getting there
 
+		//gi.dprintf("LR enemy goal %s weight %f\n", AIEnemies[i]->classname, weight);
+
 		if(weight > best_weight)
 		{		
 			best_weight = weight;
@@ -333,7 +335,7 @@ void AI_PickLongRangeGoal(edict_t *self)
 	self->ai.tries = 0;	// Reset the count of how many times we tried this goal
 
 	if(goal_ent != NULL && AIDevel.debugChased && bot_showlrgoal->value)
-		safe_cprintf(AIDevel.chaseguy, PRINT_HIGH, "%s: selected a %s at node %d for LR goal.\n",self->ai.pers.netname, goal_ent->classname, goal_node);
+		safe_cprintf(AIDevel.chaseguy, PRINT_HIGH, "%s: selected %s (wt %f) @ node %d for LR goal.\n",self->ai.pers.netname, goal_ent->classname, best_weight, goal_node);
 
 	AI_SetGoal(self,goal_node, true);
 }

src/ai/ai_movement.c

@@ -127,12 +127,12 @@ qboolean AI_CanMove1(edict_t *self, int direction)
 	{
 		if (tr.ent->takedamage && tr.ent->solid != SOLID_NOT)
 			self->enemy = tr.ent;
-		gi.dprintf("blocked1\n");
+		//gi.dprintf("blocked1\n");
 		return false;
 	}
 	if(tr.fraction != 1.0 || tr.contents & (CONTENTS_SOLID))
 	{
-		gi.dprintf("blocked2\n");
+		//gi.dprintf("blocked2\n");
 		return false;
 	}
 
@@ -275,7 +275,7 @@ qboolean AI_SpecialMove(edict_t *self, usercmd_t *ucmd)
 	tr = gi.trace( self->s.origin, self->mins, self->maxs, boxorigin, self, MASK_AISOLID);
 	if (!tr.startsolid && tr.fraction == 1.0) // not bloqued
 	{
-		gi.dprintf("not blocked?\n");
+		//gi.dprintf("not blocked?\n");
 		return false;
 	}
 
@@ -314,7 +314,7 @@ qboolean AI_SpecialMove(edict_t *self, usercmd_t *ucmd)
 			tr = gi.trace( boxorigin, boxmins, boxmaxs, boxorigin, self, MASK_AISOLID);
 			if( !tr.startsolid )	//can move by jumping
 			{
-				gi.dprintf("can move by jumping\n");
+				//gi.dprintf("can move by jumping\n");
 				ucmd->forwardmove = 400;
 				ucmd->upmove = 400;
 
@@ -430,7 +430,7 @@ qboolean AI_MoveToGoalEntity(edict_t *self, usercmd_t *ucmd)
 	}
 
 	AI_DebugPrintf("AI_MoveToGoalEntity()\n");
-	gi.dprintf("movetarget: %s\n", self->movetarget->classname);
+	//gi.dprintf("movetarget: %s\n", self->movetarget->classname);
 
 	// If a rocket or grenade is around deal with it
 	// Simple, but effective (could be rewritten to be more accurate)
@@ -457,7 +457,7 @@ qboolean AI_MoveToGoalEntity(edict_t *self, usercmd_t *ucmd)
 	AI_ChangeAngle(self);
 	if(!AI_CanMove(self, BOT_MOVE_FORWARD) ) 
 	{
-		gi.dprintf("bot can't move forward\n");//GHz
+		//gi.dprintf("bot can't move forward\n");//GHz
 		self->movetarget = NULL;
 		ucmd->forwardmove = -400;
 		return false;

src/ai/bot_common.c

@@ -316,7 +316,7 @@ void AI_DebugPrintf (char* fmt, ...)
 	va_list		argptr;
 	int len;
 
-	if (!AIDevel.debugMode)
+	//if (!AIDevel.debugMode)
 		return;
 	va_start(argptr, fmt);
 	len = vsprintf(bigbuffer, fmt, argptr);

src/ai/bot_spawn.c

@@ -40,7 +40,7 @@ in NO WAY supported by Steve Yeager.
 ///////////////////////////////////////////////////////////////////////
 void BOT_Respawn (edict_t *self)
 {
-	gi.dprintf("BOT_Respawn\n");
+	//gi.dprintf("BOT_Respawn\n");
 	CopyToBodyQue (self);
 
 	PutClientInServer (self);
@@ -465,13 +465,13 @@ void BOT_RemoveBot(char *name)
 	qboolean freed=false;
 	edict_t *bot;
 
-	gi.dprintf("BOT_RemoveBot\n");
+	//gi.dprintf("BOT_RemoveBot\n");
 	for(i=0;i<maxclients->value;i++)
 	{
 		bot = g_edicts + i + 1;
 		if(bot->inuse)
 		{
-			gi.dprintf("found %s\n", bot->classname);
+			//gi.dprintf("found %s\n", bot->classname);
 			if(bot->ai.is_bot && (strcmp(bot->client->pers.netname,name)==0 || strcmp(name,"all")==0))
 			{
 				bot->health = 0;

src/quake2/p_client.c

@@ -172,6 +172,7 @@ void SP_info_player_intermission(void)
 
 void player_pain (edict_t *self, edict_t *other, float kick, int damage)
 {
+	BOT_DMclass_Pain(self, other, kick, damage);//GHz
 	// player pain is handled at the end of the frame in P_DamageFeedback
 }
 
@@ -985,7 +986,7 @@ void player_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damag
 		self->client->ps.pmove.pm_type = PM_DEAD;
 		ClientObituary (self, inflictor, attacker);
 		//TossClientWeapon (self);
-		if (deathmatch->value)
+		if (deathmatch->value && !self->ai.is_bot) // GHz: don't send unicast packets to bots!
 			Cmd_Help_f (self);		// show scores
 		// clear inventory
 		memset(self->client->pers.inventory, 0, sizeof(self->client->pers.inventory));