if(!bot.bot_cmdqueuebuf_allocated)
return;
buf_del(bot.bot_cmdqueuebuf);
- bot.bot_cmdqueuebuf_allocated = FALSE;
+ bot.bot_cmdqueuebuf_allocated = false;
dprint("bot ", bot.netname, " queue cleared\n");
}
if(!bot.bot_cmdqueuebuf_allocated)
{
bot.bot_cmdqueuebuf = buf_create();
- bot.bot_cmdqueuebuf_allocated = TRUE;
+ bot.bot_cmdqueuebuf_allocated = true;
bot.bot_cmdqueuebuf_start = 0;
bot.bot_cmdqueuebuf_end = 0;
}
if(cmdstr == "sound")
{
// find the LAST word
- for(;;)
+ for (;;)
{
sp = strstrofs(parm, " ", 0);
if(sp < 0)
return 1;
}
-#define MAX_BOT_PLACES 4
+const int MAX_BOT_PLACES = 4;
.float bot_places_count;
.entity bot_places[MAX_BOT_PLACES];
.string bot_placenames[MAX_BOT_PLACES];
entity e;
if(substring(placename, 0, 1) == "@")
{
- float i, p;
+ int i, p;
placename = substring(placename, 1, -1);
string s, s2;
for(i = 0; i < self.bot_places_count; ++i)
// NOTE: New commands should be added here. Do not forget to update BOT_CMD_COUNTER
-#define BOT_CMD_NULL 0
-#define BOT_CMD_PAUSE 1
-#define BOT_CMD_CONTINUE 2
-#define BOT_CMD_WAIT 3
-#define BOT_CMD_TURN 4
-#define BOT_CMD_MOVETO 5
-#define BOT_CMD_RESETGOAL 6 // Not implemented yet
-#define BOT_CMD_CC 7
-#define BOT_CMD_IF 8
-#define BOT_CMD_ELSE 9
-#define BOT_CMD_FI 10
-#define BOT_CMD_RESETAIM 11
-#define BOT_CMD_AIM 12
-#define BOT_CMD_PRESSKEY 13
-#define BOT_CMD_RELEASEKEY 14
-#define BOT_CMD_SELECTWEAPON 15
-#define BOT_CMD_IMPULSE 16
-#define BOT_CMD_WAIT_UNTIL 17
-#define BOT_CMD_MOVETOTARGET 18
-#define BOT_CMD_AIMTARGET 19
-#define BOT_CMD_BARRIER 20
-#define BOT_CMD_CONSOLE 21
-#define BOT_CMD_SOUND 22
-#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 24 // Update this value if you add/remove a command
+const int BOT_CMD_NULL = 0;
+const int BOT_CMD_PAUSE = 1;
+const int BOT_CMD_CONTINUE = 2;
+const int BOT_CMD_WAIT = 3;
+const int BOT_CMD_TURN = 4;
+const int BOT_CMD_MOVETO = 5;
+const int BOT_CMD_RESETGOAL = 6; // Not implemented yet
+const int BOT_CMD_CC = 7;
+const int BOT_CMD_IF = 8;
+const int BOT_CMD_ELSE = 9;
+const int BOT_CMD_FI = 10;
+const int BOT_CMD_RESETAIM = 11;
+const int BOT_CMD_AIM = 12;
+const int BOT_CMD_PRESSKEY = 13;
+const int BOT_CMD_RELEASEKEY = 14;
+const int BOT_CMD_SELECTWEAPON = 15;
+const int BOT_CMD_IMPULSE = 16;
+const int BOT_CMD_WAIT_UNTIL = 17;
+const int BOT_CMD_MOVETOTARGET = 18;
+const int BOT_CMD_AIMTARGET = 19;
+const int BOT_CMD_BARRIER = 20;
+const int BOT_CMD_CONSOLE = 21;
+const int BOT_CMD_SOUND = 22;
+const int BOT_CMD_DEBUG_ASSERT_CANFIRE = 23;
+const int BOT_CMD_WHILE = 24; // TODO: Not implemented yet
+const int BOT_CMD_WEND = 25; // TODO: Not implemented yet
+const int BOT_CMD_CHASE = 26; // TODO: Not implemented yet
+
+const int 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
.float() cmd_resetgoal;
//
-#define BOT_CMD_PARAMETER_NONE 0
-#define BOT_CMD_PARAMETER_FLOAT 1
-#define BOT_CMD_PARAMETER_STRING 2
-#define BOT_CMD_PARAMETER_VECTOR 3
+const int BOT_CMD_PARAMETER_NONE = 0;
+const int BOT_CMD_PARAMETER_FLOAT = 1;
+const int BOT_CMD_PARAMETER_STRING = 2;
+const int BOT_CMD_PARAMETER_VECTOR = 3;
float bot_cmds_initialized;
-float bot_cmd_parm_type[BOT_CMD_COUNTER];
+int bot_cmd_parm_type[BOT_CMD_COUNTER];
string bot_cmd_string[BOT_CMD_COUNTER];
// Bots command queue
.float is_bot_cmd; // Tells if the entity is a bot command
.float bot_cmd_index; // Position of the command in the queue
-.float bot_cmd_type; // If of command (see the BOT_CMD_* defines)
+.int bot_cmd_type; // If of command (see the BOT_CMD_* defines)
.float bot_cmd_parm_float; // Field to store a float parameter
.string bot_cmd_parm_string; // Field to store a string parameter
.vector bot_cmd_parm_vector; // Field to store a vector parameter
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;
+ bot_cmds_initialized = true;
}
// Returns first bot with matching name
bot = findchainflags(flags, FL_CLIENT);
while (bot)
{
- if(clienttype(bot) == CLIENTTYPE_BOT)
+ if(IS_BOT_CLIENT(bot))
if(bot.netname==name)
return bot;
bot = findchainflags(flags, FL_CLIENT);
while (bot)
{
- if(clienttype(bot) == CLIENTTYPE_BOT)
+ if(IS_BOT_CLIENT(bot))
{
if(++c==number)
return bot;
float bot_decodecommand(string cmdstring)
{
- float cmd_parm_type, i;
+ float cmd_parm_type;
float sp;
string parm;
if(!bot_cmds_initialized)
bot_commands_init();
+ int i;
for(i=1;i<BOT_CMD_COUNTER;++i)
{
if(bot_cmd_string[i]!=cmdstring)
void bot_cmdhelp(string scmd)
{
- float i, ntype;
+ int i, ntype;
string stype;
if(!bot_cmds_initialized)
void bot_list_commands()
{
- float i;
+ int i;
string ptype;
if(!bot_cmds_initialized)
}
// Commands code
-.float bot_exec_status;
+.int bot_exec_status;
#define BOT_EXEC_STATUS_IDLE 0
#define BOT_EXEC_STATUS_PAUSED 1
float bot_cmd_continue()
{
- self.bot_exec_status &~= BOT_EXEC_STATUS_PAUSED;
+ self.bot_exec_status &= ~BOT_EXEC_STATUS_PAUSED;
return CMD_STATUS_FINISHED;
}
{
if(time>=self.bot_cmd_wait_time)
{
- self.bot_exec_status &~= BOT_EXEC_STATUS_WAITING;
+ self.bot_exec_status &= ~BOT_EXEC_STATUS_WAITING;
return CMD_STATUS_FINISHED;
}
else
self.bot_exec_status |= BOT_EXEC_STATUS_WAITING;
return CMD_STATUS_EXECUTING;
}
- self.bot_exec_status &~= BOT_EXEC_STATUS_WAITING;
+ self.bot_exec_status &= ~BOT_EXEC_STATUS_WAITING;
return CMD_STATUS_FINISHED;
}
float bot_cmd_turn()
{
- self.v_angle_y = self.v_angle_y + bot_cmd.bot_cmd_parm_float;
- self.v_angle_y = self.v_angle_y - floor(self.v_angle_y / 360) * 360;
+ self.v_angle_y = self.v_angle.y + bot_cmd.bot_cmd_parm_float;
+ self.v_angle_y = self.v_angle.y - floor(self.v_angle.y / 360) * 360;
return CMD_STATUS_FINISHED;
}
if(id < WEP_FIRST || id > WEP_LAST)
return CMD_STATUS_ERROR;
- if(client_hasweapon(self, id, TRUE, FALSE))
+ if(client_hasweapon(self, id, true, false))
self.switchweapon = id;
else
return CMD_STATUS_ERROR;
return CMD_STATUS_FINISHED;
}
-.float bot_cmd_condition_status;
+.int bot_cmd_condition_status;
-#define CMD_CONDITION_NONE 0
-#define CMD_CONDITION_TRUE 1
-#define CMD_CONDITION_FALSE 2
-#define CMD_CONDITION_TRUE_BLOCK 4
-#define CMD_CONDITION_FALSE_BLOCK 8
+const int CMD_CONDITION_NONE = 0;
+const int CMD_CONDITION_true = 1;
+const int CMD_CONDITION_false = 2;
+const int CMD_CONDITION_true_BLOCK = 4;
+const int CMD_CONDITION_false_BLOCK = 8;
float bot_cmd_eval(string expr)
{
return CMD_STATUS_ERROR;
}
- self.bot_cmd_condition_status |= CMD_CONDITION_TRUE_BLOCK;
+ self.bot_cmd_condition_status |= CMD_CONDITION_true_BLOCK;
// search for operators
expr = bot_cmd.bot_cmd_parm_string;
val_b = substring(expr,cmpofs+1,strlen(expr));
if(bot_cmd_eval(val_a)==bot_cmd_eval(val_b))
- self.bot_cmd_condition_status |= CMD_CONDITION_TRUE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_true;
else
- self.bot_cmd_condition_status |= CMD_CONDITION_FALSE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_false;
return CMD_STATUS_FINISHED;
}
val_b = substring(expr,cmpofs+1,strlen(expr));
if(bot_cmd_eval(val_a)>bot_cmd_eval(val_b))
- self.bot_cmd_condition_status |= CMD_CONDITION_TRUE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_true;
else
- self.bot_cmd_condition_status |= CMD_CONDITION_FALSE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_false;
return CMD_STATUS_FINISHED;
}
val_b = substring(expr,cmpofs+1,strlen(expr));
if(bot_cmd_eval(val_a)<bot_cmd_eval(val_b))
- self.bot_cmd_condition_status |= CMD_CONDITION_TRUE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_true;
else
- self.bot_cmd_condition_status |= CMD_CONDITION_FALSE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_false;
return CMD_STATUS_FINISHED;
}
if(bot_cmd_eval(expr))
- self.bot_cmd_condition_status |= CMD_CONDITION_TRUE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_true;
else
- self.bot_cmd_condition_status |= CMD_CONDITION_FALSE;
+ self.bot_cmd_condition_status |= CMD_CONDITION_false;
return CMD_STATUS_FINISHED;
}
float bot_cmd_else()
{
- self.bot_cmd_condition_status &~= CMD_CONDITION_TRUE_BLOCK;
- self.bot_cmd_condition_status |= CMD_CONDITION_FALSE_BLOCK;
+ self.bot_cmd_condition_status &= ~CMD_CONDITION_true_BLOCK;
+ self.bot_cmd_condition_status |= CMD_CONDITION_false_BLOCK;
return CMD_STATUS_FINISHED;
}
self.bot_cmd_aim_begin = self.v_angle;
- self.bot_cmd_aim_end_x = self.v_angle_x - stof(argv(1));
- self.bot_cmd_aim_end_y = self.v_angle_y + stof(argv(0));
+ self.bot_cmd_aim_end_x = self.v_angle.x - stof(argv(1));
+ self.bot_cmd_aim_end_y = self.v_angle.y + stof(argv(0));
self.bot_cmd_aim_end_z = 0;
self.bot_cmd_aim_begintime = time;
if(tokens==1)
{
self.v_angle = vectoangles(v - (self.origin + self.view_ofs));
- self.v_angle_x = -self.v_angle_x;
+ self.v_angle_x = -self.v_angle.x;
return CMD_STATUS_FINISHED;
}
self.bot_cmd_aim_begin = self.v_angle;
self.bot_cmd_aim_end = vectoangles(v - (self.origin + self.view_ofs));
- self.bot_cmd_aim_end_x = -self.bot_cmd_aim_end_x;
+ self.bot_cmd_aim_end_x = -self.bot_cmd_aim_end.x;
self.bot_cmd_aim_begintime = time;
self.bot_cmd_aim_endtime = time + step;
return CMD_STATUS_EXECUTING;
}
-.float bot_cmd_keys;
-
-#define BOT_CMD_KEY_NONE 0
-#define BOT_CMD_KEY_FORWARD 1
-#define BOT_CMD_KEY_BACKWARD 2
-#define BOT_CMD_KEY_RIGHT 4
-#define BOT_CMD_KEY_LEFT 8
-#define BOT_CMD_KEY_JUMP 16
-#define BOT_CMD_KEY_ATTACK1 32
-#define BOT_CMD_KEY_ATTACK2 64
-#define BOT_CMD_KEY_USE 128
-#define BOT_CMD_KEY_HOOK 256
-#define BOT_CMD_KEY_CROUCH 512
-#define BOT_CMD_KEY_CHAT 1024
+.int bot_cmd_keys;
+
+const int BOT_CMD_KEY_NONE = 0;
+const int BOT_CMD_KEY_FORWARD = 1;
+const int BOT_CMD_KEY_BACKWARD = 2;
+const int BOT_CMD_KEY_RIGHT = 4;
+const int BOT_CMD_KEY_LEFT = 8;
+const int BOT_CMD_KEY_JUMP = 16;
+const int BOT_CMD_KEY_ATTACK1 = 32;
+const int BOT_CMD_KEY_ATTACK2 = 64;
+const int BOT_CMD_KEY_USE = 128;
+const int BOT_CMD_KEY_HOOK = 256;
+const int BOT_CMD_KEY_CROUCH = 512;
+const int BOT_CMD_KEY_CHAT = 1024;
float bot_presskeys()
{
self.movement = '0 0 0';
- self.BUTTON_JUMP = FALSE;
- self.BUTTON_CROUCH = FALSE;
- self.BUTTON_ATCK = FALSE;
- self.BUTTON_ATCK2 = FALSE;
- self.BUTTON_USE = FALSE;
- self.BUTTON_HOOK = FALSE;
- self.BUTTON_CHAT = FALSE;
+ self.BUTTON_JUMP = false;
+ self.BUTTON_CROUCH = false;
+ self.BUTTON_ATCK = false;
+ self.BUTTON_ATCK2 = false;
+ self.BUTTON_USE = false;
+ self.BUTTON_HOOK = false;
+ self.BUTTON_CHAT = false;
if(self.bot_cmd_keys == BOT_CMD_KEY_NONE)
- return FALSE;
+ return false;
if(self.bot_cmd_keys & BOT_CMD_KEY_FORWARD)
self.movement_x = autocvar_sv_maxspeed;
self.movement_y = -autocvar_sv_maxspeed;
if(self.bot_cmd_keys & BOT_CMD_KEY_JUMP)
- self.BUTTON_JUMP = TRUE;
+ self.BUTTON_JUMP = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_CROUCH)
- self.BUTTON_CROUCH = TRUE;
+ self.BUTTON_CROUCH = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_ATTACK1)
- self.BUTTON_ATCK = TRUE;
+ self.BUTTON_ATCK = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_ATTACK2)
- self.BUTTON_ATCK2 = TRUE;
+ self.BUTTON_ATCK2 = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_USE)
- self.BUTTON_USE = TRUE;
+ self.BUTTON_USE = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_HOOK)
- self.BUTTON_HOOK = TRUE;
+ self.BUTTON_HOOK = true;
if(self.bot_cmd_keys & BOT_CMD_KEY_CHAT)
- self.BUTTON_CHAT = TRUE;
+ self.BUTTON_CHAT = true;
- return TRUE;
+ return true;
}
if(enabled)
{
self.bot_cmd_keys |= BOT_CMD_KEY_FORWARD;
- self.bot_cmd_keys &~= BOT_CMD_KEY_BACKWARD;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_BACKWARD;
}
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_FORWARD;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_FORWARD;
break;
case "backward":
if(enabled)
{
self.bot_cmd_keys |= BOT_CMD_KEY_BACKWARD;
- self.bot_cmd_keys &~= BOT_CMD_KEY_FORWARD;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_FORWARD;
}
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_BACKWARD;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_BACKWARD;
break;
case "left":
if(enabled)
{
self.bot_cmd_keys |= BOT_CMD_KEY_LEFT;
- self.bot_cmd_keys &~= BOT_CMD_KEY_RIGHT;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_RIGHT;
}
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_LEFT;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_LEFT;
break;
case "right":
if(enabled)
{
self.bot_cmd_keys |= BOT_CMD_KEY_RIGHT;
- self.bot_cmd_keys &~= BOT_CMD_KEY_LEFT;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_LEFT;
}
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_RIGHT;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_RIGHT;
break;
case "jump":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_JUMP;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_JUMP;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_JUMP;
break;
case "crouch":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_CROUCH;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_CROUCH;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_CROUCH;
break;
case "attack1":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_ATTACK1;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_ATTACK1;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_ATTACK1;
break;
case "attack2":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_ATTACK2;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_ATTACK2;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_ATTACK2;
break;
case "use":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_USE;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_USE;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_USE;
break;
case "hook":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_HOOK;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_HOOK;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_HOOK;
break;
case "chat":
if(enabled)
self.bot_cmd_keys |= BOT_CMD_KEY_CHAT;
else
- self.bot_cmd_keys &~= BOT_CMD_KEY_CHAT;
+ self.bot_cmd_keys &= ~BOT_CMD_KEY_CHAT;
break;
default:
break;
key = bot_cmd.bot_cmd_parm_string;
- bot_cmd_keypress_handler(key,TRUE);
+ bot_cmd_keypress_handler(key,true);
return CMD_STATUS_FINISHED;
}
key = bot_cmd.bot_cmd_parm_string;
- return bot_cmd_keypress_handler(key,FALSE);
+ return bot_cmd_keypress_handler(key,false);
}
float bot_cmd_pause()
string sample = f;
float chan = CH_WEAPON_B;
float vol = VOL_BASE;
- float atten = ATTN_MIN;
+ float atten = ATTEN_MIN;
if(n >= 1)
sample = argv(n - 1);
void bot_resetqueues()
{
entity cl;
- float i;
FOR_EACH_CLIENT(cl) if(cl.isbot)
{
bot_clearqueue(cl);
// also, cancel all barriers
cl.bot_barrier = 0;
- for(i = 0; i < cl.bot_places_count; ++i)
+ for(int i = 0; i < cl.bot_places_count; ++i)
{
strunzone(cl.(bot_placenames[i]));
cl.(bot_placenames[i]) = string_null;
// (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;
+ 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_NULL)
{
- bot_command_executed(TRUE);
+ bot_command_executed(true);
print( "WARNING: Commands are ignored while the bot is paused. Use the command 'continue' instead.\n");
}
return 1;
ispressingkey = !!bot_presskeys();
// 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)
+ if (!(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)
{
- bot_command_executed(TRUE);
+ bot_command_executed(true);
return -1;
}
- else if(self.bot_cmd_condition_status & CMD_CONDITION_FALSE && self.bot_cmd_condition_status & CMD_CONDITION_TRUE_BLOCK)
+ else if(self.bot_cmd_condition_status & CMD_CONDITION_false && self.bot_cmd_condition_status & CMD_CONDITION_true_BLOCK)
{
- bot_command_executed(TRUE);
+ bot_command_executed(true);
return -1;
}
clientcommand(self,strcat("say ^7", bot_cmd_string[bot_cmd.bot_cmd_type]," ",parms,"\n"));
}
- bot_command_executed(TRUE);
+ bot_command_executed(true);
}
if(status == CMD_STATUS_FINISHED)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff