diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Hard A.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Hard A.wav new file mode 100644 index 00000000..565d638f Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Hard A.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Hard B.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Hard B.wav new file mode 100644 index 00000000..d969fdd4 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Hard B.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Hard C.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Hard C.wav new file mode 100644 index 00000000..2e7cc210 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Hard C.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Hard D.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Hard D.wav new file mode 100644 index 00000000..f5eb0992 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Hard D.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Hard E.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Hard E.wav new file mode 100644 index 00000000..bc878d4e Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Hard E.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Medium A.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Medium A.wav new file mode 100644 index 00000000..51192688 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Medium A.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Medium B.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Medium B.wav new file mode 100644 index 00000000..8298bc4f Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Medium B.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Medium C.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Medium C.wav new file mode 100644 index 00000000..bd1637ee Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Medium C.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Medium D.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Medium D.wav new file mode 100644 index 00000000..6d3ce70a Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Medium D.wav differ diff --git a/assets/Audio/movement/surface/snow/Bare Step Snow Medium E.wav b/assets/Audio/movement/surface/snow/Bare Step Snow Medium E.wav new file mode 100644 index 00000000..24370ba1 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Bare Step Snow Medium E.wav differ diff --git a/assets/Audio/movement/surface/snow/Jump Step Snow A.wav b/assets/Audio/movement/surface/snow/Jump Step Snow A.wav new file mode 100644 index 00000000..87492b62 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Jump Step Snow A.wav differ diff --git a/assets/Audio/movement/surface/snow/Jump Step Snow B.wav b/assets/Audio/movement/surface/snow/Jump Step Snow B.wav new file mode 100644 index 00000000..b615cb23 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Jump Step Snow B.wav differ diff --git a/assets/Audio/movement/surface/snow/Land Step Snow A.wav b/assets/Audio/movement/surface/snow/Land Step Snow A.wav new file mode 100644 index 00000000..45ed8254 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Land Step Snow A.wav differ diff --git a/assets/Audio/movement/surface/snow/Land Step Snow B.wav b/assets/Audio/movement/surface/snow/Land Step Snow B.wav new file mode 100644 index 00000000..51ebe4fd Binary files /dev/null and b/assets/Audio/movement/surface/snow/Land Step Snow B.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Hard A.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard A.wav new file mode 100644 index 00000000..39c1bebf Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard A.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Hard B.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard B.wav new file mode 100644 index 00000000..f498f089 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard B.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Hard C.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard C.wav new file mode 100644 index 00000000..ca05de8a Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard C.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Hard D.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard D.wav new file mode 100644 index 00000000..509ff53d Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard D.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Hard E.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard E.wav new file mode 100644 index 00000000..ca72be54 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Hard E.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Medium A.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium A.wav new file mode 100644 index 00000000..cd0296e1 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium A.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Medium B.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium B.wav new file mode 100644 index 00000000..d503179d Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium B.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Medium C.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium C.wav new file mode 100644 index 00000000..e3b8712a Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium C.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Medium D.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium D.wav new file mode 100644 index 00000000..0e53b50a Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium D.wav differ diff --git a/assets/Audio/movement/surface/snow/Shoe Step Snow Medium E.wav b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium E.wav new file mode 100644 index 00000000..f92c3e63 Binary files /dev/null and b/assets/Audio/movement/surface/snow/Shoe Step Snow Medium E.wav differ diff --git a/assets/Data/audio/surface.json b/assets/Data/audio/surface.json index 7ac4bb21..9ff1c419 100644 --- a/assets/Data/audio/surface.json +++ b/assets/Data/audio/surface.json @@ -160,6 +160,45 @@ "Audio/movement/surface/stone/Land Step Stone A.wav", "Audio/movement/surface/stone/Land Step Stone B.wav" ] + }, + { + "voxelTypeIds" : [5], + "footstepRegularBareAudioPaths" : [ + "Audio/movement/surface/snow/Bare Step Snow Medium A.wav", + "Audio/movement/surface/snow/Bare Step Snow Medium B.wav", + "Audio/movement/surface/snow/Bare Step Snow Medium C.wav", + "Audio/movement/surface/snow/Bare Step Snow Medium D.wav", + "Audio/movement/surface/snow/Bare Step Snow Medium E.wav" + ], + "footstepHeavyBareAudioPaths" : [ + "Audio/movement/surface/snow/Bare Step Snow Hard A.wav", + "Audio/movement/surface/snow/Bare Step Snow Hard B.wav", + "Audio/movement/surface/snow/Bare Step Snow Hard C.wav", + "Audio/movement/surface/snow/Bare Step Snow Hard D.wav", + "Audio/movement/surface/snow/Bare Step Snow Hard E.wav" + ], + "footstepRegularShoeAudioPaths" : [ + "Audio/movement/surface/snow/Shoe Step Snow Medium A.wav", + "Audio/movement/surface/snow/Shoe Step Snow Medium B.wav", + "Audio/movement/surface/snow/Shoe Step Snow Medium C.wav", + "Audio/movement/surface/snow/Shoe Step Snow Medium D.wav", + "Audio/movement/surface/snow/Shoe Step Snow Medium E.wav" + ], + "footstepHeavyShoeAudioPaths" : [ + "Audio/movement/surface/snow/Shoe Step Snow Hard A.wav", + "Audio/movement/surface/snow/Shoe Step Snow Hard B.wav", + "Audio/movement/surface/snow/Shoe Step Snow Hard C.wav", + "Audio/movement/surface/snow/Shoe Step Snow Hard D.wav", + "Audio/movement/surface/snow/Shoe Step Snow Hard E.wav" + ], + "jumpAudioPaths" : [ + "Audio/movement/surface/snow/Jump Step Snow A.wav", + "Audio/movement/surface/snow/Jump Step Snow B.wav" + ], + "landAudioPaths" : [ + "Audio/movement/surface/snow/Land Step Snow A.wav", + "Audio/movement/surface/snow/Land Step Snow B.wav" + ] } ] } \ No newline at end of file diff --git a/assets/Data/game/voxelTypes.json b/assets/Data/game/voxelTypes.json index aae488bc..77981a1e 100644 --- a/assets/Data/game/voxelTypes.json +++ b/assets/Data/game/voxelTypes.json @@ -26,6 +26,11 @@ "id" : 4, "name" : "stonepath", "texture" : "/Textures/Ground/stone1_256.png" + }, + { + "id" : 5, + "name" : "snow", + "texture" : "/Textures/Ground/snow1_256.jpg" } ] } \ No newline at end of file diff --git a/assets/Textures/Ground/snow1_256.jpg b/assets/Textures/Ground/snow1_256.jpg new file mode 100644 index 00000000..5ef82639 Binary files /dev/null and b/assets/Textures/Ground/snow1_256.jpg differ diff --git a/docs/src/highlevel-design/creatures/individual/humanprogress.md b/docs/src/highlevel-design/creatures/individual/humanprogress.md index b897db6c..c7867c04 100644 --- a/docs/src/highlevel-design/creatures/individual/humanprogress.md +++ b/docs/src/highlevel-design/creatures/individual/humanprogress.md @@ -20,15 +20,15 @@ Progress on the human creature - [ ] Swim - [X] Interact - [X] InteractChannel - - [ ] Eat + - [X] Eat - Humanoid - [X] CrouchIdle - - [ ] CrouchStart - - [ ] CrouchGetup - - [ ] CrouchWalk - - [ ] CrouchStrafeLeft - - [ ] CrouchStrafeRight - - [ ] CrouchJump + - [X] CrouchStart + - [x] CrouchGetup + - [X] CrouchWalk + - [X] CrouchStrafeLeft + - [X] CrouchStrafeRight + - [X] CrouchJump - [ ] ClimbIdle - [ ] ClimbUp - [ ] ClimbLeft @@ -36,7 +36,8 @@ Progress on the human creature - [ ] ClimbRight - [ ] PushingItem - [X] Sit (Ground) - - [ ] Sit (Chair) + - [X] Sit (Chair) + - [X] Sleep - [X] HoldItemRH - [X] HoldItemLH - [X] HoldItemR2H @@ -89,6 +90,10 @@ Progress on the human creature - [X] ShieldLHRaise - [X] ShieldLHBlock - [X] ShieldLHLower + - Magic + - [ ] CastWeaveTwoHands + - [ ] CastChannelTwoHands + - [ ] CastInstantRight - Vehicles - [ ] Ride Horse - [ ] Ride Wagon diff --git a/docs/src/highlevel-design/creatures/individual/skeletonprogress.md b/docs/src/highlevel-design/creatures/individual/skeletonprogress.md index 6fc502da..9e181376 100644 --- a/docs/src/highlevel-design/creatures/individual/skeletonprogress.md +++ b/docs/src/highlevel-design/creatures/individual/skeletonprogress.md @@ -37,6 +37,7 @@ Progress on the skeleton creature - [ ] PushingItem - [X] Sit (Ground) - [ ] Sit (Chair) + - [ ] Sleep - [X] HoldItemRH - [X] HoldItemLH - [X] HoldItemR2H @@ -89,6 +90,10 @@ Progress on the skeleton creature - [X] ShieldLHRaise - [X] ShieldLHBlock - [X] ShieldLHLower + - Magic + - [ ] CastWeaveTwoHands + - [ ] CastChannelTwoHands + - [ ] CastInstantRight - Vehicles - [ ] Ride Horse - [ ] Ride Wagon diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index b252d8fc..faac5880 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -9,11 +9,11 @@ Script engine ability to spawn entities + rearchitecture - Particles and particle manager + fix the vibes - Hitstun Ticketed randomizer node for BTs to more heavily weight attacking and waiting + Lots of crates causes lag + - Physics thread time exploding -- need to sleep bodies + feedback driven requirements Item/Equip overhaul (again) @@ -37,7 +37,7 @@ Fix lights not being deleted - Not sending a "light count" var to light calculations, so the data stays in buffer even though it is not being updated Fix static friction coeff causing player to slide on shallow slopes - - Probably need to look into using capsules + - Probably need to look into using capsules and cranking up friction value on said capsule Fix block tree preventing initiating an attack Fix return to title menu synchronization bug diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index d72902b0..3cdb8f91 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -826,6 +826,10 @@ Fix ui elements not storing default discrete world size on level editor menu Fix skeleton right strafe Fix ui audio playing at world origin +(09/21/2024) +Snow voxel type +Move animation work + # TODO