Future/t4sp_bot_warfare
1
0
Fork 0
mirror of https://github.com/JezuzLizard/t4sp_bot_warfare.git synced 2025-06-30 08:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compile errors.

Browse Source 
Add base scripts for personality and difficulty presets. Add canceling, and postponing thinks.
This commit is contained in:
JezuzLizard
2023-03-27 16:44:32 -07:00
parent c23fd0fd2d
commit 872630b7e2
6 changed files with 165 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/sp/bots/actions/objective.gsc
View File

@ -724,12 +724,12 @@ bot_powerup_process_order()
bot_should_grab_powerup()
{
if ( !( isDefined( level.zbots_powerups ) && level.zbots_powerups.size > 0 ) )
if ( !isDefined( level.zbots_powerups ) || level.zbots_powerups.size <= 0 )
{
return false;
}
const MAX_DISTANCE_SQ = 10000 * 10000;
const BOT_SPEED_WHILE_SPRINTING_SQ = 380 * 380;
MAX_DISTANCE_SQ = 10000 * 10000;
BOT_SPEED_WHILE_SPRINTING_SQ = 285 * 285;
self.available_powerups = [];
for ( i = 0; i < level.zbots_powerups.size; i++ )
{
@ -783,27 +783,12 @@ bot_set_complete_grab_powerup()
bot_powerup_on_completion()
{
level endon( "end_game" );
self endon( "disconnect" );
self notify( "powerup_completion_func" );
self endon( "powerup_completion_func" );
self endon( "pause_bot_think" );
self endon( "powerup_cancel" );
self endon( "powerup_postpone" );
while ( !isDefined( self.target_powerup ) )
{
wait 0.05;
}
self.target_powerup waittill( "death" );
self.actions_in_queue[ "powerup" ].queued = false;
self notify( "powerup_completion" );
self.available_powerups = undefined;
self.target_pos = undefined;
}
bot_powerup_should_cancel()
{
return false;
return ( !isDefined( self.available_powerups ) || self.available_powerups.size <= 0 );
}
bot_powerup_on_cancel()

65
scripts/sp/bots/bot_actions_common.gsc
View File

@ -63,14 +63,22 @@ process_next_queued_action( group_name )
{
return;
}
self [[ self.action_queue[ group_name ][ 0 ].action ]]();
if ( self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].queued )
{
return;
}
self.action_queue[ group_name ] = self sort_array_by_priority_field( self.action_queue[ group_name ] );
self thread [[ self.action_queue[ group_name ][ 0 ].action ]]();
self wait_for_action_completion( self.action_queue[ group_name ][ 0 ].action_name );
}
wait_for_action_completion( group_name, action_name )
{
result = self waittill_any_return( action_name + "_completion", action_name + "_cancel", action_name + "_postpone", "disconnect" );
result = self waittill_any_return( action_name + "_complete", action_name + "_cancel", action_name + "_postpone", "disconnect" );
if ( !isDefined( result ) )
{
return;
@ -79,27 +87,27 @@ wait_for_action_completion( group_name, action_name )
{
return;
}
if ( ( result == action_name + "_completion" ) )
if ( ( result == action_name + "_complete" ) )
{
self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].postponed = false;
self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].queued = false;
arrayRemoveIndex( self.action_queue[ group_name ], 0 );
self.action_queue[ group_name ][ 0 ] = undefined;
self thread [[ self.action_queue[ group_name ][ 0 ].on_completion_func ]]();
}
else if ( result == action_name + "_cancel" )
{
self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].postponed = false;
self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].queued = false;
arrayRemoveIndex( self.action_queue[ group_name ], 0 );
self.action_queue[ group_name ][ 0 ] = undefined;
self thread [[ self.action_queue[ group_name ][ 0 ].on_cancel_func ]]();
}
else if ( result == action_name + "_postpone" )
{
self.zbot_actions_in_queue[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].postponed = true;
postponed_action = self.action_queue[ group_name ][ 0 ];
arrayRemoveIndex( self.action_queue[ group_name ], 0 );
postponed_action.priority = 0;
self.action_queue[ group_name ][ self.action_queue[ group_name ].size ] = postponed_action;
self.action_queue[ group_name ][ 0 ] = undefined;
postponed_action.priority = self [[ level.zbots_actions[ group_name ][ action_keys[ i ] ].priority_func ]]();
self.action_queue[ group_name ] = array_insert( self.action_queue[ group_name ], postponed_action, 1 );
self thread [[ self.action_queue[ group_name ][ 0 ].on_postpone_func ]]();
}
}
@ -117,8 +125,21 @@ copy_default_action_settings_to_queue( group_name, action_name )
self.priority_func = level.zbots_actions[ group_name ][ action_name ].priority_func;
}
pick_actions_to_add_to_queue( group_name, action_keys )
pick_actions_to_add_to_queue( group_name )
{
//TODO: Use process order funcs to determine the order of actions being added to the queue
//For now just randomize the order of the keys
/*
for ( i = 0; i < action_keys; i++ )
{
}
*/
action_keys = getArrayKeys( level.zbots_actions[ group_name ] );
action_keys = array_randomize( action_keys );
for ( i = 0; i < action_keys.size; i++ )
{
if ( !self.zbot_actions_in_queue[ group_name ][ action_keys[ i ] ].queued && [[ level.zbots_actions[ group_name ][ action_keys[ i ] ].should_do_func ]]() )
@ -131,24 +152,26 @@ pick_actions_to_add_to_queue( group_name, action_keys )
}
}
check_if_actions_should_be_canceled_in_group( group_name, action_keys )
check_if_action_should_be_canceled_in_group( group_name )
{
for ( i = 0; i < action_keys.size; i++ )
if ( [[ level.zbots_actions[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].should_cancel_func ]]() )
{
if ( self.zbot_actions_in_queue[ group_name ][ action_keys[ i ] ].queued && [[ level.zbots_actions[ group_name ][ action_keys[ i ] ].should_cancel_func ]]() )
{
self notify( action_keys[ i ] + "_cancel" );
}
self notify( self.action_queue[ group_name ][ 0 ].action_name + "_cancel" );
}
}
check_if_actions_should_be_postponed_in_group( group_name, action_keys )
check_if_action_should_be_postponed_in_group( group_name )
{
for ( i = 0; i < action_keys.size; i++ )
if ( [[ level.zbots_actions[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].should_postpone_func ]]() )
{
if ( self.zbot_actions_in_queue[ group_name ][ action_keys[ i ] ].queued && [[ level.zbots_actions[ group_name ][ action_keys[ i ] ].should_postpone_func ]]() )
{
self notify( action_keys[ i ] + "_postpone" );
}
self notify( self.action_queue[ group_name ][ 0 ].action_name + "_postpone" );
}
}
check_if_action_is_completed_in_group( group_name )
{
if ( [[ level.zbots_actions[ group_name ][ self.action_queue[ group_name ][ 0 ].action_name ].check_if_complete_func ]]() )
{
self notify( self.action_queue[ group_name ][ 0 ].action_name + "_complete" );
}
}

