From b549f908bbeb9500461bfec7ce14e6b832254373 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 1 Mar 2022 19:12:12 +0100 Subject: [PATCH] Now the character animations won't mess with the z-index, and show behind parent properties. --- .../characters/CharacterFrontModel.tscn | 291 +----------------- .../characters/CharacterSideModel.tscn | 44 +-- 2 files changed, 6 insertions(+), 329 deletions(-) diff --git a/game/sprites/characters/CharacterFrontModel.tscn b/game/sprites/characters/CharacterFrontModel.tscn index d421e9d..99337ab 100644 --- a/game/sprites/characters/CharacterFrontModel.tscn +++ b/game/sprites/characters/CharacterFrontModel.tscn @@ -463,18 +463,6 @@ tracks/37/keys = { "update": 0, "values": [ 0.0, 0.0, 0.0 ] } -tracks/38/type = "value" -tracks/38/path = NodePath("Hip/Torso/arm_l/hand_l:z_index") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0, 1.5, 2 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 1, -"values": [ 1, 1, 1 ] -} [sub_resource type="Animation" id=2] resource_name = "idle" @@ -936,102 +924,6 @@ tracks/37/keys = { "update": 0, "values": [ 0.0, 0.0, 0.0 ] } -tracks/38/type = "value" -tracks/38/path = NodePath("Hip/Torso/arm_l/hand_l:show_behind_parent") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/39/type = "value" -tracks/39/path = NodePath("Hip/Torso/arm_l:show_behind_parent") -tracks/39/interp = 1 -tracks/39/loop_wrap = true -tracks/39/imported = false -tracks/39/enabled = true -tracks/39/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/40/type = "value" -tracks/40/path = NodePath("Hip/Torso/remote_arm_r:show_behind_parent") -tracks/40/interp = 1 -tracks/40/loop_wrap = true -tracks/40/imported = false -tracks/40/enabled = true -tracks/40/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/41/type = "value" -tracks/41/path = NodePath("Hip/Torso/remote_arm_r/remote_hand_r:show_behind_parent") -tracks/41/interp = 1 -tracks/41/loop_wrap = true -tracks/41/imported = false -tracks/41/enabled = true -tracks/41/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/42/type = "value" -tracks/42/path = NodePath("Hip/Torso/leg_r/foot_r:show_behind_parent") -tracks/42/interp = 1 -tracks/42/loop_wrap = true -tracks/42/imported = false -tracks/42/enabled = true -tracks/42/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/43/type = "value" -tracks/43/path = NodePath("Hip/Torso/leg_r:show_behind_parent") -tracks/43/interp = 1 -tracks/43/loop_wrap = true -tracks/43/imported = false -tracks/43/enabled = true -tracks/43/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/44/type = "value" -tracks/44/path = NodePath("Hip/Torso/leg_l:show_behind_parent") -tracks/44/interp = 1 -tracks/44/loop_wrap = true -tracks/44/imported = false -tracks/44/enabled = true -tracks/44/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/45/type = "value" -tracks/45/path = NodePath("Hip/Torso/leg_l/foot_l:show_behind_parent") -tracks/45/interp = 1 -tracks/45/loop_wrap = true -tracks/45/imported = false -tracks/45/enabled = true -tracks/45/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} [sub_resource type="Animation" id=3] tracks/0/type = "value" @@ -1490,90 +1382,6 @@ tracks/37/keys = { "update": 0, "values": [ 0.0 ] } -tracks/38/type = "value" -tracks/38/path = NodePath("Hip/Torso/leg_l/foot_l:show_behind_parent") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/39/type = "value" -tracks/39/path = NodePath("Hip/Torso/leg_r:show_behind_parent") -tracks/39/interp = 1 -tracks/39/loop_wrap = true -tracks/39/imported = false -tracks/39/enabled = true -tracks/39/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/40/type = "value" -tracks/40/path = NodePath("Hip/Torso/leg_l:show_behind_parent") -tracks/40/interp = 1 -tracks/40/loop_wrap = true -tracks/40/imported = false -tracks/40/enabled = true -tracks/40/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/41/type = "value" -tracks/41/path = NodePath("Hip/Torso/remote_arm_r/remote_hand_r:show_behind_parent") -tracks/41/interp = 1 -tracks/41/loop_wrap = true -tracks/41/imported = false -tracks/41/enabled = true -tracks/41/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/42/type = "value" -tracks/42/path = NodePath("Hip/Torso/remote_arm_r:show_behind_parent") -tracks/42/interp = 1 -tracks/42/loop_wrap = true -tracks/42/imported = false -tracks/42/enabled = true -tracks/42/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/43/type = "value" -tracks/43/path = NodePath("Hip/Torso/arm_l:show_behind_parent") -tracks/43/interp = 1 -tracks/43/loop_wrap = true -tracks/43/imported = false -tracks/43/enabled = true -tracks/43/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/44/type = "value" -tracks/44/path = NodePath("Hip/Torso/arm_l/hand_l:show_behind_parent") -tracks/44/interp = 1 -tracks/44/loop_wrap = true -tracks/44/imported = false -tracks/44/enabled = true -tracks/44/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} [sub_resource type="Animation" id=4] loop = true @@ -2034,102 +1842,6 @@ tracks/37/keys = { "update": 0, "values": [ 0.0, 0.0 ] } -tracks/38/type = "value" -tracks/38/path = NodePath("Hip/Torso/arm_l/hand_l:show_behind_parent") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, true ] -} -tracks/39/type = "value" -tracks/39/path = NodePath("Hip/Torso/arm_l:show_behind_parent") -tracks/39/interp = 1 -tracks/39/loop_wrap = true -tracks/39/imported = false -tracks/39/enabled = true -tracks/39/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, true ] -} -tracks/40/type = "value" -tracks/40/path = NodePath("Hip/Torso/remote_arm_r/remote_hand_r:show_behind_parent") -tracks/40/interp = 1 -tracks/40/loop_wrap = true -tracks/40/imported = false -tracks/40/enabled = true -tracks/40/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1, 1.2 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ false, true, false, false, true ] -} -tracks/41/type = "value" -tracks/41/path = NodePath("Hip/Torso/remote_arm_r:show_behind_parent") -tracks/41/interp = 1 -tracks/41/loop_wrap = true -tracks/41/imported = false -tracks/41/enabled = true -tracks/41/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1, 1.2 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ false, true, false, false, true ] -} -tracks/42/type = "value" -tracks/42/path = NodePath("Hip/Torso/leg_l/foot_l:show_behind_parent") -tracks/42/interp = 1 -tracks/42/loop_wrap = true -tracks/42/imported = false -tracks/42/enabled = true -tracks/42/keys = { -"times": PoolRealArray( 0, 0.25, 1 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 1, -"values": [ false, true, false ] -} -tracks/43/type = "value" -tracks/43/path = NodePath("Hip/Torso/leg_l:show_behind_parent") -tracks/43/interp = 1 -tracks/43/loop_wrap = true -tracks/43/imported = false -tracks/43/enabled = true -tracks/43/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ false, true, false, false ] -} -tracks/44/type = "value" -tracks/44/path = NodePath("Hip/Torso/leg_r:show_behind_parent") -tracks/44/interp = 1 -tracks/44/loop_wrap = true -tracks/44/imported = false -tracks/44/enabled = true -tracks/44/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, true ] -} -tracks/45/type = "value" -tracks/45/path = NodePath("Hip/Torso/leg_r/foot_r:show_behind_parent") -tracks/45/interp = 1 -tracks/45/loop_wrap = true -tracks/45/imported = false -tracks/45/enabled = true -tracks/45/keys = { -"times": PoolRealArray( 0, 0.25, 0.75, 1 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, true ] -} [sub_resource type="AnimationNodeTimeScale" id=5] @@ -2191,7 +1903,7 @@ region_enabled = true region_rect = Rect2( 27, 57, 14, 6 ) [node name="Torso" type="Sprite" parent="Hip"] -position = Vector2( 0, -2.24034 ) +position = Vector2( 0, -2.23822 ) texture = ExtResource( 1 ) offset = Vector2( 0, -5 ) region_enabled = true @@ -2306,6 +2018,7 @@ __meta__ = { [node name="hand_l" type="Sprite" parent="Hip/Torso/arm_l"] position = Vector2( 0, 6 ) scale = Vector2( 0.995, 1.0113 ) +z_index = 1 texture = ExtResource( 1 ) offset = Vector2( 0, 2 ) region_enabled = true diff --git a/game/sprites/characters/CharacterSideModel.tscn b/game/sprites/characters/CharacterSideModel.tscn index 5066a96..c0df0fb 100644 --- a/game/sprites/characters/CharacterSideModel.tscn +++ b/game/sprites/characters/CharacterSideModel.tscn @@ -463,30 +463,6 @@ tracks/37/keys = { "update": 0, "values": [ 0.0, 0.0, 0.0 ] } -tracks/38/type = "value" -tracks/38/path = NodePath("hand_r:z_index") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0, 1.5, 2 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 1, -"values": [ 1, 1, 1 ] -} -tracks/39/type = "value" -tracks/39/path = NodePath("Hip/Torso/arm_l/hand_l:z_index") -tracks/39/interp = 1 -tracks/39/loop_wrap = true -tracks/39/imported = false -tracks/39/enabled = true -tracks/39/keys = { -"times": PoolRealArray( 0, 1.5, 2 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 1, -"values": [ 1, 1, 1 ] -} [sub_resource type="Animation" id=2] resource_name = "idle" @@ -948,18 +924,6 @@ tracks/37/keys = { "update": 0, "values": [ Vector2( 0, -14 ), Vector2( 0, -14 ), Vector2( 0, -14 ) ] } -tracks/38/type = "value" -tracks/38/path = NodePath("hand_r:z_index") -tracks/38/interp = 1 -tracks/38/loop_wrap = true -tracks/38/imported = false -tracks/38/enabled = true -tracks/38/keys = { -"times": PoolRealArray( 0, 2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ 0, 0 ] -} [sub_resource type="Animation" id=3] tracks/0/type = "value" @@ -1899,7 +1863,7 @@ nodes/run/node = SubResource( 7 ) nodes/run/position = Vector2( -280, 500 ) nodes/walking/node = SubResource( 8 ) nodes/walking/position = Vector2( 140, 320 ) -node_connections = [ "output", 0, "walking", "walking", 0, "idle", "walking", 1, "RunScale", "RunScale", 0, "run" ] +node_connections = [ "output", 0, "walking", "RunScale", 0, "run", "walking", 0, "idle", "walking", 1, "RunScale" ] [node name="CharacterSideModel" type="CharacterBones"] rotation = 0.000121465 @@ -1926,14 +1890,14 @@ HUMANOID_BONES_MAX = 16," bones = [ NodePath("Hip"), NodePath("Hip/Torso"), NodePath("Hip/leg_r"), NodePath("Hip/leg_r/foot_r"), NodePath("Hip/leg_r/foot_r/Position2D"), NodePath("Hip/leg_l"), NodePath("Hip/leg_l/foot_l"), NodePath("Hip/leg_l/foot_l/Position2D"), NodePath("arm_r"), NodePath("hand_r"), NodePath("Hip/Torso/remote_arm_r/remote_hand_r/Position2D"), NodePath("Hip/Torso/arm_l"), NodePath("Hip/Torso/arm_l/hand_l"), NodePath("Hip/Torso/arm_l/hand_l/end"), NodePath("Hip/Torso/Head"), NodePath("Hip/Torso/Head/Position2D") ] [node name="arm_r" type="Sprite" parent="."] -position = Vector2( -3.50002, -24.4539 ) +position = Vector2( -3.5, -24.3147 ) texture = ExtResource( 1 ) offset = Vector2( 0, 3 ) region_enabled = true region_rect = Rect2( 1, 11, 4, 9 ) [node name="hand_r" type="Sprite" parent="."] -position = Vector2( -3.50002, -18.9539 ) +position = Vector2( -3.5, -18.8147 ) texture = ExtResource( 1 ) offset = Vector2( 0, 3 ) region_enabled = true @@ -2008,7 +1972,7 @@ __meta__ = { } [node name="Torso" type="Sprite" parent="Hip"] -position = Vector2( 1.96303e-05, -1.83837 ) +position = Vector2( 3.65245e-05, -1.69926 ) texture = ExtResource( 1 ) offset = Vector2( 0, -5 ) region_enabled = true