Skip to content

Commit 35fb5c3

Browse files
MaleclypseMaleclypse
authored
Merge pull request #82943 from RenechCDDA/seed_data_idk
JSONize plant growth stages
2 parents 6561ee2 + 211d7e4 commit 35fb5c3

File tree

22 files changed

+918
-220
lines changed

22 files changed

+918
-220
lines changed

‎data/json/furniture_and_terrain/furniture-domestic_plants.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"color": "brown",
146146
"move_cost_mod": 0,
147147
"required_str": -1,
148-
"flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
148+
"flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "GROWTH_SEED", "DONT_REMOVE_ROTTEN" ],
149149
"examine_action": "aggie_plant",
150150
"bash": { "str_min": 1, "str_max": 5, "sound": "crunch.", "sound_fail": "whish." },
151151
"plant_data": { "transform": "f_plant_seedling", "base": "f_null" }
@@ -337,7 +337,7 @@
337337
"looks_like": "f_plant_seed",
338338
"move_cost_mod": 1,
339339
"required_str": -1,
340-
"flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
340+
"flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "GROWTH_SEED", "DONT_REMOVE_ROTTEN" ],
341341
"connect_groups": "PLANTER",
342342
"connects_to": "PLANTER",
343343
"examine_action": "aggie_plant",

‎data/json/furniture_and_terrain/furniture-terrains.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,7 @@
12781278
"TINY",
12791279
"DONT_REMOVE ROTTEN",
12801280
"SEALED",
1281+
"GROWTH_SEED",
12811282
"CONTAINER"
12821283
],
12831284
"examine_action": "aggie_plant",
@@ -1460,6 +1461,7 @@
14601461
"TINY",
14611462
"DONT_REMOVE ROTTEN",
14621463
"SEALED",
1464+
"GROWTH_SEED",
14631465
"CONTAINER"
14641466
],
14651467
"examine_action": "aggie_plant",

‎data/json/items/comestibles/other.json‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,13 @@
504504
"fruit": "raw_beans",
505505
"seeds": false,
506506
"byproducts": [ "withered" ],
507-
"grow": "91 days"
507+
"growth_stages": [
508+
{ "GROWTH_SEED": "23 days" },
509+
{ "GROWTH_SEEDLING": "23 days" },
510+
{ "GROWTH_MATURE": "23 days" },
511+
{ "GROWTH_HARVEST": "22 days" },
512+
{ "GROWTH_OVERGROWN": "1 hour" }
513+
]
508514
},
509515
{
510516
"type": "ITEM",
@@ -612,7 +618,13 @@
612618
"fruit": "soybean",
613619
"seeds": false,
614620
"byproducts": [ "withered", "raw_edamame" ],
615-
"grow": "91 days",
621+
"growth_stages": [
622+
{ "GROWTH_SEED": "23 days" },
623+
{ "GROWTH_SEEDLING": "23 days" },
624+
{ "GROWTH_MATURE": "23 days" },
625+
{ "GROWTH_HARVEST": "22 days" },
626+
{ "GROWTH_OVERGROWN": "1 hour" }
627+
],
616628
"into": "paste_nut",
617629
"recipe": "paste_nut_mill_5_1"
618630
},
@@ -641,7 +653,13 @@
641653
"fruit": "soybean",
642654
"seeds": false,
643655
"byproducts": [ "withered", "raw_edamame" ],
644-
"grow": "91 days",
656+
"growth_stages": [
657+
{ "GROWTH_SEED": "23 days" },
658+
{ "GROWTH_SEEDLING": "23 days" },
659+
{ "GROWTH_MATURE": "23 days" },
660+
{ "GROWTH_HARVEST": "22 days" },
661+
{ "GROWTH_OVERGROWN": "1 hour" }
662+
],
645663
"into": "flour_wheat_free",
646664
"recipe": "flour_wheat_free_mill_1_1"
647665
},

