X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fscripting.qc;h=5ff1bb5f5bb789fa478432483e17b59d0919e46f;hp=b265c3a3e00641d90bb9b83924e8cfba179f715d;hb=6f4349956b11b36ba20e65e34d39b5029a5eb3ac;hpb=07f355e4e485150de3a31e9626ad00ac52d83879

diff --git a/qcsrc/server/bot/scripting.qc b/qcsrc/server/bot/scripting.qc
index b265c3a3e0..5ff1bb5f5b 100644
--- a/qcsrc/server/bot/scripting.qc
+++ b/qcsrc/server/bot/scripting.qc
@@ -21,6 +21,28 @@ void bot_queuecommand(entity bot, string cmdstring)
 	}
 
 	bufstr_set(bot.bot_cmdqueuebuf, bot.bot_cmdqueuebuf_end, cmdstring);
+
+	// if the command was a "sound" command, precache the sound NOW
+	// this prevents lagging!
+	{
+		float sp;
+		string parm;
+		string cmdstr;
+
+		sp = strstrofs(cmdstr, " ", 0);
+		if(sp < 0)
+		{
+			parm = "";
+		}
+		else
+		{
+			parm = substring(cmdstr, sp + 1, -1);
+			cmdstr = substring(cmdstr, 0, sp);
+		}
+		if(cmdstr == "sound")
+			precache_sound(cmdstr);
+	}
+
 	bot.bot_cmdqueuebuf_end += 1;
 }
 
@@ -131,11 +153,12 @@ entity bot_getplace(string placename)
 #define BOT_CMD_BARRIER         20
 #define BOT_CMD_CONSOLE			21
 #define BOT_CMD_SOUND			22
-#define BOT_CMD_WHILE			23	// TODO: Not implemented yet
-#define BOT_CMD_WEND			24	// TODO: Not implemented yet
-#define BOT_CMD_CHASE			25	// TODO: Not implemented yet
+#define BOT_CMD_DEBUG_ASSERT_CANFIRE 23
+#define BOT_CMD_WHILE			24	// TODO: Not implemented yet
+#define BOT_CMD_WEND			25	// TODO: Not implemented yet
+#define BOT_CMD_CHASE			26	// TODO: Not implemented yet
 
-#define BOT_CMD_COUNTER			23	// Update this value if you add/remove a command
+#define BOT_CMD_COUNTER			24	// Update this value if you add/remove a command
 
 // NOTE: Following commands should be implemented on the bot ai
 //		 If a new command should be handled by the target ai(s) please declare it here
@@ -241,6 +264,9 @@ void bot_commands_init()
 	bot_cmd_string[BOT_CMD_SOUND] = "sound";
 	bot_cmd_parm_type[BOT_CMD_SOUND] = BOT_CMD_PARAMETER_STRING;
 
+	bot_cmd_string[BOT_CMD_DEBUG_ASSERT_CANFIRE] = "debug_assert_canfire";
+	bot_cmd_parm_type[BOT_CMD_DEBUG_ASSERT_CANFIRE] = BOT_CMD_PARAMETER_FLOAT;
+
 	bot_cmds_initialized = TRUE;
 }
 
@@ -448,6 +474,9 @@ void bot_cmdhelp(string scmd)
 			case BOT_CMD_SOUND:
 				print("play sound file at bot location");
 				break;
+			case BOT_CMD_DEBUG_ASSERT_CANFIRE:
+				print("verify the state of the weapon entity");
+				break;
 			default:
 				print("This command has no description yet.");
 				break;
@@ -1066,6 +1095,48 @@ float bot_cmd_sound()
 	return CMD_STATUS_FINISHED;
 }
 
+.entity tuba_note;
+float bot_cmd_debug_assert_canfire()
+{
+	float f;
+	f = bot_cmd.bot_cmd_parm_float;
+
+	if(self.weaponentity.state != WS_READY)
+	{
+		if(f)
+		{
+			self.colormod = '0 8 8';
+			print("Bot wants to fire, inhibited by weaponentity state\n");
+		}
+	}
+	else if(ATTACK_FINISHED(self) > time)
+	{
+		if(f)
+		{
+			self.colormod = '8 0 8';
+			print("Bot wants to fire, inhibited by ATTACK_FINISHED\n");
+		}
+	}
+	else if(self.tuba_note)
+	{
+		if(f)
+		{
+			self.colormod = '8 0 0';
+			print("Bot wants to fire, bot still has an active tuba note\n");
+		}
+	}
+	else
+	{
+		if(!f)
+		{
+			self.colormod = '8 8 0';
+			print("Bot thinks it has fired, but apparently did not\n");
+		}
+	}
+
+	return CMD_STATUS_FINISHED;
+}
+
 //
 
 void bot_command_executed(float rm)
@@ -1144,12 +1215,16 @@ float bot_execute_commands_once()
 {
 	local float status, ispressingkey;
 
-	if(self.deadflag!=DEAD_NO)
-		return 0;
-
 	// Find command
 	bot_setcurrentcommand();
 
+	// if we have no bot command, better return
+	// old logic kept pressing previously pressed keys, but that has problems
+	// (namely, it means you cannot make a bot "normal" ever again)
+	// to keep a bot walking for a while, use the "wait" bot command
+	if(bot_cmd == world)
+		return FALSE;
+
 	// Ignore all commands except continue when the bot is paused
 	if(self.bot_exec_status & BOT_EXEC_STATUS_PAUSED)
 	if(bot_cmd.bot_cmd_type!=BOT_CMD_CONTINUE)
@@ -1165,9 +1240,6 @@ float bot_execute_commands_once()
 	// Keep pressing keys raised by the "presskey" command
 	ispressingkey = !!bot_presskeys();
 
-	if(bot_cmd==world)
-		return ispressingkey;
-
 	// Handle conditions
 	if not(bot_cmd.bot_cmd_type==BOT_CMD_FI||bot_cmd.bot_cmd_type==BOT_CMD_ELSE)
 	if(self.bot_cmd_condition_status & CMD_CONDITION_TRUE && self.bot_cmd_condition_status & CMD_CONDITION_FALSE_BLOCK)
@@ -1254,6 +1326,9 @@ float bot_execute_commands_once()
 		case BOT_CMD_SOUND:
 			status = bot_cmd_sound();
 			break;
+		case BOT_CMD_DEBUG_ASSERT_CANFIRE:
+			status = bot_cmd_debug_assert_canfire();
+			break;
 		default:
 			print(strcat("ERROR: Invalid command on queue with id '",ftos(bot_cmd.bot_cmd_type),"'\n"));
 			return 0;