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

creature palette tooltip show default attitude instead of always 'Monster:'

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-26 14:43:20 -05:00
parent d503dd6bd2
commit d47a95bf8d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scenedit/scen.graphics.cpp
View File

@@ -1365,6 +1365,8 @@ static void place_selected_terrain(ter_num_t ter, rectangle draw_rect) {
rect_draw_some_item(*ResMgr::graphics.get("edbuttons"),tiny_from,mainPtr(),tiny_to); rect_draw_some_item(*ResMgr::graphics.get("edbuttons"),tiny_from,mainPtr(),tiny_to);
} }
extern std::vector<std::string> attitude_disp_strs;
void place_location() { void place_location() {
std::ostringstream sout; std::ostringstream sout;
rectangle draw_rect,source_rect; rectangle draw_rect,source_rect;
@@ -1397,8 +1399,10 @@ void place_location() {
sout << "Item: " << scenario.scen_items[first + i].full_name; sout << "Item: " << scenario.scen_items[first + i].full_name;
break; break;
case DRAW_MONST: case DRAW_MONST:
if(first + i + 1 < scenario.scen_monsters.size()) if(first + i + 1 < scenario.scen_monsters.size()){
sout << "Monster: " << scenario.scen_monsters[first + i + 1].m_name; sout << "Creature: " << scenario.scen_monsters[first + i + 1].m_name;
sout << " (" << attitude_disp_strs[(int)scenario.scen_monsters[first + i + 1].default_attitude] << ")";
}
break; break;
} }
break; break;

4
src/scenedit/scen.keydlgs.cpp
View File

@@ -293,6 +293,8 @@ short choose_pattern(short cur_choice, cDialog* parent, bool expandRotatable) {
return cur_choice; return cur_choice;
} }
std::vector<std::string> attitude_disp_strs = {"Docile", "Hostile Type A", "Friendly", "Hostile Type B"};
// TODO: I have two functions that do this. (The other one is pick_picture.) // TODO: I have two functions that do this. (The other one is pick_picture.)
extern std::string scenario_temp_dir_name; extern std::string scenario_temp_dir_name;
pic_num_t choose_graphic(short cur_choice,ePicType g_type,cDialog* parent, bool static_only) { pic_num_t choose_graphic(short cur_choice,ePicType g_type,cDialog* parent, bool static_only) {
@@ -520,7 +522,7 @@ short choose_text(eStrType list, unsigned short cur_choice, cDialog* parent, std
strings = {"Current PC Only", "Cumulative", "Average", "Minimum", "Maximum"}; strings = {"Current PC Only", "Cumulative", "Average", "Minimum", "Maximum"};
break; break;
case STRT_ATTITUDE: case STRT_ATTITUDE:
strings = {"Docile", "Hostile Type A", "Friendly", "Hostile Type B"}; strings = attitude_disp_strs;
break; break;
case STRT_STAIR: case STRT_STAIR:
strings = {"Stairs Up", "Stairs Down", "Slope Up", "Slope Down", "Slimy Stairs Up", "Slimy Stairs Down", "Dark Slope Up", "Dark Slope Down"}; strings = {"Stairs Up", "Stairs Down", "Slope Up", "Slope Down", "Slimy Stairs Up", "Slimy Stairs Down", "Dark Slope Up", "Dark Slope Down"};