X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fbot.qc;h=318422153bb3423478e9f8dc980a0fea24daf5e4;hp=502e2532c6924add3d39208cbf90298d6781f450;hb=6147159b612c6950ca2177b732028d1116201220;hpb=06ac66a5edaa645e19ed9a6482409e8656a65b1d

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index 502e2532c6..318422153b 100644
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -27,6 +27,7 @@
 
 #include <common/physics/player.qh>
 #include <common/constants.qh>
+#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
@@ -45,6 +46,7 @@ entity bot_spawn()
 	entity bot = spawnclient();
 	if (bot)
 	{
+		setItemGroupCount();
 		currentbots = currentbots + 1;
 		bot_setnameandstuff(bot);
 		ClientConnect(bot);
@@ -62,7 +64,8 @@ void bot_think(entity this)
 	if(autocvar_bot_god)
 		this.flags |= FL_GODMODE;
 
-	this.bot_nextthink = this.bot_nextthink + autocvar_bot_ai_thinkinterval * pow(0.5, this.bot_aiskill);
+	this.bot_nextthink = max(time, this.bot_nextthink) + max(0.01, autocvar_bot_ai_thinkinterval * pow(0.5, this.bot_aiskill) * min(14 / (skill + 14), 1));
+
 	//if (this.bot_painintensity > 0)
 	//	this.bot_painintensity = this.bot_painintensity - (skill + 1) * 40 * frametime;
 
@@ -71,6 +74,7 @@ void bot_think(entity this)
 
 	if (!IS_PLAYER(this) || (autocvar_g_campaign && !campaign_bots_may_start))
 	{
+		this.movement = '0 0 0';
 		this.bot_nextthink = time + 0.5;
 		return;
 	}
@@ -117,6 +121,7 @@ void bot_think(entity this)
 	// if dead, just wait until we can respawn
 	if (IS_DEAD(this))
 	{
+		this.movement = '0 0 0';
 		if (this.deadflag == DEAD_DEAD)
 		{
 			PHYS_INPUT_BUTTON_JUMP(this) = true; // press jump to respawn
@@ -177,7 +182,7 @@ void bot_setnameandstuff(entity this)
 					break;
 				}
 			));
-			RandomSelection_Add(NULL, 0, readfile, 1, prio);
+			RandomSelection_AddString(readfile, 1, prio);
 		}
 		readfile = RandomSelection_chosen_string;
 		fclose(file);
@@ -203,7 +208,13 @@ void bot_setnameandstuff(entity this)
 
 	prio = 6;
 
-	#define READSKILL(f,w,r) if(argv(prio) != "") this.f = stof(argv(prio)) * (w); else this.f = (!autocvar_g_campaign) * (2 * random() - 1) * (r) * (w); ++prio
+	#define READSKILL(f, w, r) MACRO_BEGIN { \
+		if(argv(prio) != "") \
+			this.f = stof(argv(prio)) * w; \
+		else \
+			this.f = (!autocvar_g_campaign) * (2 * random() - 1) * r * w; \
+		prio++; \
+	} MACRO_END
 	//print(bot_name, ": ping=", argv(9), "\n");
 
 	READSKILL(havocbot_keyboardskill, 0.5, 0.5); // keyboard skill
@@ -337,9 +348,8 @@ void bot_custom_weapon_priority_setup()
 
 void bot_endgame()
 {
-	entity e;
-	//dprint("bot_endgame\n");
-	e = bot_list;
+	bot_relinkplayerlist();
+	entity e = bot_list;
 	while (e)
 	{
 		setcolor(e, e.bot_preferredcolors);
@@ -396,7 +406,7 @@ void bot_clientdisconnect(entity this)
 	this.playerskin_freeme = string_null;
 	if(this.bot_cmd_current)
 		delete(this.bot_cmd_current);
-	if(bot_waypoint_queue_owner==this)
+	if(bot_waypoint_queue_owner == this)
 		bot_waypoint_queue_owner = NULL;
 }
 
@@ -436,7 +446,7 @@ void bot_removefromlargestteam()
 	int bestcount = 0;
 
 	int bcount = 0;
-	FOREACH_ENTITY_FLOAT(isbot, true,
+	FOREACH_CLIENT(it.isbot,
 	{
 		++bcount;
 
@@ -486,7 +496,7 @@ void bot_removenewest()
 	entity best = NULL;
 	int bcount = 0;
 
-	FOREACH_ENTITY_FLOAT(isbot, true,
+	FOREACH_CLIENT(it.isbot,
 	{
 		++bcount;
 
@@ -629,9 +639,42 @@ float bot_fixcount()
 	return true;
 }
 
+void bot_remove_from_bot_list(entity this)
+{
+	entity e = bot_list;
+	entity prev_bot = NULL;
+	while (e)
+	{
+		if(e == this)
+		{
+			if(!prev_bot)
+				bot_list = this.nextbot;
+			else
+				prev_bot.nextbot = this.nextbot;
+			if(bot_strategytoken == this)
+			{
+				bot_strategytoken = this.nextbot;
+				bot_strategytoken_taken = true;
+			}
+			this.nextbot = NULL;
+			break;
+		}
+		prev_bot = e;
+		e = e.nextbot;
+	}
+}
+
+void bot_clear(entity this)
+{
+	bot_remove_from_bot_list(this);
+	if(bot_waypoint_queue_owner == this)
+		bot_waypoint_queue_owner = NULL;
+	this.aistatus &= ~AI_STATUS_STUCK; // otherwise bot_waypoint_queue_owner will be set again to this by navigation_unstuck
+}
+
 void bot_serverframe()
 {
-	if (intermission_running)
+	if (game_stopped)
 		return;
 
 	if (time < 2)