From 31c885a396b2238a2b5d0347b0fe404750849069 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Sat, 25 Mar 2023 20:32:14 -0700 Subject: [PATCH] Remove limit on how many actions can be queued. Add support for affecting the process order of an action aka the order the should do action function is executed for each action. Add bot actions for each bot think thread. --- scripts/sp/T4ZM_zbots_main.gsc | 67 +++++++++-------- scripts/sp/bots/bot_actions.gsc | 123 ++++++++++++++++++++++++++++---- 2 files changed, 147 insertions(+), 43 deletions(-) diff --git a/scripts/sp/T4ZM_zbots_main.gsc b/scripts/sp/T4ZM_zbots_main.gsc index 30d37c8..beeb398 100644 --- a/scripts/sp/T4ZM_zbots_main.gsc +++ b/scripts/sp/T4ZM_zbots_main.gsc @@ -1,32 +1,45 @@ #include common_scripts\utility; -#include maps\mp\_utility; -#include maps\mp\zombies\_zm_utility; -#include scripts\zm\bots\bot_actions; -#include scripts\zm\bots\bot_utility; -#include scripts\zm\bots\bot_difficulty; -#include scripts\zm\bots\_overrides; +#include maps\_utility; +#include maps\_zombiemode_utility; +#include scripts\sp\bots\bot_actions; +#include scripts\sp\bots\bot_utility; main() { - replaceFunc( maps\mp\zombies\_zm_spawner::zombie_follow_enemy, ::zombie_follow_enemy_override ); - replaceFunc( maps\mp\zombies\_zm_powerups::powerup_timeout, ::powerup_timeout_override ); + //3 separate bot think threads + //Objective group is for things to go to usually allowing the bot to kill zombies on the way and survive as normal + //Objectives can be canceled/postponed by combat thread, movement thread or by other objectives + register_bot_action( "objective", "magicbox", ::bot_magicbox_purchase, ::bot_magicbox_action_order, ::bot_should_purchase_magicbox, ::bot_magicbox_purchase_on_completion, ::bot_magicbox_purchase_should_cancel, ::bot_magicbox_purchase_on_cancel, ::bot_magicbox_purchase_should_postpone, ::bot_magicbox_purchase_on_postpone, ::bot_magicbox_purchase_priority ); + register_bot_action( "objective", "wallbuy", ::bot_wallbuy_purchase, ::bot_wallbuy_action_order, ::bot_should_purchase_wallbuy, ::bot_wallbuy_purchase_on_completion, ::bot_wallbuy_purchase_should_cancel, ::bot_wallbuy_purchase_on_cancel, ::bot_wallbuy_purchase_should_postpone, ::bot_wallbuy_purchase_on_postpone, ::bot_wallbuy_purchase_priority ); + register_bot_action( "objective", "wallbuyammo", ::bot_wallbuy_ammo_purchase, ::bot_wallbuyammo_action_order, ::bot_should_purchase_wallbuy_ammo, ::bot_wallbuy_ammo_purchase_on_completion, ::bot_wallbuy_ammo_purchase_should_cancel, ::bot_wallbuy_ammo_purchase_on_cancel, ::bot_wallbuy_ammo_purchase_should_postpone, ::bot_wallbuy_ammo_purchase_on_postpone, ::bot_wallbuy_ammo_purchase_priority ); + register_bot_action( "objective", "perk", ::bot_perk_purchase, ::bot_perk_action_order, ::bot_should_purchase_perk, ::bot_perk_purchase_on_completion, ::bot_perk_purchase_should_cancel, ::bot_perk_purchase_on_cancel, ::bot_perk_purchase_should_postpone, ::bot_perk_purchase_on_postpone, ::bot_perk_purchase_priority ); + register_bot_action( "objective", "door", ::bot_door_purchase, ::bot_door_action_order, ::bot_should_purchase_door, ::bot_door_purchase_on_completion, ::bot_door_purchase_should_cancel, ::bot_door_purchase_on_cancel, ::bot_door_purchase_should_postpone, ::bot_door_purchase_on_postpone, ::bot_door_purchase_priority ); + register_bot_action( "objective", "debris", ::bot_debris_purchase, ::bot_debris_action_order, ::bot_should_purchase_debris, ::bot_debris_purchase_on_completion, ::bot_debris_purchase_should_cancel, ::bot_debris_purchase_on_cancel, ::bot_debris_purchase_should_postpone, ::bot_debris_purchase_on_postpone, ::bot_debris_purchase_priority ); + register_bot_action( "objective", "trap", ::bot_trap_purchase, ::bot_trap_action_order, ::bot_should_purchase_trap, ::bot_trap_purchase_on_completion, ::bot_trap_purchase_should_cancel, ::bot_trap_purchase_on_cancel, ::bot_trap_purchase_should_postpone, ::bot_trap_purchase_on_postpone, ::bot_trap_purchase_priority ); + register_bot_action( "objective", "packapunch", ::bot_packapunch_purchase, ::bot_packapunch_action_order, ::bot_should_purchase_packapunch, ::bot_packapunch_purchase_on_completion, ::bot_packapunch_purchase_should_cancel, ::bot_packapunch_purchase_on_cancel, ::bot_packapunch_purchase_should_postpone, ::bot_packapunch_purchase_on_postpone, ::bot_packapunch_purchase_priority ); + register_bot_action( "objective", "revive", ::bot_revive_player, ::bot_revive_action_order, ::bot_should_revive_player, ::bot_revive_player_on_completion, ::bot_revive_player_should_cancel, ::bot_revive_player_on_cancel, ::bot_revive_player_should_postpone, ::bot_revive_player_on_postpone, ::bot_revive_player_priority ); + register_bot_action( "objective", "grabbuildable", ::bot_grab_buildable, ::bot_grabbuildable_action_order, ::bot_should_grab_buildable, ::bot_grab_buildable_on_completion, ::bot_grab_buildable_should_cancel, ::bot_grabbuild_buildable_on_cancel, ::bot_grab_buildable_should_postpone, ::bot_grab_buildable_on_postpone, ::bot_grab_buildable_priority ); + register_bot_action( "objective", "buildbuildable", ::bot_build_buildable, ::bot_buildbuildable_action_order, ::bot_should_build_buildable, ::bot_build_buildable_on_completion, ::bot_build_buildable_should_cancel, ::bot_build_buildable_on_cancel, ::bot_build_buildable_should_postpone, ::bot_build_buildable_on_postpone, ::bot_build_buildable_priority ); + register_bot_action( "objective", "part", ::bot_grab_part, ::bot_part_action_order, ::bot_should_grab_part, ::bot_part_on_completion, ::bot_part_should_cancel, ::bot_part_on_cancel, ::bot_part_should_postpone, ::bot_part_on_postpone, ::bot_part_priority ); + register_bot_action( "objective", "powerup", ::bot_grab_powerup, ::bot_powerup_action_order, ::bot_should_grab_powerup, ::bot_powerup_on_completion, ::bot_powerup_should_cancel, ::bot_powerup_on_cancel, ::bot_powerup_should_postpone, ::bot_powerup_on_postpone, ::bot_powerup_priority ); - register_bot_action( "purchase", "magicbox", ::bot_magicbox_purchase, ::bot_should_purchase_magicbox, ::bot_magicbox_purchase_on_completion, ::bot_magicbox_purchase_should_cancel, ::bot_magicbox_purchase_on_cancel, ::bot_magicbox_purchase_should_postpone, ::bot_magicbox_purchase_on_postpone, ::bot_magicbox_purchase_priority ); - register_bot_action( "purchase", "wallbuy", ::bot_wallbuy_purchase, ::bot_should_purchase_wallbuy, ::bot_wallbuy_purchase_on_completion, ::bot_wallbuy_purchase_should_cancel, ::bot_wallbuy_purchase_on_cancel, ::bot_wallbuy_purchase_should_postpone, ::bot_wallbuy_purchase_on_postpone, ::bot_wallbuy_purchase_priority ); - register_bot_action( "purchase", "wallbuyammo", ::bot_wallbuy_ammo_purchase, ::bot_should_purchase_wallbuy_ammo, ::bot_wallbuy_ammo_purchase_on_completion, ::bot_wallbuy_ammo_purchase_should_cancel, ::bot_wallbuy_ammo_purchase_on_cancel, ::bot_wallbuy_ammo_purchase_should_postpone, ::bot_wallbuy_ammo_purchase_on_postpone, ::bot_wallbuy_ammo_purchase_priority ); - register_bot_action( "purchase", "perk", ::bot_perk_purchase, ::bot_should_purchase_perk, ::bot_perk_purchase_on_completion, ::bot_perk_purchase_should_cancel, ::bot_perk_purchase_on_cancel, ::bot_perk_purchase_should_postpone, ::bot_perk_purchase_on_postpone, ::bot_perk_purchase_priority ); - register_bot_action( "purchase", "door", ::bot_door_purchase, ::bot_should_purchase_door, ::bot_door_purchase_on_completion, ::bot_door_purchase_should_cancel, ::bot_door_purchase_on_cancel, ::bot_door_purchase_should_postpone, ::bot_door_purchase_on_postpone, ::bot_door_purchase_priority ); - register_bot_action( "purchase", "debris", ::bot_debris_purchase, ::bot_should_purchase_debris, ::bot_debris_purchase_on_completion, ::bot_debris_purchase_should_cancel, ::bot_debris_purchase_on_cancel, ::bot_debris_purchase_should_postpone, ::bot_debris_purchase_on_postpone, ::bot_debris_purchase_priority ); - register_bot_action( "purchase", "trap", ::bot_trap_purchase, ::bot_should_purchase_trap, ::bot_trap_purchase_on_completion, ::bot_trap_purchase_should_cancel, ::bot_trap_purchase_on_cancel, ::bot_trap_purchase_should_postpone, ::bot_trap_purchase_on_postpone, ::bot_trap_purchase_priority ); - register_bot_action( "purchase", "packapunch", ::bot_packapunch_purchase, ::bot_should_packapunch ); - register_bot_action( "usetriggerhold", "revive", ::bot_revive_player, ::bot_should_revive_player, ::bot_revive_player_on_completion, ::bot_revive_player_should_cancel, ::bot_revive_player_on_cancel, ::bot_revive_player_should_postpone, ::bot_revive_player_on_postpone, ::bot_revive_player_priority ); - register_bot_action( "usetrigger", "grabbuildable", ::bot_grab_buildable, ::bot_should_grab_buildable, ::bot_grab_buildable_on_completion, ::bot_grab_buildable_should_cancel, ::bot_grabbuild_buildable_on_cancel, ::bot_grab_buildable_should_postpone, ::bot_grab_buildable_on_postpone, ::bot_grab_buildable_priority ); - register_bot_action( "usetriggerhold", "buildbuildable", ::bot_build_buildable, ::bot_should_build_buildable, ::bot_build_buildable_on_completion, ::bot_build_buildable_should_cancel, ::bot_build_buildable_on_cancel, ::bot_build_buildable_should_postpone, ::bot_build_buildable_on_postpone, ::bot_build_buildable_priority ); - register_bot_action( "usetrigger", "part", ::bot_grab_part, ::bot_should_grab_part, ::bot_part_on_completion, ::bot_part_should_cancel, ::bot_part_on_cancel, ::bot_part_should_postpone, ::bot_part_on_postpone, ::bot_part_priority ); - register_bot_action( "touchtrigger", "powerup", ::bot_grab_powerup, ::bot_should_grab_powerup, ::bot_powerup_on_completion, ::bot_powerup_should_cancel, ::bot_powerup_on_cancel, ::bot_powerup_should_postpone, ::bot_powerup_on_postpone, ::bot_powerup_priority ); - //register_bot_action( level.bot_action_type_shoot, "shoot", ::bot_shoot, ::bot_should_shoot ); - //register_bot_action( level.bot_action_type_ads, "ads", ::bot_ads, ::bot_should_ads ); - //register_bot_action( level.bot_action_type_grenade, "grenade", ::bot_grenade, ::bot_should_grenade ); + //Combat thread actions + //These all need definitions + register_bot_action( "combat", "aimatsinglenormalzombie", ::bot_aimatsinglenormalzombie, ::bot_aimatsinglenormalzombie_action_order ::bot_should_aimatsinglenormalzombie, ::bot_aimatsinglenormalzombie_on_completion, ::bot_aimatsinglenormalzombie_should_cancel, ::bot_aimatsinglenormalzombie_on_cancel, ::bot_aimatsinglenormalzombie_should_postpone, ::bot_aimatsinglenormalzombie_on_postpone, ::bot_aimatsinglenormalzombie_priority ); + register_bot_action( "combat", "shootsinglenormalzombie", ::bot_shootsinglenormalzombie, ::bot_shootsinglenormalzombie_action_order ::bot_should_shootsinglenormalzombie, ::bot_shootsinglenormalzombie_on_completion, ::bot_shootsinglenormalzombie_should_cancel, ::bot_shootsinglenormalzombie_on_cancel, ::bot_shootsinglenormalzombie_should_postpone, ::bot_shootsinglenormalzombie_on_postpone, ::bot_shootsinglenormalzombie_priority ); + register_bot_action( "combat", "aimatmultiplenormalzombies", ::bot_aimatmultiplenormalzombies, ::bot_aimatmultiplenormalzombies_action_order ::bot_should_aimatmultiplenormalzombies, ::bot_aimatmultiplenormalzombies_on_completion, ::bot_aimatmultiplenormalzombies_should_cancel, ::bot_aimatmultiplenormalzombies_on_cancel, ::bot_aimatmultiplenormalzombies_should_postpone, ::bot_aimatmultiplenormalzombies_on_postpone, ::bot_aimatmultiplenormalzombies_priority ); + register_bot_action( "combat", "shootmultiplenormalzombies", ::bot_shootmultiplenormalzombies, ::bot_shootmultiplenormalzombies_action_order ::bot_should_shootmultiplenormalzombies, ::bot_shootmultiplenormalzombie_on_completion, ::bot_shootmultiplenormalzombie_should_cancel, ::bot_shootmultiplenormalzombie_on_cancel, ::bot_shootmultiplenormalzombie_should_postpone, ::bot_shootmultiplenormalzombie_on_postpone, ::bot_shootmultiplenormalzombie_priority ); + register_bot_action( "combat", "meleesinglenormalzombie", ::bot_meleesinglenormalzombie, ::bot_meleesinglenormalzombie_action_order ::bot_should_meleesinglenormalzombie, ::bot_meleesinglenormalzombie_on_completion, ::bot_meleesinglenormalzombie_should_cancel, ::bot_meleesinglenormalzombie_on_cancel, ::bot_meleesinglenormalzombie_should_postpone, ::bot_meleesinglenormalzombie_on_postpone, ::bot_meleesinglenormalzombie_priority ); + register_bot_action( "combat", "shootsingledogzombie", ::bot_shootsingledogzombie, ::bot_shootsingledogzombie_action_order ::bot_should_shootsingledogzombie, ::bot_shootsingledogzombie_on_completion, ::bot_shootsingledogzombie_should_cancel, ::bot_shootsingledogzombie_on_cancel, ::bot_shootsingledogzombie_should_postpone, ::bot_shootsingledogzombie_on_postpone, ::bot_shootsingledogzombie_priority ); + register_bot_action( "combat", "shootmultipledogzombies", ::bot_shootmultipledogzombies, ::bot_shootmultipledogzombies_action_order ::bot_should_shootmultipledogzombies, ::bot_shootmultipledogzombies_on_completion, ::bot_shootmultipledogzombies_should_cancel, ::bot_shootmultipledogzombies_on_cancel, ::bot_shootmultipledogzombies_should_postpone, ::bot_shootmultipledogzombies_on_postpone, ::bot_shootmultipledogzombies_priority ); + register_bot_action( "combat", "meleesingledogzombie", ::bot_meleesingledogzombie, ::bot_meleesingledogzombie_action_order ::bot_should_meleesingledogzombie, ::bot_meleesingledogzombie_on_completion, ::bot_meleesingledogzombie_should_cancel, ::bot_meleesingledogzombie_on_cancel, ::bot_meleesingledogzombie_should_postpone, ::bot_meleesingledogzombie_on_postpone, ::bot_meleesingledogzombie_priority ); + + //Movement thread actions + //These all need definitions + register_bot_action( "movement", "movetoobjective", ::bot_movetoobjective, ::bot_movetoobjective_action_order ::bot_should_movetoobjective, ::bot_movetoobjective_on_completion, ::bot_movetoobjective_should_cancel, ::bot_movetoobjective_on_cancel, ::bot_movetoobjective_should_postpone, ::bot_movetoobjective_on_postpone, ::bot_movetoobjective_priority ); + register_bot_action( "movement", "train", ::bot_train, ::bot_train_action_order ::bot_should_train, ::bot_train_on_completion, ::bot_train_should_cancel, ::bot_train_on_cancel, ::bot_train_should_postpone, ::bot_train_on_postpone, ::bot_train_priority ); + register_bot_action( "movement", "camp", ::bot_camp, ::bot_camp_action_order ::bot_should_camp, ::bot_camp_on_completion, ::bot_camp_should_cancel, ::bot_camp_on_cancel, ::bot_camp_should_postpone, ::bot_camp_on_postpone, ::bot_camp_priority ); + register_bot_action( "movement", "flee", ::bot_flee, ::bot_flee_action_order ::bot_should_flee, ::bot_flee_on_completion, ::bot_flee_should_cancel, ::bot_flee_on_cancel, ::bot_flee_should_postpone, ::bot_flee_on_postpone, ::bot_flee_priority ); level.bot_weapon_quality_poor = 0; level.bot_weapon_quality_fair = 1; @@ -172,10 +185,6 @@ bot_think() wait 1; continue; } - if ( self.action_queue.size > 4 ) - { - continue; - } /* action_keys = getArrayKeys( level.zbots_actions ); for ( i = 0; i < action_keys.size; i++ ) @@ -195,7 +204,7 @@ bot_think() } */ action_keys = getArrayKeys( level.zbots_actions ); - for ( i = 0; i < action_keys.size && self.action_queue.size < 3; i++ ) + for ( i = 0; i < action_keys.size; i++ ) { if ( !self.actions_in_queue[ action_keys[ i ] ].queued && [[ level.zbots_actions[ action_keys[ i ] ].should_do_func ]]() ) { diff --git a/scripts/sp/bots/bot_actions.gsc b/scripts/sp/bots/bot_actions.gsc index 7b1f259..43c8587 100644 --- a/scripts/sp/bots/bot_actions.gsc +++ b/scripts/sp/bots/bot_actions.gsc @@ -6,7 +6,7 @@ #include maps\mp\zombies\_zm_utility; #include scripts\zm\bots\bot_utility; -register_bot_action( group, action_name, action_func, should_do_func, action_completion_func, should_cancel_func, on_cancel_func, should_postpone_func, on_postpone_func, priority_func ) +register_bot_action( group, action_name, action_func, should_do_func, action_process_order_func, action_completion_func, should_cancel_func, on_cancel_func, should_postpone_func, on_postpone_func, priority_func ) { if ( !isDefined( level.zbots_actions ) ) { @@ -20,6 +20,7 @@ register_bot_action( group, action_name, action_func, should_do_func, action_com level.zbots_actions[ action_name ].group = group; level.zbots_actions[ action_name ].action = action_func; level.zbots_actions[ action_name ].should_do_func = should_do_func; + level.zbots_actions[ action_name ].action_process_order_func = action_process_order_func; level.zbots_actions[ action_name ].on_completion_func = action_completion_func; level.zbots_actions[ action_name ].should_cancel_func = should_cancel_func; level.zbots_actions[ action_name ].on_cancel_func = on_cancel_func; @@ -28,17 +29,6 @@ register_bot_action( group, action_name, action_func, should_do_func, action_com level.zbots_actions[ action_name ].priority_func = priority_func; } -register_bot_powerup_priority( powerup, priority_normal, priority_emergency ) -{ - if ( !isDefined( level.zbots_powerup_priorities ) ) - { - level.zbots_powerup_priorities = []; - } - level.zbots_powerup_priorities[ powerup ] = spawnStruct(); - level.zbots_powerup_priorities[ powerup ].normal = priority_normal; - level.zbots_powerup_priorities[ powerup ].emergency = priority_emergency; -} - register_bot_action_queue_action( action_name ) { if ( !isDefined( self.actions_in_queue ) ) @@ -56,13 +46,18 @@ bot_magicbox_purchase() self.target_pos = self.available_chests[ 0 ].origin; } +bot_magicbox_action_order() +{ + +} + bot_should_purchase_magicbox() { - if ( level.chests.size <= 0 ) + if ( !level.enable_magic ) { return false; } - if ( !level.enable_magic ) + if ( level.chests.size <= 0 ) { return false; } @@ -142,6 +137,11 @@ bot_wallbuy_purchase() } +bot_wallbuy_action_order() +{ + return 0; +} + bot_should_purchase_wallbuy() { return false; @@ -182,6 +182,11 @@ bot_wallbuy_ammo_purchase() } +bot_wallbuyammo_action_order() +{ + return 0; +} + bot_should_purchase_wallbuy_ammo() { return false; @@ -222,6 +227,11 @@ bot_perk_purchase() } +bot_perk_action_order() +{ + return 0; +} + bot_should_purchase_perk() { return false; @@ -262,6 +272,11 @@ bot_door_purchase() } +bot_door_action_order() +{ + return 0; +} + bot_should_purchase_door() { return false; @@ -302,6 +317,11 @@ bot_debris_purchase() } +bot_debris_action_order() +{ + return 0; +} + bot_should_purchase_debris() { return false; @@ -342,6 +362,11 @@ bot_trap_purchase() } +bot_trap_action_order() +{ + return 0; +} + bot_should_purchase_trap() { return false; @@ -377,11 +402,61 @@ bot_trap_purchase_priority() return 0; } +bot_packapunch_purchase() +{ + +} + +bot_packapunch_action_order() +{ + return 0; +} + +bot_should_purchase_packapunch() +{ + return false; +} + +bot_packapunch_purchase_on_completion() +{ + +} + +bot_packapunch_purchase_should_cancel() +{ + return false; +} + +bot_packapunch_purchase_on_cancel() +{ + +} + +bot_packapunch_purchase_should_postpone() +{ + return false; +} + +bot_packapunch_purchase_on_postpone() +{ + +} + +bot_packapunch_purchase_priority() +{ + return 0; +} + bot_revive_player() { } +bot_revive_action_order() +{ + return 0; +} + bot_should_revive_player() { return false; @@ -422,6 +497,11 @@ bot_grab_buildable() } +bot_grabbuildable_action_order() +{ + return 0; +} + bot_should_grab_buildable() { return false; @@ -462,6 +542,11 @@ bot_build_buildable() } +bot_buildbuildable_action_order() +{ + return 0; +} + bot_should_build_buildable() { return false; @@ -502,6 +587,11 @@ bot_grab_part() } +bot_part_action_order() +{ + return 0; +} + bot_should_grab_part() { return false; @@ -550,6 +640,11 @@ bot_grab_powerup() level.zbots_powerups_targeted_for_grab[ level.zbots_powerups_targeted_for_grab.size ] = self.available_powerups[ 0 ]; } +bot_powerup_action_order() +{ + return 0; +} + bot_should_grab_powerup() { if ( !( isDefined( level.zbots_powerups ) && level.zbots_powerups.size > 0 ) )