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.

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

Max_volume for terrain and furniture can be defined with strings #35823

Merged
merged 5 commits into from
Dec 3, 2019

Conversation

Fris0uman
Copy link
Contributor

Summary

SUMMARY: Infrastructure "Max_volume for terrain and furniture can be defined with strings"

Purpose of change

Max_volume for terrain and furniture can be defined with strings

Describe the solution

Replace optional() with assign()

Describe alternatives you've considered

Testing

Change bookcase max_volume to "10 L"
load game
No error
Bookcase can hold 10 L

Additional context

Didn't update the doc because it was already saying that using string works.

src/mapdata.h Outdated Show resolved Hide resolved
@I-am-Erk
Copy link
Member

I-am-Erk commented Dec 3, 2019

Could you explain the concept in the pr please?

@anothersimulacrum
Copy link
Member

Instead of max_volume being an integer in units of metric cups, it can be a string where you specify the units.
e.g. "250 L", "20 ml"

@I-am-Erk
Copy link
Member

I-am-Erk commented Dec 3, 2019

That comment was for a totally different pr, I have no idea how it wound up here

@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Dec 3, 2019
@ZhilkinSerg ZhilkinSerg merged commit d7fe8d7 into CleverRaven:master Dec 3, 2019
@Fris0uman Fris0uman deleted the furtinur_volume branch December 3, 2019 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants