-
Notifications
You must be signed in to change notification settings - Fork 272
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
feat: add paddy field and soil-to-clay constr #4197
Merged
Merged
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3399160
feat:a paddy field and soil-to-clay constr
NappingOcean 46c65c8
style(autofix.ci): automated formatting
autofix-ci[bot] c29bab1
Update data/json/furniture_and_terrain/terrain-floors-outdoors.json
NappingOcean 43f68a7
style(autofix.ci): automated formatting
autofix-ci[bot] 1d80946
Update data/json/furniture_and_terrain/terrain-floors-outdoors.json
NappingOcean 935e4ed
Update data/json/furniture_and_terrain/terrain-floors-outdoors.json
NappingOcean 88414c7
Update data/json/construction.json
NappingOcean 008ac5c
Update data/json/construction.json
NappingOcean 17ba2de
style(autofix.ci): automated formatting
autofix-ci[bot] 39600f6
Update data/json/furniture_and_terrain/terrain-floors-outdoors.json
NappingOcean a516ea2
Update data/json/construction.json
NappingOcean 7d7336e
Update data/json/construction.json
NappingOcean 359417e
Update data/json/construction.json
NappingOcean 76427d0
style(autofix.ci): automated formatting
autofix-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -73,6 +73,56 @@ | |||||
"dark_craftable": true, | ||||||
"post_special": "done_trunk_plank" | ||||||
}, | ||||||
{ | ||||||
"type": "construction", | ||||||
"id": "constr_paddy_field", | ||||||
"group": "plow_a_paddy_field", | ||||||
"category": "FARM_WOOD", | ||||||
"required_skills": [ [ "survival", 1 ] ], | ||||||
"time": "20 m", | ||||||
"qualities": [ [ { "id": "DIG", "level": 1 } ] ], | ||||||
"components": [ [ [ "clay_lump", 8 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ], [ [ "material_sand", 1 ], [ "material_soil", 2 ] ] ], | ||||||
"pre_terrain": "t_pit_shallow", | ||||||
"post_terrain": "t_paddy", | ||||||
"dark_craftable": true | ||||||
}, | ||||||
{ | ||||||
"type": "construction", | ||||||
"id": "constr_paddy_field_remove", | ||||||
"group": "remove_a_paddy_field", | ||||||
"category": "FARM_WOOD", | ||||||
"required_skills": [ [ "survival", 0 ] ], | ||||||
"time": "5 m", | ||||||
"qualities": [ [ { "id": "DIG", "level": 1 } ] ], | ||||||
"pre_terrain": "t_paddy", | ||||||
"post_terrain": "t_dirt", | ||||||
"dark_craftable": true | ||||||
}, | ||||||
{ | ||||||
"type": "construction", | ||||||
"id": "constr_clay_bog", | ||||||
"group": "gather_clay_from_dirt", | ||||||
"category": "OTHER", | ||||||
"required_skills": [ [ "survival", 2 ] ], | ||||||
"time": "30 s", | ||||||
"components": [ [ [ "material_soil", 50 ] ], [ [ "water", 32 ], [ "water_clean", 32 ] ] ], | ||||||
"pre_terrain": "t_pit_shallow", | ||||||
"post_terrain": "t_clay_bog", | ||||||
"dark_craftable": true | ||||||
}, | ||||||
{ | ||||||
"type": "construction", | ||||||
"id": "constr_clay_stirred", | ||||||
"group": "gather_clay_from_dirt", | ||||||
"category": "OTHER", | ||||||
"required_skills": [ [ "survival", 2 ] ], | ||||||
"time": "90 m", | ||||||
"qualities": [ [ { "id": "DIG", "level": 1 } ] ], | ||||||
"byproducts": [ { "item": "pebble", "charges": [ 2, 16 ] } ], | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This I assume should probably be clay lumps instead of pebbles, and equal the amount of clay you get out of
Suggested change
|
||||||
"components": [ [ [ "water", 32 ], [ "water_clean", 32 ] ] ], | ||||||
"pre_terrain": "t_clay_bog", | ||||||
"post_terrain": "t_clay" | ||||||
NappingOcean marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
}, | ||||||
{ | ||||||
"type": "construction", | ||||||
"id": "constr_improvised_shelter", | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
data/json/external_tileset/External_Tileset_DP_terrain_normal.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
[ | ||
{ | ||
"type": "mod_tileset", | ||
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ], | ||
"tiles-new": [ | ||
{ | ||
"file": "external_tileset/External_Tileset_DP_terrain_normal.png", | ||
"tiles": [ | ||
{ | ||
"id": "t_paddy", | ||
"fg": 0, | ||
"rotates": true, | ||
"multitile": true, | ||
"additional_tiles": [ | ||
{ "id": "center", "fg": 1 }, | ||
{ "id": "corner", "fg": [ 2, 3, 4, 5 ] }, | ||
{ "id": "t_connection", "fg": [ 12, 13, 14, 15 ] }, | ||
{ "id": "edge", "fg": [ 8, 9 ] }, | ||
{ "id": "end_piece", "fg": [ 10, 11, 6, 7 ] }, | ||
{ "id": "unconnected", "fg": 16 } | ||
] | ||
} | ||
], | ||
"sprite_width": 32, | ||
"sprite_height": 32 | ||
} | ||
] | ||
} | ||
] |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1 soil is 5 liters, 1 sand is 5 ml. Suggestion here uses the same ratio that "Fill Shallow Water With Dirt" uses, which is still barely any but eh, doesn't have to be exact given that would require 2000 sand:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought this construction was about changing the composition of the soil to hold the water that the rice crop needs, but didn't consider volume of sand.
If "Fill Shallow Water With Dirt" requires 10 liters, it would be better to leave out the sand and just fill it with clay and dirt. Of course, to fill 5 liters with clay alone would require 20 clay, so it would need to be mixed with water. Maybe 4 to 6?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could work then, soil's more reliable to get than sand so.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rice paddies require a hard layer of solid clay to trap water molecules in the pond. Sand is too porous to contain water so you want as much compacted clay as possible. There's a lot of research here but that's the jist of how a paddy field is done.