diff --git a/data/Goats_mods/Primitive_Survival/Harvest/Plant.json b/data/Goats_mods/Primitive_Survival/Harvest/Plant.json index 56b9ec9d3..75034bd64 100644 --- a/data/Goats_mods/Primitive_Survival/Harvest/Plant.json +++ b/data/Goats_mods/Primitive_Survival/Harvest/Plant.json @@ -9,14 +9,29 @@ "type": "harvest", "entries": [ { "drop": "turnip", "base_num": [ 2, 5 ] } ] }, + { + "id": "plant_swede_harv", + "type": "harvest", + "entries": [ { "drop": "swede", "base_num": [ 2, 5 ] } ] + }, + { + "id": "plant_pea_harv", + "type": "harvest", + "entries": [ { "drop": "pea", "base_num": [ 25, 50 ] } ] + }, { "id": "plant_rye_harv", "type": "harvest", "entries": [ { "drop": "rye", "base_num": [ 2, 5 ] } ] }, + { + "id": "plant_broad_bean_harv", + "type": "harvest", + "entries": [ { "drop": "broad_bean", "base_num": [ 15, 20 ] } ] + }, { "id": "plant_hemp_harv", "type": "harvest", - "entries": [ { "drop": "hemp_fibre", "base_num": [ 6, 10 ] } ] + "entries": [ { "drop": "hemp_fibre", "base_num": [ 6, 10 ] }, { "drop": "seed_hemp", "base_num": [ 10, 20 ] } ] } ] diff --git a/data/Goats_mods/Primitive_Survival/Items/Comestibles/Seeds.json b/data/Goats_mods/Primitive_Survival/Items/Comestibles/Seeds.json index ba35e4549..2ee65e7e6 100644 --- a/data/Goats_mods/Primitive_Survival/Items/Comestibles/Seeds.json +++ b/data/Goats_mods/Primitive_Survival/Items/Comestibles/Seeds.json @@ -135,5 +135,13 @@ "name": { "str": "broad bean seed", "str_pl": "broad bean seeds" }, "description": "broad bean seed", "seed_data": { "plant_name": "broad bean plant", "fruit": "broad_bean", "byproducts": [ "withered" ], "grow": "91 days" } + }, + { + "id": "seed_hemp", + "copy-from": "seed", + "type": "COMESTIBLE", + "name": { "str": "hemp seed", "str_pl": "hemp seeds" }, + "description": "hemp seed", + "seed_data": { "plant_name": "rice plant", "fruit": "seed_hemp", "byproducts": [ "hemp_fibre" ], "grow": "91 days" } } ] diff --git a/data/Goats_mods/Primitive_Survival/Primitive-readme.md b/data/Goats_mods/Primitive_Survival/Primitive-readme.md index 08983e92e..6cd5c0e57 100644 --- a/data/Goats_mods/Primitive_Survival/Primitive-readme.md +++ b/data/Goats_mods/Primitive_Survival/Primitive-readme.md @@ -724,12 +724,8 @@ t_shrub_raspberry - Raspberry bush - [x] Swede seed - Swede - [x] Pea seed - Pea shoot - [x] Broad Bean seed - Broad Bean -- [ ] Rye seed - Rye -- [ ] Hemp seed - Hemp -- [ ] St. Johns Wort Seed - St. Johns Wort -- [ ] Yarrow seed - Yarrow -- [ ] Golden Rod Seed - Golden Rod -- [ ] Calendula seed - Calendula +- [x] Rye seed - Rye +- [x] Hemp seed - Hemp ``` @@ -741,15 +737,6 @@ t_shrub_raspberry - Raspberry bush -*GENERIC:* - -```markdown -- [ ] St. Johns Wort -- [ ] Yarrow -- [ ] Golden Rod -- [ ] Calendula -``` - # Resources @@ -863,10 +850,6 @@ t_shrub_raspberry - Raspberry bush - [x] Broad Bean Shrub - [x] Rye Shrub - [x] Hemp Shrub -- [ ] St. Johns Wort Shrub -- [ ] Yarrow Shrub -- [ ] Golden Rod Shrub -- [ ] Calendula Shrub ``` @@ -1442,7 +1425,7 @@ https://primitivetechnology.wordpress.com/2018/04/20/round-hut/ -fruit seeds: +seeds: ```markdown - [x] Lingonberry Seed - Lingonberry @@ -1463,10 +1446,6 @@ fruit seeds: - [x] Goji seed - Goji berries - [x] Bilberries seed - Bilberries - [x] Acai seed - Acai berries -- [ ] St. Johns Wort Seed - St. Johns Wort -- [ ] Yarrow seed - Yarrow -- [ ] Golden Rod Seed - Golden Rod -- [ ] Calendula seed - Calendula ``` diff --git a/data/Goats_mods/Primitive_Survival/Terrain/flora_plants.json b/data/Goats_mods/Primitive_Survival/Terrain/flora_plants.json index b55e062ec..29ba454c7 100644 --- a/data/Goats_mods/Primitive_Survival/Terrain/flora_plants.json +++ b/data/Goats_mods/Primitive_Survival/Terrain/flora_plants.json @@ -98,7 +98,7 @@ "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DIGGABLE", "FLAT", "THIN_OBSTACLE", "SHRUB", "SMALL_HIDE" ], "transforms_into": "t_shrub_swede_harvested", "examine_action": "harvest_furn_nectar", - "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "plant_Swede_harv" } ], + "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "plant_swede_harv" } ], "bash": { "str_min": 2, "str_max": 6, @@ -215,6 +215,49 @@ "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ] } }, + { + "id": "t_shrub_broad_bean", + "type": "terrain", + "name": "broad bean plant", + "description": "The plant is erect, from 60 to 150 cm tall (2 to 5 feet), and bears few branches. The stem and branches are crowded with short-petioled compound leaves. The pods are nearly erect in clusters in the axils of the leaves, and the seeds are large and irregularly flattened.", + "symbol": "h", + "color": [ "green", "green", "green", "green" ], + "move_cost": 8, + "coverage": 70, + "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DIGGABLE", "FLAT", "THIN_OBSTACLE", "SHRUB", "SMALL_HIDE" ], + "transforms_into": "t_shrub_broad_bean_harvested", + "examine_action": "harvest_furn_nectar", + "harvest_by_season": [ { "seasons": [ "summer" ], "id": "plant_broad_bean_harv" } ], + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "crunch.", + "sound_fail": "whish.", + "ter_set": "t_dirt", + "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] }, { "item": "leaves", "count": [ 2, 4 ] } ] + } + }, + { + "id": "t_shrub_broad_bean_harvested", + "type": "terrain", + "name": "broad beans plant", + "description": "A small broad bean plant remains.", + "symbol": "h", + "color": "red_green", + "move_cost": 8, + "coverage": 40, + "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "SHARP", "HARVESTED" ], + "transforms_into": "t_shrub_broad_bean", + "examine_action": "harvested_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 ] } ] + } + }, { "id": "t_shrub_hemp", "type": "terrain", @@ -247,7 +290,7 @@ "move_cost": 8, "coverage": 40, "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "SHARP", "HARVESTED" ], - "transforms_into": "t_shrub_rye", + "transforms_into": "t_shrub_hemp", "examine_action": "harvested_plant", "bash": { "str_min": 4, diff --git a/data/Goats_mods/Primitive_Survival/modinfo.json b/data/Goats_mods/Primitive_Survival/modinfo.json index d0625698b..96e0e0634 100644 --- a/data/Goats_mods/Primitive_Survival/modinfo.json +++ b/data/Goats_mods/Primitive_Survival/modinfo.json @@ -5,7 +5,7 @@ "name": "Primitive Survival", "authors": [ "TheGoatGod" ], "description": "Adds tools, weapons, armor, locations.", - "version": "0.3", + "version": "0.4", "category": "content", "dependencies": [ "dda" ] }