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

Make item crafting options include recipes from nearby books #37661

Merged
merged 11 commits into from
Feb 9, 2020
Merged

Make item crafting options include recipes from nearby books #37661

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0fd2e7
Add item description when lacking crafting knowledge
wapcaplet Feb 3, 2020
f45a1e7
Refactor item 'you could craft' section
wapcaplet Feb 3, 2020
f2d36e9
Merge branch 'master' into you-dont-know-recipes
wapcaplet Feb 6, 2020
3228bad
WIP Attempt to use get_available_recipes
wapcaplet Feb 7, 2020
5617811
Fix crash, tweak message
wapcaplet Feb 7, 2020
793e3b5
WIP Add test for item recipes in description
wapcaplet Feb 7, 2020
780e969
Merge branch 'master' into you-dont-know-recipes
wapcaplet Feb 8, 2020
3ffc4f0
Use ternary expression instead of 6-liner
wapcaplet Feb 8, 2020
3561ef3
WIP Improve item recipe tests (still failing)
wapcaplet Feb 9, 2020
6fb8d13
Fix item recipe info test cases
wapcaplet Feb 9, 2020
39d32cf
Remove unused crowbar variable
wapcaplet Feb 9, 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
63 changes: 36 additions & 27 deletions src/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3295,39 +3295,48 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
}

// list recipes you could use it in
itype_id tid;
if( contents.empty() ) { // use this item
tid = typeId();
} else { // use the contained item
tid = contents.front().typeId();
}
const std::set<const recipe *> &known_recipes = g->u.get_learned_recipes().of_component( tid );
if( !known_recipes.empty() && parts->test( iteminfo_parts::DESCRIPTION_APPLICABLE_RECIPES ) ) {
const inventory &inv = g->u.crafting_inventory();
if( parts->test( iteminfo_parts::DESCRIPTION_APPLICABLE_RECIPES ) ) {
itype_id tid;
if( contents.empty() ) { // use this item
tid = typeId();
} else { // use the contained item
tid = contents.front().typeId();
}
wapcaplet marked this conversation as resolved.
Show resolved Hide resolved

if( known_recipes.size() > 24 ) {
insert_separation_line( info );
info.push_back( iteminfo( "DESCRIPTION",
_( "You know dozens of things you could craft with it." ) ) );
} else if( known_recipes.size() > 12 ) {
// FIXME: Somehow the following lines are causing a game crash whenever the crafting menu is opened
const inventory &crafting_inv = g->u.crafting_inventory();
const std::set<const recipe *> &item_recipes = g->u.get_available_recipes( crafting_inv,
nullptr ).of_component( tid );
wapcaplet marked this conversation as resolved.
Show resolved Hide resolved

if( item_recipes.empty() ) {
insert_separation_line( info );
info.push_back( iteminfo( "DESCRIPTION",
_( "You could use it to craft various other things." ) ) );
_( "You don't know anything you could craft with it." ) ) );
} else {
const std::string recipes = enumerate_as_string( known_recipes.begin(), known_recipes.end(),
[ &inv ]( const recipe * r ) {
if( r->deduped_requirements().can_make_with_inventory(
inv, r->get_component_filter() ) ) {
return r->result_name();
} else {
return string_format( "<dark>%s</dark>", r->result_name() );
}
} );
if( !recipes.empty() ) {
if( item_recipes.size() > 24 ) {
insert_separation_line( info );
info.push_back( iteminfo( "DESCRIPTION",
_( "You know dozens of things you could craft with it." ) ) );
} else if( item_recipes.size() > 12 ) {
insert_separation_line( info );
info.push_back( iteminfo( "DESCRIPTION",
string_format( _( "You could use it to craft: %s" ),
recipes ) ) );
_( "You could use it to craft various other things." ) ) );
} else {
const std::string recipes = enumerate_as_string( item_recipes.begin(), item_recipes.end(),
[ &crafting_inv ]( const recipe * r ) {
if( r->deduped_requirements().can_make_with_inventory(
crafting_inv, r->get_component_filter() ) ) {
return r->result_name();
} else {
return string_format( "<dark>%s</dark>", r->result_name() );
}
} );
if( !recipes.empty() ) {
insert_separation_line( info );
info.push_back( iteminfo( "DESCRIPTION",
string_format( _( "You could use it to craft: %s" ),
recipes ) ) );
}
}
}
}
Expand Down