From 25d21ceb9e64a9fdf8029f7804c6fe2631fc55f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Mart=C3=ADnez=20Palacio?= Date: Sun, 27 Oct 2024 13:09:59 +0100 Subject: [PATCH] Fix animations for Hiro and Reed --- Hiro/hiro_animation.tres | 16 ++++++++-------- Hiro/hiro_player.tscn | 4 ++-- Reed/reed_ai.tscn | 8 ++++---- Reed/reed_animation.tres | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Hiro/hiro_animation.tres b/Hiro/hiro_animation.tres index febec1a..e3dea5f 100644 --- a/Hiro/hiro_animation.tres +++ b/Hiro/hiro_animation.tres @@ -571,50 +571,50 @@ length = 0.3 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite2D:hframes") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [10] +"values": [20] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/path = NodePath("Sprite2D:vframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [20] +"values": [1] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/path = NodePath("Sprite2D:texture") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [ExtResource("1_hc7kj")] } tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:texture") +tracks/3/path = NodePath("Sprite2D:frame") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [10] } [sub_resource type="Animation" id="Animation_x2yda"] diff --git a/Hiro/hiro_player.tscn b/Hiro/hiro_player.tscn index 8fdefc3..4ed8970 100644 --- a/Hiro/hiro_player.tscn +++ b/Hiro/hiro_player.tscn @@ -245,7 +245,7 @@ states/nsfw_defeated_start/position = Vector2(646, 176.354) states/walk/node = SubResource("AnimationNodeBlendSpace2D_vunsg") states/walk/position = Vector2(520, 108) transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_akmuq"), "idle", "walk", SubResource("AnimationNodeStateMachineTransition_sn1tm"), "walk", "idle", SubResource("AnimationNodeStateMachineTransition_5i3fu"), "idle", "melee", SubResource("AnimationNodeStateMachineTransition_y8p74"), "melee", "idle", SubResource("AnimationNodeStateMachineTransition_l17k0"), "hurt", "idle", SubResource("AnimationNodeStateMachineTransition_ln3pc"), "defeated", "End", SubResource("AnimationNodeStateMachineTransition_ouche"), "nsfw_defeated_start", "nsfw_defeated", SubResource("AnimationNodeStateMachineTransition_aa2bq"), "nsfw_defeated", "End", SubResource("AnimationNodeStateMachineTransition_vxker")] -graph_offset = Vector2(-53, -43.6459) +graph_offset = Vector2(-63, 40.3541) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"] radius = 9.0 @@ -280,7 +280,7 @@ parameters/conditions/is_moving = false parameters/conditions/melee = false parameters/cut_walk/blend_position = Vector2(-0.770558, 0.612335) parameters/hurt/blend_position = Vector2(0.000877976, -0.756614) -parameters/idle/blend_position = Vector2(0.00263393, -0.830688) +parameters/idle/blend_position = Vector2(0.0153847, -0.481481) parameters/melee/blend_position = 0.0 parameters/melee/0/blend_position = Vector2(0.66778, -0.765217) parameters/melee/1/blend_position = Vector2(-0.218698, 0.0434783) diff --git a/Reed/reed_ai.tscn b/Reed/reed_ai.tscn index 61b1d60..8fd4689 100644 --- a/Reed/reed_ai.tscn +++ b/Reed/reed_ai.tscn @@ -236,7 +236,7 @@ states/melee/position = Vector2(329, 224) states/walk/node = SubResource("AnimationNodeBlendSpace2D_vunsg") states/walk/position = Vector2(519, 108) transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_akmuq"), "idle", "walk", SubResource("AnimationNodeStateMachineTransition_sn1tm"), "walk", "idle", SubResource("AnimationNodeStateMachineTransition_5i3fu"), "idle", "melee", SubResource("AnimationNodeStateMachineTransition_y8p74"), "melee", "idle", SubResource("AnimationNodeStateMachineTransition_l17k0"), "hurt", "idle", SubResource("AnimationNodeStateMachineTransition_ln3pc"), "defeated", "defeated_loop", SubResource("AnimationNodeStateMachineTransition_l5ng5")] -graph_offset = Vector2(-82, 74) +graph_offset = Vector2(-62, -29) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"] radius = 9.0 @@ -281,13 +281,13 @@ tree_root = SubResource("AnimationNodeStateMachine_b0avg") parameters/conditions/is_moving = false parameters/conditions/melee = false parameters/cut_walk/blend_position = Vector2(0.116751, -1.05556) -parameters/hurt/blend_position = Vector2(-0.0114135, 0.915344) -parameters/idle/blend_position = Vector2(0.0201931, 0.968254) +parameters/hurt/blend_position = Vector2(0, -0.873016) +parameters/idle/blend_position = Vector2(-0.0197802, 0.62963) parameters/melee/blend_position = 0.0 parameters/melee/0/blend_position = Vector2(0.000877976, 0.862434) parameters/melee/1/blend_position = Vector2(-0.218698, 0.0434783) parameters/melee/2/blend_position = Vector2(0, 0) -parameters/walk/blend_position = Vector2(-0.00790167, 0.78836) +parameters/walk/blend_position = Vector2(-0.0021978, 0.78836) [node name="Hitbox" type="Area2D" parent="."] position = Vector2(0, 1) diff --git a/Reed/reed_animation.tres b/Reed/reed_animation.tres index acd237a..8ca0aa3 100644 --- a/Reed/reed_animation.tres +++ b/Reed/reed_animation.tres @@ -1941,50 +1941,50 @@ step = 0.125 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite2D:hframes") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.125, 0.25, 0.375), -"transitions": PackedFloat32Array(1, 1, 1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [11, 12, 13, 14] +"values": [20] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/path = NodePath("Sprite2D:vframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [20] +"values": [1] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/path = NodePath("Sprite2D:texture") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [ExtResource("1_4xts1")] } tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:texture") +tracks/3/path = NodePath("Sprite2D:frame") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.125, 0.25, 0.375), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 1, -"values": [ExtResource("1_4xts1")] +"values": [11, 12, 13, 14] } [sub_resource type="Animation" id="Animation_sroq6"]