games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Autowalker now correctly faces enemies to fight them.

Browse source
This commit is contained in:
Zed A. Shaw 2025-09-02 11:31:01 -04:00
parent 9faad5f263
commit 759f93cae0
3 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
autowalker.cpp
View file

@ -26,7 +26,6 @@ int number_left() {
return count;
}
template<typename Comp>
Pathing compute_paths() {
auto& level = GameDB::current_level();
@ -114,7 +113,6 @@ void Autowalker::path_fail(const std::string& msg, Matrix& bad_paths, Point pos)
bool Autowalker::path_player(Pathing& paths, Point& target_out) {
auto &level = GameDB::current_level();
auto found = paths.find_path(target_out, PATHING_TOWARD, false);
if(found == PathingResult::FAIL) {
@ -192,8 +190,6 @@ void Autowalker::handle_player_walk(ai::State& start, ai::State& goal) {
auto paths = path_to_enemies();
process_move(paths);
face_enemy();
} else if(action.name == "face_enemy") {
face_enemy();
} else if(action.name == "kill_enemy") {
status(L"KILLING ENEMY");
@ -256,7 +252,6 @@ void Autowalker::open_map() {
}
}
void Autowalker::autowalk() {
handle_window_events();
if(!fsm.autowalking) {
@ -286,16 +281,16 @@ void Autowalker::autowalk() {
void Autowalker::process_move(Pathing& paths) {
auto world = GameDB::current_world();
// target has to start at the player location then...
auto target = GameDB::player_position().location;
auto target_out = GameDB::player_position().location;
// ... target gets modified as an out parameter to find the path
if(!path_player(paths, target)) {
if(!path_player(paths, target_out)) {
close_status();
log(L"No paths found, aborting autowalk.");
return;
}
if(rayview->aiming_at != target) rotate_player(target);
if(rayview->aiming_at != target_out) rotate_player(target_out);
send_event(gui::Event::MOVE_FORWARD);
@ -303,9 +298,19 @@ void Autowalker::process_move(Pathing& paths) {
}
bool Autowalker::found_enemy() {
auto world = GameDB::current_world();
auto aimed_at = camera_aim();
return aimed_at != DinkyECS::NONE && world->has<components::Combat>(aimed_at);
auto level = GameDB::current_level();
auto player = GameDB::player_position();
for(matrix::compass it{level.map->$walls, player.location.x, player.location.y}; it.next();) {
Point aim{it.x, it.y};
if(aim != player.aiming_at ||
!level.collision->occupied(player.aiming_at)) continue;
auto ent = level.collision->get(player.aiming_at);
if(level.world->has<components::Combat>(ent)) return true;
}
return false;
}
bool Autowalker::found_item() {
@ -347,12 +352,6 @@ bool Autowalker::face_enemy() {
auto [found, neighbors] = level.collision->neighbors(player_at.location, true);
if(found) {
fmt::println("FOUND ENEMIES:");
for(auto& ent : neighbors) {
auto enemy_pos = level.world->get<components::Position>(ent);
fmt::println("\t{}={},{}", ent, enemy_pos.location.x, enemy_pos.location.y);
}
auto enemy_pos = level.world->get<components::Position>(neighbors[0]);
if(rayview->aiming_at != enemy_pos.location) rotate_player(enemy_pos.location);
} else {