From d47a95bf8d2f61fcd184e2b07a9928e194bb3632 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 26 May 2025 14:43:20 -0500 Subject: [PATCH] creature palette tooltip show default attitude instead of always 'Monster:' --- src/scenedit/scen.graphics.cpp | 8 ++++++-- src/scenedit/scen.keydlgs.cpp | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp index 92285fcb..6a02f339 100644 --- a/src/scenedit/scen.graphics.cpp +++ b/src/scenedit/scen.graphics.cpp @@ -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); } +extern std::vector attitude_disp_strs; + void place_location() { std::ostringstream sout; rectangle draw_rect,source_rect; @@ -1397,8 +1399,10 @@ void place_location() { sout << "Item: " << scenario.scen_items[first + i].full_name; break; case DRAW_MONST: - if(first + i + 1 < scenario.scen_monsters.size()) - sout << "Monster: " << scenario.scen_monsters[first + i + 1].m_name; + if(first + i + 1 < scenario.scen_monsters.size()){ + 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; diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp index 634787a0..524f0ec6 100644 --- a/src/scenedit/scen.keydlgs.cpp +++ b/src/scenedit/scen.keydlgs.cpp @@ -293,6 +293,8 @@ short choose_pattern(short cur_choice, cDialog* parent, bool expandRotatable) { return cur_choice; } +std::vector 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.) extern std::string scenario_temp_dir_name; 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"}; break; case STRT_ATTITUDE: - strings = {"Docile", "Hostile Type A", "Friendly", "Hostile Type B"}; + strings = attitude_disp_strs; break; case STRT_STAIR: strings = {"Stairs Up", "Stairs Down", "Slope Up", "Slope Down", "Slimy Stairs Up", "Slimy Stairs Down", "Dark Slope Up", "Dark Slope Down"};