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

Big monsters check all special terrains for moveability

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-19 18:01:22 -05:00
parent 0363f960b6
commit 0e164e8b23
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -894,8 +894,7 @@ extern std::set<eDirection> no_move_from_west;
extern std::set<eDirection> no_move_from_south; extern std::set<eDirection> no_move_from_south;
extern std::set<eDirection> no_move_from_east; extern std::set<eDirection> no_move_from_east;
//mode; // 1 - town 2 - combat static bool monst_check_one_special_terrain(location where_check,short mode,short which_monst) {
bool monst_check_special_terrain(location where_check,short mode,short which_monst) {
ter_num_t ter = 0; ter_num_t ter = 0;
short r1,guts = 0; short r1,guts = 0;
bool can_enter = true,mage = false; bool can_enter = true,mage = false;
@@ -966,6 +965,7 @@ bool monst_check_special_terrain(location where_check,short mode,short which_mon
} }
if(univ.town.is_fire_barr(where_check.x,where_check.y)) { if(univ.town.is_fire_barr(where_check.x,where_check.y)) {
if(!which_m->is_friendly() && get_ran(1,1,100) < which_m->mu * 10 + which_m->cl * 4) { if(!which_m->is_friendly() && get_ran(1,1,100) < which_m->mu * 10 + which_m->cl * 4) {
// Monster breaks the barrier
// TODO: Are these barrier sounds right? // TODO: Are these barrier sounds right?
play_sound(60); play_sound(60);
which_m->spell_note(49); which_m->spell_note(49);
@@ -981,6 +981,7 @@ bool monst_check_special_terrain(location where_check,short mode,short which_mon
if(univ.town.is_force_barr(where_check.x,where_check.y)) { /// Not in big towns if(univ.town.is_force_barr(where_check.x,where_check.y)) { /// Not in big towns
if(!which_m->is_friendly() && get_ran(1,1,100) < which_m->mu * 10 + which_m->cl * 4 if(!which_m->is_friendly() && get_ran(1,1,100) < which_m->mu * 10 + which_m->cl * 4
&& (!univ.town->strong_barriers)) { && (!univ.town->strong_barriers)) {
// Monster breaks the barrier
play_sound(60); play_sound(60);
which_m->spell_note(49); which_m->spell_note(49);
univ.town.set_force_barr(where_check.x,where_check.y,false); univ.town.set_force_barr(where_check.x,where_check.y,false);
@@ -1077,6 +1078,17 @@ bool monst_check_special_terrain(location where_check,short mode,short which_mon
return can_enter; return can_enter;
} }
//mode; // 1 - town 2 - combat
bool monst_check_special_terrain(location where_check,short mode,short which_monst) {
cCreature* which_m = &univ.town.monst[which_monst];
for(int x = where_check.x; x < where_check.x + which_m->x_width; ++x){
for(int y = where_check.y; y < where_check.y + which_m->y_width; ++y){
if(!monst_check_one_special_terrain({x, y}, mode, which_monst)) return false;
}
}
return true;
}
void record_monst(cCreature* which_m, bool forced) { void record_monst(cCreature* which_m, bool forced) {
short r1; short r1;