From fc66d221d4fd3fca756bd2636c29246cff46d132 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Tue, 11 Mar 2025 15:33:14 -0400 Subject: [PATCH] Now have the ability to do partial solutions that will create potential paths to the goal, and a test that runs the scripts from plans in different scenarios. Also, this ai_debug thing needs some work. --- Makefile | 2 +- ai.cpp | 108 +++++++++++++++++++++++++++++-------------------- ai.hpp | 11 ++++- ai_debug.cpp | 56 +++++++++++++++++++++++++ ai_debug.hpp | 9 +++++ assets/ai.json | 86 +++++++++++++++++++-------------------- goap.cpp | 15 +++---- goap.hpp | 10 ++++- main.cpp | 2 + meson.build | 1 + tests/ai.cpp | 55 ++++++++++++++++++++++--- 11 files changed, 250 insertions(+), 105 deletions(-) create mode 100644 ai_debug.cpp create mode 100644 ai_debug.hpp diff --git a/Makefile b/Makefile index 3f4335b..4d629dc 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ clean: meson compile --clean -C builddir debug_test: build - gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe -e "[goap]" + gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe -e "[ai]" win_installer: powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" win_installer.ifp' diff --git a/ai.cpp b/ai.cpp index d17f8ca..14f292e 100644 --- a/ai.cpp +++ b/ai.cpp @@ -15,12 +15,10 @@ namespace ai { } } - Action config_action(nlohmann::json& profile, nlohmann::json& config) { + Action config_action(AIProfile& profile, nlohmann::json& config) { check(config.contains("name"), "config_action: action config missing name"); check(config.contains("cost"), "config_action: action config missing cost"); - validate_profile(profile); - Action result(config["name"], config["cost"]); check(config.contains("needs"), @@ -30,72 +28,84 @@ namespace ai { for(auto& [name_key, value] : config["needs"].items()) { check(profile.contains(name_key), fmt::format("config_action: profile does not have name {}", result.$name, name_key)); - int name = profile[name_key].template get(); - - result.needs(name, bool(value)); + result.needs(profile.at(name_key), bool(value)); } for(auto& [name_key, value] : config["effects"].items()) { check(profile.contains(name_key), fmt::format("config_action: profile does not have name {}", result.$name, name_key)); - int name = profile[name_key].template get(); - - result.effect(name, bool(value)); + result.effect(profile.at(name_key), bool(value)); } return result; } - State config_state(nlohmann::json& profile, nlohmann::json& config) { + State config_state(AIProfile& profile, nlohmann::json& config) { State result; - validate_profile(profile); for(auto& [name_key, value] : config.items()) { check(profile.contains(name_key), fmt::format("config_state: profile does not have name {}", name_key)); - int name = profile[name_key].template get(); - result[name] = bool(value); + int name_id = profile.at(name_key); + result[name_id] = bool(value); } return result; } + /* + * This is only used in tests so I can load different fixtures. + */ + void reset() { + initialized = false; + AIMGR.actions.clear(); + AIMGR.states.clear(); + AIMGR.scripts.clear(); + AIMGR.profile = R"({})"_json; + } + void init(std::string config_path) { - initialized = true; - Config config(config_path); - - // profile specifies what keys (bitset indexes) are allowed - // and how they map to the bitset of State - AIMGR.profile = config["profile"]; - validate_profile(AIMGR.profile); - - // load all actions - auto& actions = config["actions"]; - for(auto& action_vars : actions) { - auto the_action = config_action(AIMGR.profile, action_vars); - AIMGR.actions.insert_or_assign(the_action.$name, the_action); - } + if(!initialized) { + Config config(config_path); - // load all states - auto& states = config["states"]; - for(auto& [name, state_vars] : states.items()) { - auto the_state = config_state(AIMGR.profile, state_vars); - AIMGR.states.insert_or_assign(name, the_state); - } + // profile specifies what keys (bitset indexes) are allowed + // and how they map to the bitset of State + validate_profile(config["profile"]); - auto& scripts = config["scripts"]; - for(auto& [script_name, action_names] : scripts.items()) { - std::vector the_script; - for(auto name : action_names) { + // relies on json conversion? + AIMGR.profile = config["profile"]; - check(AIMGR.actions.contains(name), - fmt::format("ai::init(): script {} uses action {} that doesn't exist", - (std::string)script_name, (std::string)name)); + // load all actions + auto& actions = config["actions"]; + for(auto& action_vars : actions) { + auto the_action = config_action(AIMGR.profile, action_vars); + AIMGR.actions.insert_or_assign(the_action.$name, the_action); + } - the_script.push_back(AIMGR.actions.at(name)); + // load all states + auto& states = config["states"]; + for(auto& [name, state_vars] : states.items()) { + auto the_state = config_state(AIMGR.profile, state_vars); + AIMGR.states.insert_or_assign(name, the_state); } - AIMGR.scripts.insert_or_assign(script_name, the_script); + auto& scripts = config["scripts"]; + for(auto& [script_name, action_names] : scripts.items()) { + std::vector the_script; + for(auto name : action_names) { + + check(AIMGR.actions.contains(name), + fmt::format("ai::init(): script {} uses action {} that doesn't exist", + (std::string)script_name, (std::string)name)); + + the_script.push_back(AIMGR.actions.at(name)); + } + + AIMGR.scripts.insert_or_assign(script_name, the_script); + } + initialized = true; + } else { + dbc::sentinel("DOUBLE INIT: AI manager should only be intialized once if not in tests."); } } @@ -122,7 +132,7 @@ namespace ai { return AIMGR.scripts.at(script_name); } - std::optional