diff --git a/assets/Data/entity/objects/furniture.json b/assets/Data/entity/objects/furniture.json index d31920a7..754ceeb5 100644 --- a/assets/Data/entity/objects/furniture.json +++ b/assets/Data/entity/objects/furniture.json @@ -112,18 +112,18 @@ }, { "id" : "Door1", - "displayName" : "Door", + "displayName" : "Door (Rough)", "collidable": { "type" : "CUBE", - "dimension1" : 1.0, - "dimension2" : 1.0, - "dimension3" : 2.0, + "dimension1" : 0.25, + "dimension2" : 2.6, + "dimension3" : 1.4, "rotX": 0, "rotY": 0, "rotZ": 0, "rotW": 1, "offsetX" : 0.0, - "offsetY" : 0.5, + "offsetY" : 1.3, "offsetZ" : 0.0, "kinematic" : true }, @@ -168,20 +168,7 @@ } }, "buttonInteraction" : { - "onInteract" : "door", - "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 - } + "onInteract" : "door" }, "gridAlignedData" : { "width" : 10, @@ -197,6 +184,80 @@ "FURNITURE" ] }, + { + "id" : "Door2", + "displayName" : "Door (Solid)", + "collidable": { + "type" : "CUBE", + "dimension1" : 0.25, + "dimension2" : 2.6, + "dimension3" : 1.4, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "rotW": 1, + "offsetX" : 0.0, + "offsetY" : 1.3, + "offsetZ" : 0.0, + "kinematic" : true + }, + "spawnItem" : { + "graphicsTemplate" : { + "model": { + "path" : "Models/objects/furniture/door2.glb" + } + }, + "recipe" : { + "craftingTag" : "HAND", + "ingredients": [ + { + "itemType": "mat:Log", + "count": 1 + } + ] + } + }, + "furnitureData" : { + "door" : { + "open" : { + "animation" : { + "nameThirdPerson": "Opened" + } + }, + "closed" : { + "animation" : { + "nameThirdPerson": "Closed" + } + }, + "opening" : { + "animation" : { + "nameThirdPerson": "Opening" + } + }, + "closing" : { + "animation" : { + "nameThirdPerson": "Closing" + } + } + } + }, + "buttonInteraction" : { + "onInteract" : "door" + }, + "gridAlignedData" : { + "width" : 1, + "height" : 8, + "length" : 4 + }, + "graphicsTemplate": { + "model": { + "path" : "Models/objects/furniture/door2.glb" + } + }, + "tokens": [ + "FURNITURE" + ] + }, { "id" : "chest1", "displayName" : "Chest", diff --git a/assets/Models/objects/furniture/EK_Pallete.png b/assets/Models/objects/furniture/EK_Pallete.png new file mode 100644 index 00000000..1e6ac7cc Binary files /dev/null and b/assets/Models/objects/furniture/EK_Pallete.png differ diff --git a/assets/Models/objects/furniture/door1.glb b/assets/Models/objects/furniture/door1.glb index 42558cd5..0721d0f7 100644 Binary files a/assets/Models/objects/furniture/door1.glb and b/assets/Models/objects/furniture/door1.glb differ diff --git a/assets/Models/objects/furniture/door2.glb b/assets/Models/objects/furniture/door2.glb new file mode 100644 index 00000000..bd59534b Binary files /dev/null and b/assets/Models/objects/furniture/door2.glb differ diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 7fdcc55a..b03341cf 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1885,6 +1885,7 @@ Roads applied to terrain voxel gen Support lack of macro data for chunk gens Support multichunk select all blocks More block types +New door furniture item