diff --git a/assets/Data/entity/foliage.json b/assets/Data/entity/foliage.json index 487b7da7..918f269a 100644 --- a/assets/Data/entity/foliage.json +++ b/assets/Data/entity/foliage.json @@ -4,6 +4,7 @@ "files" : [ "Data/entity/foliage/grass.json", "Data/entity/foliage/trees.json", - "Data/entity/foliage/bushes.json" + "Data/entity/foliage/bushes.json", + "Data/entity/foliage/rocks.json" ] } diff --git a/assets/Data/entity/foliage/rocks.json b/assets/Data/entity/foliage/rocks.json new file mode 100644 index 00000000..d7f96716 --- /dev/null +++ b/assets/Data/entity/foliage/rocks.json @@ -0,0 +1,46 @@ +{ + "foliageList" : [ + { + "id" : "rock_static", + "tokens" : [ + ], + "buttonInteraction" : { + "onInteract" : "harvest", + "interactionShape" : { + "type" : "CUBE", + "dimension1" : 0.3, + "dimension2" : 0.3, + "dimension3" : 0.3, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "rotW": 1, + "offsetX" : 0.0, + "offsetY" : 0.1, + "offsetZ" : 0.0 + } + }, + "healthSystem" : { + "maxHealth" : 1, + "onDamageIFrames" : 0, + "lootPool" : { + "tickets" : [ + { + "itemId" : "Rock", + "rarity" : 1.0, + "minQuantity" : 1, + "maxQuantity" : 1 + } + ] + } + }, + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/rock1.glb" + } + } + } + ], + "files" : [ + ] +} diff --git a/assets/Data/game/biomes.json b/assets/Data/game/biomes.json index 7acf4c93..883b053b 100644 --- a/assets/Data/game/biomes.json +++ b/assets/Data/game/biomes.json @@ -96,6 +96,15 @@ "threshold": 0.05, "scale": 0.5, "priority": 1.0 + }, + { + "entityIDs": [ + "rock_static" + ], + "regularity": 0.6, + "threshold": 0.04, + "scale": 0.5, + "priority": 1.0 } ] } diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 600289ed..503672b5 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1445,6 +1445,7 @@ Recursive recipe data files ServerEntityUtils recursive move function potential bugfix Harvest bushes kills them Fix harvest interaction targeting client player entity on server side +Static rocks which harvest into rock items that spawn in forest