diff --git a/game/modules/species/Human/models/armature_huf.tscn b/game/modules/species/Human/models/armature_huf.tscn index 8c4dbcaa..e9fb8769 100644 --- a/game/modules/species/Human/models/armature_huf.tscn +++ b/game/modules/species/Human/models/armature_huf.tscn @@ -3,18 +3,18 @@ [ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=1] [ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2] [ext_resource path="res://modules/core/materials/3_standard_character_material.tres" type="Material" id=3] -[ext_resource path="res://modules/species/Human/models/dead.tres" type="ProceduralAnimation" id=4] +[ext_resource path="res://modules/species/Human/models/dead.tres" type="Animation" id=4] [ext_resource path="res://modules/species/Human/models/armature.gd" type="Script" id=5] [ext_resource path="res://modules/species/Human/models/armature.gltf" type="PackedScene" id=6] [ext_resource path="res://modules/core/materials/9_standard_character_material_notex.tres" type="Material" id=7] [ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8] -[ext_resource path="res://modules/species/Human/models/idle-loop.tres" type="ProceduralAnimation" id=9] -[ext_resource path="res://modules/species/Human/models/rest.tres" type="ProceduralAnimation" id=10] -[ext_resource path="res://modules/species/Human/models/cast-end.tres" type="ProceduralAnimation" id=11] -[ext_resource path="res://modules/species/Human/models/casting-loop.tres" type="ProceduralAnimation" id=12] -[ext_resource path="res://modules/species/Human/models/run-left-loop.tres" type="ProceduralAnimation" id=13] -[ext_resource path="res://modules/species/Human/models/run-right-loop.tres" type="ProceduralAnimation" id=14] -[ext_resource path="res://modules/species/Human/models/run-loop.tres" type="ProceduralAnimation" id=15] +[ext_resource path="res://modules/species/Human/models/idle-loop.tres" type="Animation" id=9] +[ext_resource path="res://modules/species/Human/models/rest.tres" type="Animation" id=10] +[ext_resource path="res://modules/species/Human/models/cast-end.tres" type="Animation" id=11] +[ext_resource path="res://modules/species/Human/models/casting-loop.tres" type="Animation" id=12] +[ext_resource path="res://modules/species/Human/models/run-left-loop.tres" type="Animation" id=13] +[ext_resource path="res://modules/species/Human/models/run-right-loop.tres" type="Animation" id=14] +[ext_resource path="res://modules/species/Human/models/run-loop.tres" type="Animation" id=15] [sub_resource type="AnimationNodeAnimation" id=1] animation = "cast-end" diff --git a/game/modules/species/Human/models/cast-end.tres b/game/modules/species/Human/models/cast-end.tres index dc57bdd2..431f3b59 100644 --- a/game/modules/species/Human/models/cast-end.tres +++ b/game/modules/species/Human/models/cast-end.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 3.0 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 40 diff --git a/game/modules/species/Human/models/casting-loop.tres b/game/modules/species/Human/models/casting-loop.tres index 84b5657a..28edb130 100644 --- a/game/modules/species/Human/models/casting-loop.tres +++ b/game/modules/species/Human/models/casting-loop.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 3.0 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1.5, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 3, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 20 diff --git a/game/modules/species/Human/models/dead.tres b/game/modules/species/Human/models/dead.tres index a5e75815..ac55fd0f 100644 --- a/game/modules/species/Human/models/dead.tres +++ b/game/modules/species/Human/models/dead.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] loop = true @@ -207,8 +205,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 30 diff --git a/game/modules/species/Human/models/idle-loop.tres b/game/modules/species/Human/models/idle-loop.tres index b49743b6..2e518c8f 100644 --- a/game/modules/species/Human/models/idle-loop.tres +++ b/game/modules/species/Human/models/idle-loop.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 3.0 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 40 diff --git a/game/modules/species/Human/models/rest.tres b/game/modules/species/Human/models/rest.tres index a4ca3ee6..45ff5c2e 100644 --- a/game/modules/species/Human/models/rest.tres +++ b/game/modules/species/Human/models/rest.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 0.001 @@ -207,8 +205,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 0 diff --git a/game/modules/species/Human/models/run-left-loop.tres b/game/modules/species/Human/models/run-left-loop.tres index ce04298e..bfd8cba1 100644 --- a/game/modules/species/Human/models/run-left-loop.tres +++ b/game/modules/species/Human/models/run-left-loop.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 0.8 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 50 diff --git a/game/modules/species/Human/models/run-loop.tres b/game/modules/species/Human/models/run-loop.tres index 8b0b510f..61752f0d 100644 --- a/game/modules/species/Human/models/run-loop.tres +++ b/game/modules/species/Human/models/run-loop.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 0.8 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 60 diff --git a/game/modules/species/Human/models/run-right-loop.tres b/game/modules/species/Human/models/run-right-loop.tres index 3660de93..e0363aa8 100644 --- a/game/modules/species/Human/models/run-right-loop.tres +++ b/game/modules/species/Human/models/run-right-loop.tres @@ -1,6 +1,4 @@ -[gd_resource type="ProceduralAnimation" load_steps=2 format=2] - -[ext_resource path="res://modules/species/Human/models/animations.tres" type="Animation" id=1] +[gd_resource type="Animation" format=2] [resource] length = 0.8 @@ -208,8 +206,6 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -animation = ExtResource( 1 ) -animation_fps = 30 start_frame_index = 0 keyframe/0/name = "" keyframe/0/animation_keyframe_index = 70