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

Allow player to pick up frozen liquids #32763

Merged
merged 19 commits into from
Aug 16, 2019
Merged

Allow player to pick up frozen liquids #32763

Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5ba47ba
llow player to pick frozen liquids
EddiTheBambi Jul 30, 2019
c479e74
Hammering 1 requirement for picking up frozen liquids
EddiTheBambi Jul 31, 2019
3fafcb6
Fix astyle
EddiTheBambi Jul 31, 2019
64cf06c
astyle - .astylerc
EddiTheBambi Jul 31, 2019
e8a2e5c
Frozen liquid can be stored in containers, translatablity
EddiTheBambi Aug 1, 2019
57cea4d
Update src/pickup.cpp
EddiTheBambi Aug 1, 2019
682cfe6
Update src/pickup.cpp
EddiTheBambi Aug 1, 2019
00f001b
Frozen liquids: advanced inventory, smash tile, popup changes
EddiTheBambi Aug 2, 2019
06afb22
Merge from master
EddiTheBambi Aug 9, 2019
181d996
Prompt user on reload, function separation, string fixes
EddiTheBambi Aug 13, 2019
b32a2d9
Correct typo, clean up params, function comments, fix reload bug
EddiTheBambi Aug 13, 2019
a99deca
Update src/player.cpp
EddiTheBambi Aug 13, 2019
d1baf04
Update src/player.cpp
EddiTheBambi Aug 13, 2019
7453491
Update src/player.h
EddiTheBambi Aug 14, 2019
2a2100f
Update player.cpp
EddiTheBambi Aug 14, 2019
de7f89c
Merge with remote
EddiTheBambi Aug 14, 2019
17f8177
Update src/player.h
EddiTheBambi Aug 14, 2019
401e67e
Remove unused include of popup.h
EddiTheBambi Aug 14, 2019
399806c
Merge branch 'harvest_frozen_liquid' of https://github.com/EddiTheBam…
EddiTheBambi Aug 14, 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
30 changes: 28 additions & 2 deletions src/pickup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "output.h"
#include "panels.h"
#include "player.h"
#include "popup.h"
#include "string_formatter.h"
#include "string_input_popup.h"
#include "translations.h"
Expand Down Expand Up @@ -214,7 +215,32 @@ bool pick_one_up( item_location &loc, int quantity, bool &got_water, bool &offer
picked_up = true;
option = NUM_ANSWERS; //Skip the options part
} else if( newit.made_of_from_type( LIQUID ) ) {
got_water = true;
if( newit.has_flag( "FROZEN" ) ) {
if( u.has_quality( quality_id( "HAMMER" ), 1, 1 ) ) {
EddiTheBambi marked this conversation as resolved.
Show resolved Hide resolved
int units = newit.charges;
std::string action = query_popup()
.context( "YESNO" )
.message( _( "Do you want to gather %d %s?" ), units, newit.display_name() )
.option( "YES" )
.option( "NO" )
.cursor( 1 )
.query()
.action;
if( action == "YES" ) {
option = STASH;
}
} else {
query_popup()
.context( "YES" )
.message( "%s", "You don't have a Hammering 1 tool." )
EddiTheBambi marked this conversation as resolved.
Show resolved Hide resolved
.option( "CANCEL" )
.cursor( 0 )
.query();
got_water = true;
}
} else {
got_water = true;
}
} else if( !u.can_pickWeight( newit, false ) ) {
if( !autopickup ) {
const std::string &explain = string_format( _( "The %s is too heavy!" ),
Expand Down Expand Up @@ -336,7 +362,7 @@ bool Pickup::do_pickup( std::vector<item_location> &targets, std::vector<int> &q
}

if( got_water ) {
add_msg( m_info, _( "You can't pick up a liquid!" ) );
add_msg( m_info, _( "You can't pick up this liquid!" ) );
}
if( weight_is_okay && g->u.weight_carried() > g->u.weight_capacity() ) {
add_msg( m_bad, _( "You're overburdened!" ) );
Expand Down