‎data/json/items/comestibles/raw_grain.json‎

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@
4444
"fruit": "corn",
4545
"seeds": false,
4646
"byproducts": [ "withered" ],
47-
"grow": "80 days"
47+
"growth_stages": [
48+
{ "GROWTH_SEED": "20 days" },
49+
{ "GROWTH_SEEDLING": "20 days" },
50+
{ "GROWTH_MATURE": "20 days" },
51+
{ "GROWTH_HARVEST": "20 days" },
52+
{ "GROWTH_OVERGROWN": "1 hour" }
53+
]
4854
},
4955
{
5056
"type": "ITEM",
@@ -95,7 +101,13 @@
95101
"fruit": "popcorn_cob",
96102
"seeds": false,
97103
"byproducts": [ "withered" ],
98-
"grow": "91 days"
104+
"growth_stages": [
105+
{ "GROWTH_SEED": "23 days" },
106+
{ "GROWTH_SEEDLING": "23 days" },
107+
{ "GROWTH_MATURE": "23 days" },
108+
{ "GROWTH_HARVEST": "22 days" },
109+
{ "GROWTH_OVERGROWN": "1 hour" }
110+
]
99111
},
100112
{
101113
"type": "ITEM",
@@ -121,7 +133,13 @@
121133
"fruit": "popcorn_cob",
122134
"seeds": false,
123135
"byproducts": [ "withered" ],
124-
"grow": "91 days"
136+
"growth_stages": [
137+
{ "GROWTH_SEED": "23 days" },
138+
{ "GROWTH_SEEDLING": "23 days" },
139+
{ "GROWTH_MATURE": "23 days" },
140+
{ "GROWTH_HARVEST": "22 days" },
141+
{ "GROWTH_OVERGROWN": "1 hour" }
142+
]
125143
},
126144
{
127145
"type": "ITEM",
@@ -278,7 +296,13 @@
278296
"plant_name": "wheat",
279297
"fruit": "wheat_stalks",
280298
"seeds": false,
281-
"grow": "120 days",
299+
"growth_stages": [
300+
{ "GROWTH_SEED": "30 days" },
301+
{ "GROWTH_SEEDLING": "30 days" },
302+
{ "GROWTH_MATURE": "30 days" },
303+
{ "GROWTH_HARVEST": "30 days" },
304+
{ "GROWTH_OVERGROWN": "1 hour" }
305+
],
282306
"into": "flour",
283307
"recipe": "flour_mill_1_15"
284308
},
@@ -332,7 +356,13 @@
332356
"plant_name": "barley",
333357
"fruit": "barley_stalks",
334358
"seeds": false,
335-
"grow": "70 days",
359+
"growth_stages": [
360+
{ "GROWTH_SEED": "18 days" },
361+
{ "GROWTH_SEEDLING": "18 days" },
362+
{ "GROWTH_MATURE": "17 days" },
363+
{ "GROWTH_HARVEST": "17 days" },
364+
{ "GROWTH_OVERGROWN": "1 hour" }
365+
],
336366
"into": "flour",
337367
"recipe": "flour_mill_1_15"
338368
},
@@ -405,7 +435,13 @@
405435
"plant_name": "oats",
406436
"fruit": "oat_stalks",
407437
"seeds": false,
408-
"grow": "65 days",
438+
"growth_stages": [
439+
{ "GROWTH_SEED": "17 days" },
440+
{ "GROWTH_SEEDLING": "16 days" },
441+
{ "GROWTH_MATURE": "16 days" },
442+
{ "GROWTH_HARVEST": "16 days" },
443+
{ "GROWTH_OVERGROWN": "1 hour" }
444+
],
409445
"into": "flour_wheat_free",
410446
"recipe": "flour_wheat_free_mill_4_15"
411447
},
@@ -449,7 +485,13 @@
449485
"plant_name": "wild rice",
450486
"fruit": "wild_rice_stalks",
451487
"seeds": false,
452-
"grow": "91 days",
488+
"growth_stages": [
489+
{ "GROWTH_SEED": "23 days" },
490+
{ "GROWTH_SEEDLING": "23 days" },
491+
{ "GROWTH_MATURE": "23 days" },
492+
{ "GROWTH_HARVEST": "22 days" },
493+
{ "GROWTH_OVERGROWN": "1 hour" }
494+
],
453495
"into": "dry_wild_rice",
454496
"recipe": "dry_wild_rice_mill_1_5"
455497
},
@@ -475,7 +517,13 @@
475517
"plant_name": "buckwheat",
476518
"fruit": "buckwheat_stalks",
477519
"seeds": false,
478-
"grow": "91 days",
520+
"growth_stages": [
521+
{ "GROWTH_SEED": "23 days" },
522+
{ "GROWTH_SEEDLING": "23 days" },
523+
{ "GROWTH_MATURE": "23 days" },
524+
{ "GROWTH_HARVEST": "22 days" },
525+
{ "GROWTH_OVERGROWN": "1 hour" }
526+
],
479527
"into": "flour_wheat_free",
480528
"recipe": "flour_wheat_free_mill_1_15"
481529
},
@@ -556,7 +604,13 @@
556604
"plant_name": "canola",
557605
"fruit": "canola_stalks",
558606
"seeds": false,
559-
"grow": "91 days",
607+
"growth_stages": [
608+
{ "GROWTH_SEED": "23 days" },
609+
{ "GROWTH_SEEDLING": "23 days" },
610+
{ "GROWTH_MATURE": "23 days" },
611+
{ "GROWTH_HARVEST": "22 days" },
612+
{ "GROWTH_OVERGROWN": "1 hour" }
613+
],
560614
"into": "paste_seed",
561615
"recipe": "paste_seed_mill_1_1"
562616
},
@@ -611,7 +665,13 @@
611665
"plant_name": "lentils",
612666
"fruit": "dry_lentil_stalks",
613667
"seeds": false,
614-
"grow": "91 days"
668+
"growth_stages": [
669+
{ "GROWTH_SEED": "23 days" },
670+
{ "GROWTH_SEEDLING": "23 days" },
671+
{ "GROWTH_MATURE": "23 days" },
672+
{ "GROWTH_HARVEST": "22 days" },
673+
{ "GROWTH_OVERGROWN": "1 hour" }
674+
]
615675
},
616676
{
617677
"type": "ITEM",

‎data/json/items/comestibles/raw_veggy.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,13 @@
616616
"plant_name": "garlic",
617617
"fruit": "garlic",
618618
"byproducts": [ "withered" ],
619-
"grow": "65 days"
619+
"growth_stages": [
620+
{ "GROWTH_SEED": "17 days" },
621+
{ "GROWTH_SEEDLING": "16 days" },
622+
{ "GROWTH_MATURE": "16 days" },
623+
{ "GROWTH_HARVEST": "16 days" },
624+
{ "GROWTH_OVERGROWN": "1 hour" }
625+
]
620626
},
621627
{
622628
"type": "ITEM",
@@ -1177,7 +1183,13 @@
11771183
"fruit": "raw_beans",
11781184
"seeds": false,
11791185
"byproducts": [ "withered" ],
1180-
"grow": "91 days"
1186+
"growth_stages": [
1187+
{ "GROWTH_SEED": "23 days" },
1188+
{ "GROWTH_SEEDLING": "23 days" },
1189+
{ "GROWTH_MATURE": "23 days" },
1190+
{ "GROWTH_HARVEST": "22 days" },
1191+
{ "GROWTH_OVERGROWN": "1 hour" }
1192+
]
11811193
},
11821194
{
11831195
"type": "ITEM",

0 commit comments

Comments
 (0)