From 316364ad5a8ba1a99a634dc1f30fae5d5444b1c1 Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 23 Nov 2024 17:34:35 -0500 Subject: [PATCH] data changes --- assets/Data/entity/creatures/human.json | 4 ++-- assets/Data/entity/foliage.json | 16 ++++++++++++++++ docs/src/progress/renderertodo.md | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/assets/Data/entity/creatures/human.json b/assets/Data/entity/creatures/human.json index c9b0b5e3..fe2c956a 100644 --- a/assets/Data/entity/creatures/human.json +++ b/assets/Data/entity/creatures/human.json @@ -514,8 +514,8 @@ "hitstun" : 7, "attackState" : { "animation" : { - "nameFirstPerson" : "SwordR2HSlash", - "nameThirdPerson" : "SwordR2HSlash", + "nameFirstPerson" : "SwordR2HSlash1", + "nameThirdPerson" : "SwordR2HSlash1", "priorityCategory" : "MOVEMENT_MODIFIER", "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"] }, diff --git a/assets/Data/entity/foliage.json b/assets/Data/entity/foliage.json index 1203294b..62e27643 100644 --- a/assets/Data/entity/foliage.json +++ b/assets/Data/entity/foliage.json @@ -189,6 +189,22 @@ "radius": 0.175 } ], + "collidable" : { + "type" : "CYLINDER", + "dimension1" : 0.2, + "dimension2" : 1.6, + "dimension3" : 0.2, + "linearFriction": 0.001, + "mass": 0.3, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "rotW": 1, + "offsetX" : 0, + "offsetY" : 0.8, + "offsetZ" : 0, + "kinematic" : true + }, "healthSystem" : { "maxHealth" : 50, "onDamageIFrames" : 5, diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 32dddfa5..cb91ee6b 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1138,6 +1138,8 @@ Dedicated control for opening crafting Break out network imgui debug window Move text files to documentation pages 1000th commit milestone! +Pine tree collidables +Fix human animation bad data # TODO