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

[WIP][CR] Adding vitamins and toxin levels monitor functions to Blood Analyser CBM #37582

Closed
wants to merge 14 commits into from
Closed

[WIP][CR] Adding vitamins and toxin levels monitor functions to Blood Analyser CBM #37582

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0294a6d
Update bionics.cpp
eilaattwood Jan 31, 2020
0b674d2
Rework display feature to check for flags instead of list
eilaattwood Feb 3, 2020
5968490
astyle
eilaattwood Feb 3, 2020
7c8c3bc
Added placeholder for vitamin::get_string_level function
eilaattwood Feb 3, 2020
47346bd
Added print functions for all vitamin types
eilaattwood Feb 3, 2020
f8430a5
Initial implementation of vitamin::get_string_level
eilaattwood Feb 7, 2020
d2979b8
Update vitamin.cpp
eilaattwood Feb 7, 2020
4f349e2
Update vitamin.cpp
eilaattwood Feb 7, 2020
eb04686
Update src/bionics.cpp
eilaattwood Feb 7, 2020
ddce6be
Update src/bionics.cpp
eilaattwood Feb 7, 2020
469b274
Update src/bionics.cpp
eilaattwood Feb 7, 2020
0e78ebc
Added check for zero value.
eilaattwood Feb 7, 2020
1fe66e6
Update src/bionics.cpp
eilaattwood Feb 7, 2020
5dfeab4
Fixed typo
eilaattwood Feb 7, 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
20 changes: 18 additions & 2 deletions src/bionics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "ui.h"
#include "vehicle.h"
#include "vpart_position.h"
#include "vitamin.h"
#include "weather.h"
#include "weather_gen.h"
#include "calendar.h"
Expand Down Expand Up @@ -412,7 +413,8 @@ bool Character::activate_bionic( int b, bool eff_only )

std::vector<std::string> good;
std::vector<std::string> bad;

std::vector<std::string> vit;
;
eilaattwood marked this conversation as resolved.
Show resolved Hide resolved
if( get_rad() > 0 ) {
bad.push_back( _( "Irradiated" ) );
}
Expand All @@ -430,7 +432,16 @@ bool Character::activate_bionic( int b, bool eff_only )
}
}

const size_t win_h = std::min( static_cast<size_t>( TERMY ), bad.size() + good.size() + 2 );
const auto &vit_all = vitamin::all();
eilaattwood marked this conversation as resolved.
Show resolved Hide resolved
static const std::set<vitamin_id> trackable_vits = {vitamin_id( "iron" ), vitamin_id( "calcium" ), vitamin_id( "vitA" ), vitamin_id( "vitB" ), vitamin_id( "vitC" ), vitamin_id( "mutant_toxin" )};
eilaattwood marked this conversation as resolved.
Show resolved Hide resolved
for( const auto &v : vit_all ) {
if( trackable_vits.count( v.first ) ) {
vit.push_back( v.second.name() + _( " level is " ) + to_string( vitamin_get( v.first ) ) );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just printing the raw integer value here isn't helpful, because nobody knows what that means.
I'd suggest adding a vitamin::get_string_level() or something of the sort that gives you a string based on how much of the vitamin you have, and how close you are to each stage of either excess/deficiency.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeap, that's why I asked for a comment how it should be finally represented. And what those numbers are really mean in reality.

}
}

const size_t win_h = std::min( static_cast<size_t>( TERMY ),
bad.size() + good.size() + vit.size() + 2 );
const int win_w = 46;
catacurses::window w = catacurses::newwin( win_h, win_w, point( ( TERMX - win_w ) / 2,
( TERMY - win_h ) / 2 ) );
Expand All @@ -447,6 +458,11 @@ bool Character::activate_bionic( int b, bool eff_only )
}
}
}
for( size_t line = good.size() + bad.size() + 1; line < ( win_h - 1 ) &&
line <= good.size() + bad.size() + vit.size(); ++line ) {
trim_and_print( w, point( 2, line ), win_w - 3, c_yellow,
vit[line - 1 - bad.size() - good.size()] );
}
wrefresh( w );
catacurses::refresh();
inp_mngr.wait_for_any_key();
Expand Down