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

More intuitive coloration in spell menu

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-18 17:38:29 -06:00
parent 0ef3ad81d9
commit c7ce84def2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/boe.party.cpp
View File

@@ -99,6 +99,9 @@ short spell_index[38] = {38,39,40,41,42,43,44,45,90,90,46,47,48,49,50,51,52,53,9
// Says which buttons hit which spells on second spell page, 90 means no button
bool can_choose_caster;
const sf::Color SELECTED_COLOUR = Colours::LIGHT_GREEN;
const sf::Color DISABLED_COLOUR = Colours::GREY;
// Dialog vars
short store_graphic_pc_num ;
short store_graphic_mode ;
@@ -1718,7 +1721,7 @@ static void put_pc_caster_buttons(cDialog& me) {
std::string n = boost::lexical_cast<std::string>(i + 1);
if(me["caster" + n].isVisible()) {
if(i == pc_casting)
me["pc" + n].setColour(Colours::RED);
me["pc" + n].setColour(SELECTED_COLOUR);
else me["pc" + n].setColour(me.getDefTextClr());
}
}
@@ -1728,8 +1731,8 @@ static void put_pc_target_buttons(cDialog& me, short& store_last_target_darkened
if(store_spell_target < 6) {
std::string n = boost::lexical_cast<std::string>(store_spell_target + 1);
me["hp" + n].setColour(Colours::RED);
me["sp" + n].setColour(Colours::RED);
me["hp" + n].setColour(SELECTED_COLOUR);
me["sp" + n].setColour(SELECTED_COLOUR);
}
if((store_last_target_darkened < 6) && (store_last_target_darkened != store_spell_target)) {
std::string n = boost::lexical_cast<std::string>(store_last_target_darkened + 1);
@@ -1752,12 +1755,16 @@ static void put_spell_led_buttons(cDialog& me, const eSkill store_situation,cons
eSpell spell = cSpell::fromNum(store_situation, spell_for_this_button);
if(store_spell == spell_for_this_button) {
led.setState(led_green);
// Text color:
led.setColour(SELECTED_COLOUR);
}
else if(pc_can_cast_spell(univ.party[pc_casting],spell)) {
led.setState(led_red);
led.setColour(me.getDefTextClr());
}
else {
led.setState(led_off);
led.setColour(DISABLED_COLOUR);
}
}
}

1
src/gfx/render_shapes.hpp
View File

@@ -48,6 +48,7 @@ void undo_clip(sf::RenderTarget& where);
namespace Colours {
const sf::Color WHITE = sf::Color::White;
const sf::Color BLACK = sf::Color::Black;
const sf::Color GREY { 0x80, 0x80, 0x80};
const sf::Color RED { 0xdd, 0x00, 0x00};
const sf::Color GREEN { 0x00, 0x88, 0x00};
const sf::Color BLUE { 0x00, 0x00, 0xdd};