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

Monster/pet carry weight changed to 1/5th of body weight #35807

Merged
merged 2 commits into from
Dec 2, 2019
Merged

Monster/pet carry weight changed to 1/5th of body weight #35807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da292e4
Make monster carry weight 1/5th of body weight
Davi-DeGanne Dec 1, 2019
499e228
Use existing member variable instead of literal
Davi-DeGanne Dec 1, 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
5 changes: 5 additions & 0 deletions src/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,6 +2547,11 @@ units::mass monster::get_weight() const
return units::operator*( type->weight, get_size() / type->size );
}

units::mass monster::weight_capacity() const
{
return type->weight / 5;
}

units::volume monster::get_volume() const
{
return units::operator*( type->volume, get_size() / type->size );
Expand Down
1 change: 1 addition & 0 deletions src/monster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class monster : public Creature
void spawn( const tripoint &p );
m_size get_size() const override;
units::mass get_weight() const override;
units::mass weight_capacity() const override;
units::volume get_volume() const;
int get_hp( hp_part ) const override;
int get_hp() const override;
Expand Down