diff --git a/README.md b/README.md index 40dc893..2ae2ef1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ PlantPack ========= -A collection of trees and dynamic plants which grow over time or change in other ways. +A collection of trees and dynamic plants. In combination with [`ChangingBlocks`](https://github.com/Terasology/ChangingBlocks) they grow over time or change in other ways. Plants @@ -26,15 +26,15 @@ Here is an example of a crop with 7 stages: ```json { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Corn1": 30000, - "PlantPack:Corn2": 30000, - "PlantPack:Corn3": 30000, - "PlantPack:Corn4": 30000, - "PlantPack:Corn5": 30000, - "PlantPack:Corn6": 30000, - "PlantPack:Corn7": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Corn1", "value": 30000 }, + { "key": "PlantPack:Corn2", "value": 30000 }, + { "key": "PlantPack:Corn3", "value": 30000 }, + { "key": "PlantPack:Corn4", "value": 30000 }, + { "key": "PlantPack:Corn5", "value": 30000 }, + { "key": "PlantPack:Corn6", "value": 30000 }, + { "key": "PlantPack:Corn7", "value": 30000 } + ], "loops": false } } diff --git a/assets/prefabs/crop/Corn.prefab b/assets/prefabs/crop/Corn.prefab index 1764126..5410d28 100644 --- a/assets/prefabs/crop/Corn.prefab +++ b/assets/prefabs/crop/Corn.prefab @@ -1,15 +1,14 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Corn1": 30000, - "PlantPack:Corn2": 30000, - "PlantPack:Corn3": 30000, - "PlantPack:Corn4": 30000, - "PlantPack:Corn5": 30000, - "PlantPack:Corn6": 30000, - "PlantPack:Corn7": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Corn1", "value": 30000 }, + { "key": "PlantPack:Corn2", "value": 30000 }, + { "key": "PlantPack:Corn3", "value": 30000 }, + { "key": "PlantPack:Corn4", "value": 30000 }, + { "key": "PlantPack:Corn5", "value": 30000 }, + { "key": "PlantPack:Corn6", "value": 30000 }, + { "key": "PlantPack:Corn7", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/HotCoffeePlant.prefab b/assets/prefabs/crop/HotCoffeePlant.prefab index f20fe66..53691b0 100644 --- a/assets/prefabs/crop/HotCoffeePlant.prefab +++ b/assets/prefabs/crop/HotCoffeePlant.prefab @@ -1,30 +1,14 @@ -/* - * Copyright 2014 Moving Blocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:HotCoffeePlant1": 30000, - "PlantPack:HotCoffeePlant2": 30000, - "PlantPack:HotCoffeePlant3": 30000, - "PlantPack:HotCoffeePlant4": 30000, - "PlantPack:HotCoffeePlant5": 30000, - "PlantPack:HotCoffeePlant6": 30000, - "PlantPack:HotCoffeePlant7": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:HotCoffeePlant1", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant2", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant3", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant4", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant5", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant6", "value": 30000 }, + { "key": "PlantPack:HotCoffeePlant7", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/MilkPlant.prefab b/assets/prefabs/crop/MilkPlant.prefab index 67f0dd8..aef693e 100644 --- a/assets/prefabs/crop/MilkPlant.prefab +++ b/assets/prefabs/crop/MilkPlant.prefab @@ -1,30 +1,14 @@ -/* - * Copyright 2014 Moving Blocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:MilkPlant1": 30000, - "PlantPack:MilkPlant2": 30000, - "PlantPack:MilkPlant3": 30000, - "PlantPack:MilkPlant4": 30000, - "PlantPack:MilkPlant5": 30000, - "PlantPack:MilkPlant6": 30000, - "PlantPack:MilkPlant7": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:MilkPlant1", "value": 30000 }, + { "key": "PlantPack:MilkPlant2", "value": 30000 }, + { "key": "PlantPack:MilkPlant3", "value": 30000 }, + { "key": "PlantPack:MilkPlant4", "value": 30000 }, + { "key": "PlantPack:MilkPlant5", "value": 30000 }, + { "key": "PlantPack:MilkPlant6", "value": 30000 }, + { "key": "PlantPack:MilkPlant7", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Oreo.prefab b/assets/prefabs/crop/Oreo.prefab index 737fc4c..5a6c732 100644 --- a/assets/prefabs/crop/Oreo.prefab +++ b/assets/prefabs/crop/Oreo.prefab @@ -1,12 +1,11 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Oreo1": 30000, - "PlantPack:Oreo2": 30000, - "PlantPack:Oreo3": 30000, - "PlantPack:Oreo4": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Oreo1", "value": 30000 }, + { "key": "PlantPack:Oreo2", "value": 30000 }, + { "key": "PlantPack:Oreo3", "value": 30000 }, + { "key": "PlantPack:Oreo4", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Potato.prefab b/assets/prefabs/crop/Potato.prefab index 41bae96..bd3541f 100644 --- a/assets/prefabs/crop/Potato.prefab +++ b/assets/prefabs/crop/Potato.prefab @@ -1,14 +1,13 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Potato1": 30000, - "PlantPack:Potato2": 30000, - "PlantPack:Potato3": 30000, - "PlantPack:Potato4": 30000, - "PlantPack:Potato5": 30000, - "PlantPack:Potato6": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Potato1", "value": 30000 }, + { "key": "PlantPack:Potato2", "value": 30000 }, + { "key": "PlantPack:Potato3", "value": 30000 }, + { "key": "PlantPack:Potato4", "value": 30000 }, + { "key": "PlantPack:Potato5", "value": 30000 }, + { "key": "PlantPack:Potato6", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Radish.prefab b/assets/prefabs/crop/Radish.prefab index ef0dc63..ce073cb 100644 --- a/assets/prefabs/crop/Radish.prefab +++ b/assets/prefabs/crop/Radish.prefab @@ -1,13 +1,12 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Radish1": 30000, - "PlantPack:Radish2": 30000, - "PlantPack:Radish3": 30000, - "PlantPack:Radish4": 30000, - "PlantPack:Radish5": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Radish1", "value": 30000 }, + { "key": "PlantPack:Radish3", "value": 30000 }, + { "key": "PlantPack:Radish4", "value": 30000 }, + { "key": "PlantPack:Radish2", "value": 30000 }, + { "key": "PlantPack:Radish5", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Rice.prefab b/assets/prefabs/crop/Rice.prefab index 97cf4a8..07604d2 100644 --- a/assets/prefabs/crop/Rice.prefab +++ b/assets/prefabs/crop/Rice.prefab @@ -1,12 +1,11 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Rice1": 30000, - "PlantPack:Rice2": 30000, - "PlantPack:Rice3": 30000, - "PlantPack:Rice4": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Rice1", "value": 30000 }, + { "key": "PlantPack:Rice2", "value": 30000 }, + { "key": "PlantPack:Rice3", "value": 30000 }, + { "key": "PlantPack:Rice4", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Squash.prefab b/assets/prefabs/crop/Squash.prefab index a795de4..34ecbfc 100644 --- a/assets/prefabs/crop/Squash.prefab +++ b/assets/prefabs/crop/Squash.prefab @@ -1,13 +1,12 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Squash1": 30000, - "PlantPack:Squash2": 30000, - "PlantPack:Squash3": 30000, - "PlantPack:Squash4": 30000, - "PlantPack:Squash5": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Squash1", "value": 30000 }, + { "key": "PlantPack:Squash2", "value": 30000 }, + { "key": "PlantPack:Squash3", "value": 30000 }, + { "key": "PlantPack:Squash4", "value": 30000 }, + { "key": "PlantPack:Squash5", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/SugarCane.prefab b/assets/prefabs/crop/SugarCane.prefab index d4029a4..dc023c1 100644 --- a/assets/prefabs/crop/SugarCane.prefab +++ b/assets/prefabs/crop/SugarCane.prefab @@ -1,13 +1,12 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:SugarCane1": 30000, - "PlantPack:SugarCane2": 30000, - "PlantPack:SugarCane3": 30000, - "PlantPack:SugarCane4": 30000, - "PlantPack:SugarCane5": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:SugarCane1", "value": 30000 }, + { "key": "PlantPack:SugarCane2", "value": 30000 }, + { "key": "PlantPack:SugarCane3", "value": 30000 }, + { "key": "PlantPack:SugarCane4", "value": 30000 }, + { "key": "PlantPack:SugarCane5", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Tomato.prefab b/assets/prefabs/crop/Tomato.prefab index 3beb443..f42bc3c 100644 --- a/assets/prefabs/crop/Tomato.prefab +++ b/assets/prefabs/crop/Tomato.prefab @@ -1,12 +1,11 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Tomato1": 30000, - "PlantPack:Tomato2": 30000, - "PlantPack:Tomato3": 30000, - "PlantPack:Tomato4": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Tomato1", "value": 30000 }, + { "key": "PlantPack:Tomato2", "value": 30000 }, + { "key": "PlantPack:Tomato3", "value": 30000 }, + { "key": "PlantPack:Tomato4", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Turnip.prefab b/assets/prefabs/crop/Turnip.prefab index 1dbe879..5cafb7e 100644 --- a/assets/prefabs/crop/Turnip.prefab +++ b/assets/prefabs/crop/Turnip.prefab @@ -1,13 +1,12 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Turnip1": 30000, - "PlantPack:Turnip2": 30000, - "PlantPack:Turnip3": 30000, - "PlantPack:Turnip4": 30000, - "PlantPack:Turnip5": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Turnip1", "value": 30000 }, + { "key": "PlantPack:Turnip2", "value": 30000 }, + { "key": "PlantPack:Turnip3", "value": 30000 }, + { "key": "PlantPack:Turnip4", "value": 30000 }, + { "key": "PlantPack:Turnip5", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/Watermelon.prefab b/assets/prefabs/crop/Watermelon.prefab index bcc93e7..750f03a 100644 --- a/assets/prefabs/crop/Watermelon.prefab +++ b/assets/prefabs/crop/Watermelon.prefab @@ -1,14 +1,13 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:Watermelon1": 30000, - "PlantPack:Watermelon2": 30000, - "PlantPack:Watermelon3": 30000, - "PlantPack:Watermelon4": 30000, - "PlantPack:Watermelon5": 30000, - "PlantPack:Watermelon6": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:Watermelon1", "value": 30000 }, + { "key": "PlantPack:Watermelon2", "value": 30000 }, + { "key": "PlantPack:Watermelon3", "value": 30000 }, + { "key": "PlantPack:Watermelon4", "value": 30000 }, + { "key": "PlantPack:Watermelon5", "value": 30000 }, + { "key": "PlantPack:Watermelon6", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/assets/prefabs/crop/WildCarrot.prefab b/assets/prefabs/crop/WildCarrot.prefab index ca4500d..be56204 100644 --- a/assets/prefabs/crop/WildCarrot.prefab +++ b/assets/prefabs/crop/WildCarrot.prefab @@ -1,13 +1,12 @@ - { "ChangingBlocks": { - "blockFamilyStages": { - "PlantPack:WildCarrot1": 30000, - "PlantPack:WildCarrot2": 30000, - "PlantPack:WildCarrot3": 30000, - "PlantPack:WildCarrot4": 30000, - "PlantPack:WildCarrot5": 30000 - }, + "blockFamilyStages": [ + { "key": "PlantPack:WildCarrot1", "value": 30000 }, + { "key": "PlantPack:WildCarrot2", "value": 30000 }, + { "key": "PlantPack:WildCarrot3", "value": 30000 }, + { "key": "PlantPack:WildCarrot4", "value": 30000 }, + { "key": "PlantPack:WildCarrot5", "value": 30000 } + ], "loops": false } -} \ No newline at end of file +} diff --git a/module.txt b/module.txt index 41ee23e..9e6e75f 100644 --- a/module.txt +++ b/module.txt @@ -5,6 +5,11 @@ "displayName": "PlantPack", "description": "Provides basic plant assets", "dependencies": [ + { + "id": "ChangingBlocks", + "minVersion": "1.1.0", + "optional": true + }, { "id": "CoreAssets", "minVersion": "2.0.1"