From 2b88ea97ac0f9df33c2b572b47bc47eae72f3f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Mart=C3=ADnez=20Palacio?= Date: Tue, 3 Sep 2024 15:57:24 +0200 Subject: [PATCH] Update to Godot 4.3 --- Hiro/hiro_player.tscn | 1232 ++++++++++++++++++++++++---------------- Scripts/hiro_player.gd | 25 +- Scripts/reed_player.gd | 2 +- project.godot | 20 +- 4 files changed, 783 insertions(+), 496 deletions(-) diff --git a/Hiro/hiro_player.tscn b/Hiro/hiro_player.tscn index 9ce284a..ca6084b 100644 --- a/Hiro/hiro_player.tscn +++ b/Hiro/hiro_player.tscn @@ -1,97 +1,10 @@ -[gd_scene load_steps=72 format=3 uid="uid://di21xheryhp0k"] +[gd_scene load_steps=74 format=3 uid="uid://di21xheryhp0k"] [ext_resource type="Script" path="res://Scripts/hiro_player.gd" id="1_dtymi"] [ext_resource type="Texture2D" uid="uid://cm7tgomrcvq30" path="res://Hiro/Hiro Walk Sprite Cycle Line Up.png" id="1_ukwcc"] [ext_resource type="Texture2D" uid="uid://bio3egs7q7wog" path="res://Hiro/Hiro Melee Sprites.png" id="2_d32ue"] [ext_resource type="Texture2D" uid="uid://rcidedgcjqg6" path="res://Hiro/Hiro Hurt Sprites.png" id="4_sooc4"] -[sub_resource type="Animation" id="Animation_04piu"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:texture") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [ExtResource("1_ukwcc")] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:hframes") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [20] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:vframes") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [1] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Attackbox/Collider:position") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(0, -10)] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:disabled") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - [sub_resource type="Animation" id="Animation_kvnht"] resource_name = "hurt_east" length = 0.500013 @@ -144,6 +57,18 @@ tracks/3/keys = { "update": 1, "values": [6, 7, 8, 9] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_fytkh"] resource_name = "hurt_north" @@ -197,6 +122,18 @@ tracks/3/keys = { "update": 1, "values": [10, 11, 12, 13] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_lw5of"] resource_name = "hurt_south" @@ -250,6 +187,18 @@ tracks/3/keys = { "update": 1, "values": [1, 2, 3, 4] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_htnmm"] resource_name = "hurt_west" @@ -303,6 +252,18 @@ tracks/3/keys = { "update": 1, "values": [16, 17, 18, 19] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_3oagy"] resource_name = "idle_east" @@ -311,7 +272,7 @@ tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:frame") -tracks/0/interp = 1 +tracks/0/interp = 0 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), @@ -323,7 +284,7 @@ tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:hframes") -tracks/1/interp = 1 +tracks/1/interp = 0 tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), @@ -335,7 +296,7 @@ tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true tracks/2/path = NodePath("Sprite2D:vframes") -tracks/2/interp = 1 +tracks/2/interp = 0 tracks/2/loop_wrap = true tracks/2/keys = { "times": PackedFloat32Array(0), @@ -347,7 +308,7 @@ tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true tracks/3/path = NodePath("Sprite2D:texture") -tracks/3/interp = 1 +tracks/3/interp = 0 tracks/3/loop_wrap = true tracks/3/keys = { "times": PackedFloat32Array(0), @@ -355,6 +316,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_pjwlc"] resource_name = "idle_north" @@ -407,6 +380,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_x2yda"] resource_name = "idle_south" @@ -459,6 +444,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_w1ari"] resource_name = "idle_west" @@ -511,11 +508,22 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_ji461"] resource_name = "kick_east" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -524,10 +532,10 @@ tracks/0/path = NodePath("Sprite2D:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.266667), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [ExtResource("2_d32ue")] +"values": [ExtResource("2_d32ue"), ExtResource("2_d32ue")] } tracks/1/type = "value" tracks/1/imported = false @@ -536,10 +544,10 @@ tracks/1/path = NodePath("Sprite2D:hframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.266667), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [13] +"values": [13, 13] } tracks/2/type = "value" tracks/2/imported = false @@ -548,10 +556,10 @@ tracks/2/path = NodePath("Sprite2D:vframes") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.266667), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [4] +"values": [4, 4] } tracks/3/type = "value" tracks/3/imported = false @@ -569,7 +577,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -601,11 +609,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(12, -11), Vector2(-0.00060463, -11)] } +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_cuaji"] resource_name = "kick_north" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -659,7 +678,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -691,11 +710,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(0, -30), Vector2(12, -11), Vector2(0, -30), Vector2(-0.00060463, -11)] } +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_hqga6"] resource_name = "kick_south" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -749,7 +779,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -781,11 +811,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(0, 2), Vector2(12, -11), Vector2(0, 2), Vector2(-0.00060463, -11)] } +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_s8xim"] resource_name = "kick_west" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -839,7 +880,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -871,11 +912,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(-12, -11), Vector2(-0.00060463, -11)] } +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_o0diw"] resource_name = "punch_east_left" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -929,7 +981,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -961,101 +1013,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(12, -11), Vector2(-0.00060463, -11)] } - -[sub_resource type="Animation" id="Animation_ar6r3"] -resource_name = "punch_east_rigth" -length = 0.266673 -loop_mode = 1 -step = 0.0666667 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("2_d32ue")] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [13] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [4] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:frame") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [14, 15, 16, 17] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0.266667), -"transitions": PackedFloat32Array(1), -"update": 1, "values": [false] } -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Attackbox/Collider:disabled") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [true, false, true] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [Vector2(0, -11), Vector2(12, -11), Vector2(-0.00060463, -11)] -} [sub_resource type="Animation" id="Animation_1e0v6"] resource_name = "punch_north_left" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -1109,7 +1082,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -1141,101 +1114,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(0, -30), Vector2(12, -11), Vector2(0, -30), Vector2(-0.00060463, -11)] } - -[sub_resource type="Animation" id="Animation_bwm5c"] -resource_name = "punch_north_rigth" -length = 0.266673 -loop_mode = 1 -step = 0.0666667 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("2_d32ue")] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [13] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [4] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:frame") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [27, 28, 29, 30] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0.266667), -"transitions": PackedFloat32Array(1), -"update": 1, "values": [false] } -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Attackbox/Collider:disabled") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [true, false, true] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), -"update": 1, -"values": [Vector2(0, -11), Vector2(0, -30), Vector2(12, -11), Vector2(0, -30), Vector2(-0.00060463, -11)] -} [sub_resource type="Animation" id="Animation_qmuik"] resource_name = "punch_south_left" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -1321,101 +1215,22 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(0, 2), Vector2(12, -11), Vector2(0, 2), Vector2(-0.00060463, -11)] } - -[sub_resource type="Animation" id="Animation_bw220"] -resource_name = "punch_south_rigth" -length = 0.266673 -loop_mode = 1 -step = 0.0666667 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("2_d32ue")] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [13] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [4] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:frame") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [1, 2, 3, 4] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0.266667), -"transitions": PackedFloat32Array(1), -"update": 1, "values": [false] } -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Attackbox/Collider:disabled") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [true, false, true] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), -"update": 1, -"values": [Vector2(0, -11), Vector2(0, 2), Vector2(12, -11), Vector2(0, 2), Vector2(-0.00060463, -11)] -} [sub_resource type="Animation" id="Animation_wjl2t"] resource_name = "punch_west_left" length = 0.266673 -loop_mode = 1 step = 0.0666667 tracks/0/type = "value" tracks/0/imported = false @@ -1469,7 +1284,7 @@ tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 +tracks/4/interp = 0 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0.266667), @@ -1501,96 +1316,18 @@ tracks/6/keys = { "update": 1, "values": [Vector2(0, -11), Vector2(-12, -11), Vector2(12, -11), Vector2(-12, -11), Vector2(-0.00060463, -11)] } - -[sub_resource type="Animation" id="Animation_e4rxs"] -resource_name = "punch_west_rigth" -length = 0.266673 -loop_mode = 1 -step = 0.0666667 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("2_d32ue")] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:hframes") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [13] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:vframes") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [4] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:frame") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [44, 45, 46, 47] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0.266667), -"transitions": PackedFloat32Array(1), -"update": 1, "values": [false] } -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("Attackbox/Collider:disabled") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 1, -"values": [true, false, true] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), -"update": 1, -"values": [Vector2(0, -11), Vector2(-12, -11), Vector2(12, -11), Vector2(-12, -11), Vector2(-0.00060463, -11)] -} [sub_resource type="Animation" id="Animation_de3xn"] resource_name = "walking_east" @@ -1645,6 +1382,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_bg701"] resource_name = "walking_north" @@ -1699,6 +1448,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_sroq6"] resource_name = "walking_south" @@ -1753,6 +1514,18 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="Animation" id="Animation_d3phq"] resource_name = "walking_west" @@ -1807,10 +1580,501 @@ tracks/3/keys = { "update": 1, "values": [ExtResource("1_ukwcc")] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:can_move") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} + +[sub_resource type="Animation" id="Animation_bwm5c"] +resource_name = "punch_north_right" +length = 0.266673 +step = 0.0666667 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("2_d32ue")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [13] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite2D:frame") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [27, 28, 29, 30] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") +tracks/4/interp = 0 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.266667), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("Attackbox/Collider:disabled") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [true, false, true] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Attackbox/Collider:position") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [Vector2(0, -11), Vector2(0, -30), Vector2(12, -11), Vector2(0, -30), Vector2(-0.00060463, -11)] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_bw220"] +resource_name = "punch_south_right" +length = 0.266673 +step = 0.0666667 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("2_d32ue")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [13] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite2D:frame") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [1, 2, 3, 4] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") +tracks/4/interp = 0 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.266667), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("Attackbox/Collider:disabled") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [true, false, true] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Attackbox/Collider:position") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [Vector2(0, -11), Vector2(0, 2), Vector2(12, -11), Vector2(0, 2), Vector2(-0.00060463, -11)] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_e4rxs"] +resource_name = "punch_west_right" +length = 0.266673 +step = 0.0666667 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("2_d32ue")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [13] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite2D:frame") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [44, 45, 46, 47] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") +tracks/4/interp = 0 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.266667), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("Attackbox/Collider:disabled") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [true, false, true] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Attackbox/Collider:position") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.199527, 0.2, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [Vector2(0, -11), Vector2(-12, -11), Vector2(12, -11), Vector2(-12, -11), Vector2(-0.00060463, -11)] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_ar6r3"] +resource_name = "punch_east_right" +length = 0.266673 +step = 0.0666667 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("2_d32ue")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [13] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite2D:frame") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0, 0.0666667, 0.133333, 0.2), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [14, 15, 16, 17] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") +tracks/4/interp = 0 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.266667), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("Attackbox/Collider:disabled") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [true, false, true] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("Attackbox/Collider:position") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 0.133333, 0.266667), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [Vector2(0, -11), Vector2(12, -11), Vector2(-0.00060463, -11)] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath(".:can_move") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_bteb7"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("1_ukwcc")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:hframes") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [20] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:vframes") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [1] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +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": [0] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("Attackbox/Collider:disabled") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath(".:can_move") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_prr1g"] _data = { -"RESET": SubResource("Animation_04piu"), +"RESET": SubResource("Animation_bteb7"), "hurt_east": SubResource("Animation_kvnht"), "hurt_north": SubResource("Animation_fytkh"), "hurt_south": SubResource("Animation_lw5of"), @@ -1824,13 +2088,13 @@ _data = { "kick_south": SubResource("Animation_hqga6"), "kick_west": SubResource("Animation_s8xim"), "punch_east_left": SubResource("Animation_o0diw"), -"punch_east_rigth": SubResource("Animation_ar6r3"), +"punch_east_right": SubResource("Animation_ar6r3"), "punch_north_left": SubResource("Animation_1e0v6"), -"punch_north_rigth": SubResource("Animation_bwm5c"), +"punch_north_right": SubResource("Animation_bwm5c"), "punch_south_left": SubResource("Animation_qmuik"), -"punch_south_rigth": SubResource("Animation_bw220"), +"punch_south_right": SubResource("Animation_bw220"), "punch_west_left": SubResource("Animation_wjl2t"), -"punch_west_rigth": SubResource("Animation_e4rxs"), +"punch_west_right": SubResource("Animation_e4rxs"), "walking_east": SubResource("Animation_de3xn"), "walking_north": SubResource("Animation_bg701"), "walking_south": SubResource("Animation_sroq6"), @@ -1884,16 +2148,16 @@ blend_point_3/pos = Vector2(0, 1) blend_mode = 1 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f740i"] -animation = &"punch_south_rigth" +animation = &"punch_south_right" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_bwovr"] -animation = &"punch_west_rigth" +animation = &"punch_west_right" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qqbt6"] -animation = &"punch_east_rigth" +animation = &"punch_east_right" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_y3tw5"] -animation = &"punch_north_rigth" +animation = &"punch_north_right" [sub_resource type="AnimationNodeBlendSpace2D" id="AnimationNodeBlendSpace2D_2orb0"] blend_point_0/node = SubResource("AnimationNodeAnimation_f740i") @@ -2000,13 +2264,23 @@ advance_mode = 2 advance_condition = &"melee" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_l17k0"] +priority = 2 +switch_mode = 2 advance_mode = 2 -advance_expression = "get(\"parameters/conditions/melee\") == false" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ln3pc"] switch_mode = 2 advance_mode = 2 +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_fb37h"] +advance_mode = 2 +advance_condition = &"melee" + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1wtxc"] +switch_mode = 2 +advance_mode = 2 +advance_condition = &"is_moving" + [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_b2867"] allow_transition_to_self = true states/Start/position = Vector2(197, 108) @@ -2018,8 +2292,8 @@ states/melee/node = SubResource("AnimationNodeBlendSpace1D_dc3kp") states/melee/position = Vector2(329, 224) 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")] -graph_offset = Vector2(-222, -37) +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"), "walk", "melee", SubResource("AnimationNodeStateMachineTransition_fb37h"), "melee", "walk", SubResource("AnimationNodeStateMachineTransition_1wtxc")] +graph_offset = Vector2(-110, 10) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"] radius = 8.0 @@ -2041,27 +2315,21 @@ position = Vector2(0, -13) texture = ExtResource("1_ukwcc") hframes = 20 -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -reset_on_save = false -libraries = { -"": SubResource("AnimationLibrary_prr1g") -} - [node name="AnimationTree" type="AnimationTree" parent="."] +deterministic = false libraries = { "": SubResource("AnimationLibrary_prr1g") } tree_root = SubResource("AnimationNodeStateMachine_b2867") -anim_player = NodePath("../AnimationPlayer") parameters/conditions/is_moving = false parameters/conditions/melee = false parameters/hurt/blend_position = Vector2(0.949916, -0.0132159) -parameters/idle/blend_position = Vector2(-0.0243112, 0.73545) -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) -parameters/melee/2/blend_position = Vector2(0, 0) -parameters/walk/blend_position = Vector2(-0.0100167, -0.0729166) +parameters/idle/blend_position = Vector2(0, 1) +parameters/melee/blend_position = -0.003268 +parameters/melee/0/blend_position = Vector2(-1, 0) +parameters/melee/1/blend_position = Vector2(-1, 0) +parameters/melee/2/blend_position = Vector2(-1, 0) +parameters/walk/blend_position = Vector2(-1, 0) [node name="Hitbox" type="Area2D" parent="."] position = Vector2(0, 1) @@ -2084,7 +2352,7 @@ collision_mask = 2 input_pickable = false [node name="Collider" type="CollisionShape2D" parent="Attackbox"] -position = Vector2(0, -10) +position = Vector2(0, -11) shape = SubResource("CircleShape2D_md645") disabled = true debug_color = Color(0.745098, 0.462745, 0, 0.419608) diff --git a/Scripts/hiro_player.gd b/Scripts/hiro_player.gd index d5c1331..4189968 100644 --- a/Scripts/hiro_player.gd +++ b/Scripts/hiro_player.gd @@ -1,14 +1,33 @@ extends CharacterBody2D +enum Heading { + north, + east, + west, + south +} + +const HEADINGS = [Vector2.UP, Vector2.RIGHT, Vector2.LEFT, Vector2.DOWN] + @export var speed = 100 +@export var initial_heading = Heading.south +@export var can_move = true + var last_dpad: Array[Vector2] = [Vector2.ZERO,Vector2.ZERO] const FACING_ANGLE_EPSILON = 15 signal attack_did_hit(other: Area2D, power: int, attack_direction: Vector2) signal defeated -func _process(_delta): - if Input.is_action_pressed("melee") and $AnimationTree.get("parameters/conditions/melee") == false: +func _ready() -> void: + $AnimationTree.set("parameters/idle/blend_position", HEADINGS[initial_heading]) + $AnimationTree.set("parameters/walk/blend_position", HEADINGS[initial_heading]) + $AnimationTree.set("parameters/melee/0/blend_position", HEADINGS[initial_heading]) + $AnimationTree.set("parameters/melee/1/blend_position", HEADINGS[initial_heading]) + $AnimationTree.set("parameters/melee/2/blend_position", HEADINGS[initial_heading]) + +func _unhandled_input(event: InputEvent) -> void: + if Input.is_action_just_pressed("melee") and can_move: var animation_rng = randf_range(0, 1) $AnimationTree.set("parameters/melee/blend_position", animation_rng) $AnimationTree.set("parameters/conditions/melee", true) @@ -37,7 +56,7 @@ func get_input(): if last_dpad[0] == Vector2.ZERO and input_direction != Vector2.ZERO: last_dpad[0] = input_direction - if $AnimationTree.get("parameters/conditions/melee") ==true: + if not can_move: input_direction = Vector2.ZERO last_dpad[0] = Vector2.ZERO last_dpad[1] = Vector2.ZERO diff --git a/Scripts/reed_player.gd b/Scripts/reed_player.gd index dfae92a..1f791f8 100644 --- a/Scripts/reed_player.gd +++ b/Scripts/reed_player.gd @@ -38,6 +38,6 @@ const FACING_ANGLE_EPSILON = 15 #$AnimationTree.set("parameters/walk/blend_position", last_dpad[0]) -func _on_player_attack_did_hit(other: Area2D): +func _on_player_attack_did_hit(other: Area2D, _power: int, _direction: Vector2): if other.get_parent().get_instance_id() == get_instance_id() : print(other.get_parent().name + " OUCHHHHH") diff --git a/project.godot b/project.godot index 03646a9..00999d0 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Anthro Kai Game Prototype" run/main_scene="res://world/world.tscn" -config/features=PackedStringArray("4.2", "Mobile") +config/features=PackedStringArray("4.3", "Mobile") config/icon="res://icon.svg" [display] @@ -34,16 +34,16 @@ ui_right={ "deadzone": 0.5, "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) -, null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } ui_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } ui_text_caret_left={ @@ -56,31 +56,31 @@ ui_text_caret_right={ } up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":11,"pressure":0.0,"pressed":true,"script":null) ] } down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":true,"script":null) ] } right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":true,"script":null) ] } left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":13,"pressure":0.0,"pressed":true,"script":null) ] } melee={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) ] }