9
scripts/sp/bots/bot_difficulty_presets_common.gsc Normal file
View File

@ -0,0 +1,9 @@
register_bot_difficulty( difficulty )
{
if ( !isDefined( level.zbot_difficulties ) )
{
level.zbot_difficulties = [];
}
level.zbot_difficulties[ difficulty ] = true;
}

10
scripts/sp/bots/bot_personality_presets_common.gsc Normal file
View File

@ -0,0 +1,10 @@
register_bot_personality_type( personality )
{
if ( !isDefined( level.zbot_personalities ) )
{
level.zbot_personalities = [];
}
level.zbot_personalities[ personality ] = true;
}

22
scripts/sp/bots/bot_utility.gsc
View File

@ -1,6 +1,6 @@
#include common_scripts\utility;
#include maps\mp\_utility;
#include maps\mp\zombies\_zm_utility;
#include maps\_utility;
#include maps\_zombiemode_utility;
register_stats_for_bot_weapon( weapon, score )
{
@ -13,8 +13,8 @@ register_stats_for_bot_weapon( weapon, score )
parse_bot_weapon_stats_from_table()
{
const WEAPON_COLUMN = 0;
const SCORE_COLUMN = 1;
WEAPON_COLUMN = 0;
SCORE_COLUMN = 1;
/*
row = 0;
while ( true )
@ -142,8 +142,10 @@ push( array, val, index )
{
// use max free integer as index
index = 0;
foreach ( key in GetArrayKeys( array ) )
keys = GetArrayKeys( array );
for ( i = 0; i < keys.size; i++ )
{
key = keys[ i ];
if ( IsInt( key ) && ( key >= index ) )
{
index = key + 1;
@ -151,7 +153,7 @@ push( array, val, index )
}
}
ArrayInsert( array, val, index );
array = array_insert( array, val, index );
return array;
}
@ -257,8 +259,8 @@ find_gaps()
are_enemies_horded()
{
const MINIMUM_PERCENT_TO_BE_HORDE = 0.9;
const DISTANCE_SQ = 120 * 120;
MINIMUM_PERCENT_TO_BE_HORDE = 0.9;
DISTANCE_SQ = 120 * 120;
zombies = get_zombies();
amount_in_horde = 0;
max_eligible_zombies = isDefined( level.speed_change_round ) ? zombies.size - level.speed_change_num : zombies.size;
@ -338,7 +340,7 @@ predict_entity_position_seconds( seconds )
any_zombies_targeting_self()
{
const ZOMBIE_TARGETING_DIST_SQ = 10 * 10;
ZOMBIE_TARGETING_DIST_SQ = 10 * 10;
zombies = get_zombies();
if ( !array_validate( zombies ) )
{
@ -426,7 +428,7 @@ assign_priority_to_powerup( powerup )
}
if ( powerup_is_max_ammo )
{
const LOW_AMMO_THRESHOLD = 0.3;
LOW_AMMO_THRESHOLD = 0.3;
for ( i = 0; i < level.players.size; i++ )
{