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

combat highlighting handle big monsters

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-05 07:13:33 -05:00
parent 65b503980d
commit df63388da5
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/boe.graphics.cpp
View File

@@ -4,6 +4,7 @@
#include <list> #include <list>
#include <unordered_map> #include <unordered_map>
#include <memory> #include <memory>
#include <set>
#include "boe.global.hpp" #include "boe.global.hpp"
@@ -1637,13 +1638,17 @@ void draw_targeting_line() {
|| ((overall_mode == MODE_TOWN_TARGET) && (current_pat[4][4] != 0)))) { || ((overall_mode == MODE_TOWN_TARGET) && (current_pat[4][4] != 0)))) {
// Highlight targetable squares including ally/enemy attitude // Highlight targetable squares including ally/enemy attitude
std::set<location, loc_compare> big_monst_there;
for(short q = 0; q < 9; q++) { for(short q = 0; q < 9; q++) {
for(short r = 0; r < 9; r++) { for(short r = 0; r < 9; r++) {
which_space = center; which_space = center;
which_space.x += q - 4; which_space.x += q - 4;
which_space.y += r - 4; which_space.y += r - 4;
if(big_monst_there.count(which_space)) continue;
sf::Color frame_color(0, 0, 0, 0); sf::Color frame_color(0, 0, 0, 0);
int x_width = 1;
int y_width = 1;
if((can_see_light(from_loc,which_space,sight_obscurity) < 5) if((can_see_light(from_loc,which_space,sight_obscurity) < 5)
&& (dist(from_loc,which_space) <= current_spell_range)){ && (dist(from_loc,which_space) <= current_spell_range)){
frame_color = sf::Color(255, 255, 255, 127); frame_color = sf::Color(255, 255, 255, 127);
@@ -1653,14 +1658,24 @@ void draw_targeting_line() {
frame_color = sf::Color(0, 255, 0, 127); frame_color = sf::Color(0, 255, 0, 127);
} }
targ = univ.target_there(which_space, TARG_MONST); targ = univ.target_there(which_space, TARG_MONST);
if(targ != nullptr && !(dynamic_cast<cMonster*>(targ))->invisible){ if(targ != nullptr){
frame_color = targ->is_friendly() ? sf::Color(0, 0, 255, 127) : sf::Color(255, 0, 0, 127); cMonster* monst = dynamic_cast<cMonster*>(targ);
if(!monst->invisible){
frame_color = targ->is_friendly() ? sf::Color(0, 0, 255, 127) : sf::Color(255, 0, 0, 127);
x_width = monst->x_width;
y_width = monst->y_width;
for(int i = 0; i < x_width; ++i){
for(int j = 0; j < y_width; ++j){
big_monst_there.insert(loc(which_space.x + i, which_space.y + j));
}
}
}
} }
target_rect.left = 13 + 28 * q + 19; target_rect.left = 13 + 28 * q + 19;
target_rect.right = target_rect.left + 28; target_rect.right = target_rect.left + 28 * x_width;
target_rect.top = 13 + 36 * r + 7; target_rect.top = 13 + 36 * r + 7;
target_rect.bottom = target_rect.top + 36; target_rect.bottom = target_rect.top + 36 * y_width;
frame_rect(mainPtr(), target_rect, frame_color); frame_rect(mainPtr(), target_rect, frame_color);
} }
} }

4
src/game/boe.graphutil.cpp
View File

@@ -205,9 +205,9 @@ void draw_monsters() {
// Frame the monster // Frame the monster
rectangle target_rect; rectangle target_rect;
target_rect.left = 13 + 28 * where_draw.x; target_rect.left = 13 + 28 * where_draw.x;
target_rect.right = target_rect.left + 28; target_rect.right = target_rect.left + 28 * monst.x_width;
target_rect.top = 13 + 36 * where_draw.y; target_rect.top = 13 + 36 * where_draw.y;
target_rect.bottom = target_rect.top + 36; target_rect.bottom = target_rect.top + 36 * monst.y_width;
frame_rect(terrain_screen_gworld(), target_rect, monst.is_friendly() ? sf::Color(0, 0, 255, 127) : sf::Color(255, 0, 0, 127)); frame_rect(terrain_screen_gworld(), target_rect, monst.is_friendly() ? sf::Color(0, 0, 255, 127) : sf::Color(255, 0, 0, 127));
} }
} }