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

Added more descriptions to martial arts help menu #34258

Merged
merged 2 commits into from
Sep 27, 2019
Merged

Added more descriptions to martial arts help menu #34258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d47de01
Added more descriptions to martial arts help menu
Hymore246 Sep 26, 2019
980c4d8
Astyle
ZhilkinSerg Sep 27, 2019
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
18 changes: 17 additions & 1 deletion src/martialarts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,17 @@ std::string ma_requirements::get_description( bool buff ) const
if( unarmed_allowed && melee_allowed ) {
dump << string_format( _( "* Can %s while <info>armed</info> or <info>unarmed</info>" ),
type ) << std::endl;
if( unarmed_weapons_allowed ) {
dump << string_format( _( "* Can %s while using <info>any unarmed weapon</info>" ),
type ) << std::endl;
}
} else if( unarmed_allowed ) {
dump << string_format( _( "* Can <info>only</info> %s while <info>unarmed</info>" ),
type ) << std::endl;
if( unarmed_weapons_allowed ) {
dump << string_format( _( "* Can %s while using <info>any unarmed weapon</info>" ),
type ) << std::endl;
}
} else if( melee_allowed ) {
dump << string_format( _( "* Can <info>only</info> %s while <info>armed</info>" ),
type ) << std::endl;
Expand Down Expand Up @@ -1304,9 +1312,17 @@ bool ma_style_callback::key( const input_context &ctxt, const input_event &event

if( ma.force_unarmed ) {
buffer << _( "<bold>This style forces you to use unarmed strikes, even if wielding a weapon.</bold>" );
buffer << "--" << std::endl;
buffer << std::endl;
} else if( ma.allow_melee ) {
buffer << _( "<bold>This style can be used with all weapons.</bold>" );
buffer << std::endl;
} else if( ma.strictly_melee ) {
buffer << _( "<bold>This is an armed combat style.</bold>" );
buffer << std::endl;
}

buffer << "--" << std::endl;

if( ma.arm_block_with_bio_armor_arms || ma.arm_block != 99 ||
ma.leg_block_with_bio_armor_legs || ma.leg_block != 99 ) {
if( ma.arm_block_with_bio_armor_arms ) {
Expand Down