openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

big monsters check whole footprint for safety. Fix #757

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-04 11:43:18 -05:00
committed by Celtic Minstrel
parent 360f381b49
commit edf33686f1
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/game/boe.monster.cpp
View File

@@ -341,7 +341,7 @@ bool monst_hate_spot(short which_m,location *good_loc) {
hate_spot = true; hate_spot = true;
} }
if(hate_spot) { if(hate_spot) {
prospect = find_clear_spot(loc,1); prospect = find_clear_spot(loc,1,univ.town.monst[which_m].x_width,univ.town.monst[which_m].y_width);
if(prospect.x > 0) { if(prospect.x > 0) {
*good_loc = prospect; *good_loc = prospect;
return true; return true;
@@ -708,10 +708,12 @@ bool try_move(short i,location start,short x,short y) {
} }
bool combat_move_monster(short which,location destination) { bool combat_move_monster(short which,location destination) {
if(!monst_can_be_there(destination,which)) if(!monst_can_be_there(destination,which)){
return false; return false;
else if(!monst_check_special_terrain(destination,2,which)) }
else if(!monst_check_special_terrain(destination,2,which)){
return false; return false;
}
else { else {
univ.town.monst[which].direction = set_direction(univ.town.monst[which].cur_loc, destination); univ.town.monst[which].direction = set_direction(univ.town.monst[which].cur_loc, destination);
univ.town.monst[which].cur_loc = destination; univ.town.monst[which].cur_loc = destination;
@@ -728,12 +730,26 @@ bool combat_move_monster(short which,location destination) {
// Looks at all spaces within 2, looking for a spot which is clear of nastiness and beings // Looks at all spaces within 2, looking for a spot which is clear of nastiness and beings
// returns {0,0} if none found // returns {0,0} if none found
// TODO: NO WAIT IT DOESN'T LOOK AT ALL SPACES!!! // TODO: NO WAIT IT DOESN'T LOOK AT ALL SPACES!!!
// TODO: THIS MAKES NO ADJUSTMENTS FOR BIG MONSTERS!!!
//mode; // 0 - normal 1 - prefer adjacent space //mode; // 0 - normal 1 - prefer adjacent space
location find_clear_spot(location from_where,short mode) { location find_clear_spot(location from_where,short mode,short x_width,short y_width) {
location loc,store_loc; location loc,store_loc;
short num_tries = 0,r1; short num_tries = 0,r1;
auto is_clear = [from_where](location loc) -> bool {
return !loc_off_act_area(loc) && !is_blocked(loc)
&& can_see_light(from_where,loc,combat_obscurity) == 0
&& (!is_combat() || univ.target_there(loc,TARG_PC) == nullptr)
&& (!(is_town()) || (loc != univ.party.town_loc))
&& (!univ.town.is_summon_safe(loc.x, loc.y));
};
auto all_is_clear = [from_where, x_width, y_width, is_clear](location loc) -> bool {
for(int x = 0; x < x_width; ++x){
for(int y = 0; y < y_width; ++y){
if(!is_clear({loc.x + x, loc.y + y}))
return false;
}
}
return true;
};
while(num_tries < 75) { while(num_tries < 75) {
num_tries++; num_tries++;
loc = from_where; loc = from_where;
@@ -741,11 +757,7 @@ location find_clear_spot(location from_where,short mode) {
loc.x = loc.x + r1; loc.x = loc.x + r1;
r1 = get_ran(1,-2,2); r1 = get_ran(1,-2,2);
loc.y = loc.y + r1; loc.y = loc.y + r1;
if(!loc_off_act_area(loc) && !is_blocked(loc) if(all_is_clear(loc)) {
&& can_see_light(from_where,loc,combat_obscurity) == 0
&& (!is_combat() || univ.target_there(loc,TARG_PC) == nullptr)
&& (!(is_town()) || (loc != univ.party.town_loc))
&& (!univ.town.is_summon_safe(loc.x, loc.y))) {
if((mode == 0) || ((mode == 1) && (adjacent(from_where,loc)))) if((mode == 0) || ((mode == 1) && (adjacent(from_where,loc))))
return loc; return loc;
else store_loc = loc; else store_loc = loc;

2
src/game/boe.monster.hpp
View File

@@ -24,7 +24,7 @@ bool seek_party(short i,location l1,location l2);
bool flee_party(short i,location l1,location l2); bool flee_party(short i,location l1,location l2);
bool try_move(short i,location start,short x,short y); bool try_move(short i,location start,short x,short y);
bool combat_move_monster(short which,location destination); bool combat_move_monster(short which,location destination);
location find_clear_spot(location from_where,short mode); location find_clear_spot(location from_where,short mode,short x_width = 1, short y_width = 1);
location random_shift(location start); location random_shift(location start);
bool outdoor_move_monster(short num,location dest); bool outdoor_move_monster(short num,location dest);
bool town_move_monster(short num,location dest); bool town_move_monster(short num,location dest);