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

Improve crop farming. #24291

Merged
merged 41 commits into from
Aug 27, 2018
Merged

Improve crop farming. #24291

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1056809
Add temperature dependence to the plant grow time.
Vasyan2006 Jul 13, 2018
29d3cdc
Add function to calculate effective plant grow time.
Vasyan2006 Jul 13, 2018
5e3372c
Add function to calculate effective plant grow time.
Vasyan2006 Jul 13, 2018
46d2678
Add warm_enough_to_safe_plant() function.
Vasyan2006 Jul 13, 2018
90e8c89
Change menu header if it can be too cold.
Vasyan2006 Jul 13, 2018
509a800
Add double spacing.
Vasyan2006 Jul 14, 2018
52b7195
Remove excessive period.
Vasyan2006 Jul 14, 2018
c94219f
Edit plant grow.
Vasyan2006 Jul 31, 2018
0182edb
Edit seeds info.
Vasyan2006 Jul 31, 2018
9dba40f
Add "water requirement" and "weed susceptibility" plant parameters.
Vasyan2006 Jul 31, 2018
b26f848
Merge branch 'master' into grow-time
Vasyan2006 Aug 2, 2018
7ffece9
Add mushrooms and shrubs.
Vasyan2006 Aug 3, 2018
5efb79b
Add carrot and sugar beet.
Vasyan2006 Aug 3, 2018
88d54c4
Remove charges from pumpkin.
Vasyan2006 Aug 3, 2018
d78a0be
Edit seed data.
Vasyan2006 Aug 3, 2018
85ada5b
Add more seed parameters.
Vasyan2006 Aug 3, 2018
1574849
Edit plant processing.
Vasyan2006 Aug 3, 2018
55541c8
Edit mission with plants.
Vasyan2006 Aug 3, 2018
893809f
Edit plant processing.
Vasyan2006 Aug 3, 2018
eadb21d
Update seed data.
Vasyan2006 Aug 3, 2018
7fed619
Add more berries.
Vasyan2006 Aug 5, 2018
bf2e681
Update seeds.
Vasyan2006 Aug 5, 2018
142b2af
Bugfixing.
Vasyan2006 Aug 5, 2018
deed0d5
Update seed info.
Vasyan2006 Aug 6, 2018
aa48489
Edit is_warm_enought().
Vasyan2006 Aug 6, 2018
a383f70
Water rebalancing and astyle.
Vasyan2006 Aug 6, 2018
917a730
Merge branch 'master' into grow-time
Vasyan2006 Aug 6, 2018
7313c2c
Replace dash-like character with minus sign.
Vasyan2006 Aug 7, 2018
5af2342
Edit crops interactions.
Vasyan2006 Aug 11, 2018
f0035ca
Linting.
Vasyan2006 Aug 11, 2018
4009795
Typo.
Vasyan2006 Aug 11, 2018
0becd48
Edit crops grow.
Vasyan2006 Aug 11, 2018
62c725e
Merge branch 'master' into grow-time
Vasyan2006 Aug 13, 2018
d96742a
Merge branch 'master' into grow-time
Vasyan2006 Aug 18, 2018
de8cc6f
Bugfixes for crop farming.
Vasyan2006 Aug 25, 2018
d5849cb
Merge branch 'master' into grow-time
Vasyan2006 Aug 25, 2018
3b959a4
Bugfixes for crop farming.
Vasyan2006 Aug 25, 2018
bdfb4a8
Astyle to make Jenkins happy
ZhilkinSerg Aug 25, 2018
a728c1c
Minor bugfix for crop farming.
Vasyan2006 Aug 26, 2018
0ff00d5
Using game constant for freezing temperature.
Vasyan2006 Aug 26, 2018
8ce5a6d
Merge branch 'master' into grow-time
Vasyan2006 Aug 26, 2018
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
244 changes: 244 additions & 0 deletions data/json/furniture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1798,6 +1798,250 @@
"sound": "crunch.",
"sound_fail": "whish."
}
},{
"type" : "furniture",
"id" : "f_mushroom_seed",
"name": "starting mushroom bed",
"symbol": "^",
"color": "white",
"move_cost_mod": 0,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"examine_action": "aggie_plant"
},{
"type" : "furniture",
"id" : "f_mushroom_seedling",
"name": "weak mushroom bed",
"symbol": "#",
"color": "white",
"move_cost_mod": 0,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"examine_action": "aggie_plant"
},{
"type" : "furniture",
"id" : "f_mushroom_mature",
"name": "mature mushroom bed",
"symbol": "#",
"color": "white",
"move_cost_mod": 0,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"examine_action": "aggie_plant"
},{
"type" : "furniture",
"id" : "f_mushroom_mature_harvest",
"name": "mushroom bed with grown mushrooms",
"symbol": "#",
"color": "white",
"move_cost_mod": 0,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"examine_action": "aggie_plant"
},{
"type" : "furniture",
"id" : "f_shrub_blueberry",
"name": "blueberry shrub",
"symbol": "#",
"color": "blue_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_blueberry_harvest",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_blueberry_harvest",
"name": "blueberry shrub",
"symbol": "#",
"color": "light_blue_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_blueberry",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_strawberry",
"name": "strawberry shrub",
"symbol": "#",
"color": "red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_strawberry_harvest",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_strawberry_harvest",
"name": "strawberry shrub",
"symbol": "#",
"color": "light_red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_strawberry",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_cranberry",
"name": "cranberry shrub",
"symbol": "#",
"color": "red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_cranberry_harvest",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_cranberry_harvest",
"name": "cranberry shrub",
"symbol": "#",
"color": "light_red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_cranberry",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_blackberry",
"name": "blackberry bush",
"symbol": "#",
"color": "red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_blackberry_harvest",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] },
{ "item": "stick_long", "count": [0, 5] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_blackberry_harvest",
"name": "blackberry bush",
"symbol": "#",
"color": "light_red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_blackberry",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] },
{ "item": "stick_long", "count": [0, 5] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_raspberry",
"name": "raspberry bush",
"symbol": "#",
"color": "red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_raspberry_harvest",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] },
{ "item": "stick_long", "count": [0, 5] }
]
}
},{
"type" : "furniture",
"id" : "f_shrub_raspberry_harvest",
"name": "raspberry bush",
"symbol": "#",
"color": "light_red_green",
"move_cost_mod": 2,
"required_str": -1,
"flags": ["PLANT", "SEALED", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN"],
"transforms_into": "f_shrub_raspberry",
"examine_action": "aggie_plant",
"bash": {
"str_min": 4, "str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [1, 2] },
{ "item": "stick_long", "count": [0, 5] }
]
}
},{
"type" : "furniture",
"id" : "f_fvat_empty",
Expand Down
1 change: 0 additions & 1 deletion data/json/items/comestibles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6022,7 +6022,6 @@
"price": 750,
"material": "veggy",
"volume": 12,
"charges": 8,
"bashing": 2,
"fun": -1,
"rot_spawn": "GROUP_ROTTING_PLANT"
Expand Down
Loading