Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ability to remove vehicle parts more obvious #40087

Merged
merged 3 commits into from
May 5, 2020
Merged

Make ability to remove vehicle parts more obvious #40087

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
655becc
Make ability to remove vehicle parts more obvious
procrustesmethod May 2, 2020
e1237ab
fix astyle issues
procrustesmethod May 3, 2020
fd4f208
Try to fix astyle again
procrustesmethod May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/veh_interact.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,20 +1755,23 @@ bool veh_interact::can_remove_part( int idx, const player &p )
if( !( use_aid || use_str ) ) {
ok = false;
}
nc_color aid_color = use_aid ? c_green : ( use_str ? c_dark_gray : c_red );
nc_color str_color = use_str ? c_green : ( use_aid ? c_dark_gray : c_red );
const auto helpers = g->u.get_crafting_helpers();
//~ %1$s is quality name, %2$d is quality level
std::string aid_string = string_format( _( "1 tool with %1$s %2$d" ),
qual.obj().name, lvl );

std::string str_string;
if( !helpers.empty() ) {
msg += string_format(
//~ %1$s represents the internal color name which shouldn't be translated, %2$s is the tool quality, %3$i is tool level, %4$s is the internal color name which shouldn't be translated and %5$i is the character's strength
_( "> %1$s1 tool with %2$s %3$i</color> <color_white>OR</color> %4$sstrength ( assisted ) %5$i</color>" ),
status_color( use_aid ), qual.obj().name, lvl,
status_color( use_str ), str ) + "\n";
str_string = string_format( _( "strength ( assisted ) %d" ), str );
} else {
msg += string_format(
//~ %1$s represents the internal color name which shouldn't be translated, %2$s is the tool quality, %3$i is tool level, %4$s is the internal color name which shouldn't be translated and %5$i is the character's strength
_( "> %1$s1 tool with %2$s %3$i</color> <color_white>OR</color> %4$sstrength %5$i</color>" ),
status_color( use_aid ), qual.obj().name, lvl,
status_color( use_str ), str ) + "\n";
str_string = string_format( _( "strength %d" ), str );
}

msg += string_format( _( "> %1$s <color_white>OR</color> %2$s" ),
colorize( aid_string, aid_color ),
colorize( str_string, str_color ) ) + "\n";
std::string reason;
if( !veh->can_unmount( idx, reason ) ) {
//~ %1$s represents the internal color name which shouldn't be translated, %2$s is pre-translated reason
Expand Down