From 41ccbd0765dbb3a2ced9325d0f68234f48697fd5 Mon Sep 17 00:00:00 2001 From: Raxki Date: Mon, 14 Oct 2024 11:28:49 -0400 Subject: [PATCH] Add blinking animation for Reed and Hiro (might break other animations?) --- Hiro/Hiro_Idle_Blink_Sprites.png | 3 + Hiro/Hiro_Idle_Blink_Sprites.png.import | 34 +++++ Hiro/hiro_ai.tscn | 8 +- Hiro/hiro_animation.tres | 178 ++++++++++++------------ Hiro/hiro_player.tscn | 8 +- Reed/Reed_Idle_Blink_Sprites.png | 3 + Reed/Reed_Idle_Blink_Sprites.png.import | 34 +++++ Reed/reed_ai.tscn | 10 +- Reed/reed_animation.tres | 128 ++++++++--------- 9 files changed, 244 insertions(+), 162 deletions(-) create mode 100644 Hiro/Hiro_Idle_Blink_Sprites.png create mode 100644 Hiro/Hiro_Idle_Blink_Sprites.png.import create mode 100644 Reed/Reed_Idle_Blink_Sprites.png create mode 100644 Reed/Reed_Idle_Blink_Sprites.png.import diff --git a/Hiro/Hiro_Idle_Blink_Sprites.png b/Hiro/Hiro_Idle_Blink_Sprites.png new file mode 100644 index 0000000..e797ff1 --- /dev/null +++ b/Hiro/Hiro_Idle_Blink_Sprites.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e368d2a9b196f5fab6a8741840958a5f57e99c850c07e59e2e4e4ccf7fb5a35a +size 5972 diff --git a/Hiro/Hiro_Idle_Blink_Sprites.png.import b/Hiro/Hiro_Idle_Blink_Sprites.png.import new file mode 100644 index 0000000..76a65a9 --- /dev/null +++ b/Hiro/Hiro_Idle_Blink_Sprites.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4iwqijfp013h" +path="res://.godot/imported/Hiro_Idle_Blink_Sprites.png-5e38a9246cb610340f57cffc620085d6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Hiro/Hiro_Idle_Blink_Sprites.png" +dest_files=["res://.godot/imported/Hiro_Idle_Blink_Sprites.png-5e38a9246cb610340f57cffc620085d6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Hiro/hiro_ai.tscn b/Hiro/hiro_ai.tscn index ecc9f23..8925da8 100644 --- a/Hiro/hiro_ai.tscn +++ b/Hiro/hiro_ai.tscn @@ -241,7 +241,7 @@ states/naked_start/position = Vector2(734, 202) 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"), "naked_start", "naked", SubResource("AnimationNodeStateMachineTransition_l5ng5")] -graph_offset = Vector2(79, 269) +graph_offset = Vector2(-75, -44) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"] radius = 9.0 @@ -273,7 +273,7 @@ script = ExtResource("1_inmen") reduce_recoil_time_threshold = 0.75 [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(0.498039, 0.498039, 0.498039, 1) +modulate = Color(0.75, 0.75, 0.75, 1) texture_filter = 1 material = SubResource("ShaderMaterial_7ckhc") position = Vector2(0, -13) @@ -288,8 +288,8 @@ 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.949916, -0.0132159) -parameters/idle/blend_position = Vector2(-0.0243112, 0.73545) +parameters/hurt/blend_position = Vector2(0.00438976, 0.714286) +parameters/idle/blend_position = Vector2(-0.000877976, 0.746032) 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/Hiro/hiro_animation.tres b/Hiro/hiro_animation.tres index 7af4812..febec1a 100644 --- a/Hiro/hiro_animation.tres +++ b/Hiro/hiro_animation.tres @@ -1,8 +1,9 @@ -[gd_resource type="AnimationLibrary" load_steps=35 format=3 uid="uid://dincs5x4qucal"] +[gd_resource type="AnimationLibrary" load_steps=36 format=3 uid="uid://dincs5x4qucal"] [ext_resource type="Texture2D" uid="uid://cm7tgomrcvq30" path="res://Hiro/Hiro Walk Sprite Cycle Line Up.png" id="1_hc7kj"] [ext_resource type="Texture2D" uid="uid://rcidedgcjqg6" path="res://Hiro/Hiro Hurt Sprites.png" id="2_2k6ad"] [ext_resource type="Texture2D" uid="uid://bio3egs7q7wog" path="res://Hiro/Hiro Melee Sprites.png" id="3_5swnw"] +[ext_resource type="Texture2D" uid="uid://c4iwqijfp013h" path="res://Hiro/Hiro_Idle_Blink_Sprites.png" id="4_86osg"] [ext_resource type="Texture2D" uid="uid://06a1bf8kjte6" path="res://Hiro/Hiro Defeated Sprites nb.png" id="4_fugxd"] [ext_resource type="Texture2D" uid="uid://byc7mqu65fb4a" path="res://Hiro/Hiro Defeated Nude Sprites Line.png" id="5_0f03l"] @@ -15,86 +16,86 @@ step = 0.5 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +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": [0] +"values": [ExtResource("1_hc7kj")] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:texture") +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": [ExtResource("1_hc7kj")] +"values": [20] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:hframes") +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": [20] +"values": [1] } tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:vframes") +tracks/3/path = NodePath("AnimationTree:parameters/conditions/melee") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [false] } tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("AnimationTree:parameters/conditions/melee") +tracks/4/path = NodePath("Attackbox/Collider:position") 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, 0.0666667), "transitions": PackedFloat32Array(1, 1), "update": 0, "values": [Vector2(0, -10), Vector2(0, -14)] } +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), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} tracks/6/type = "value" tracks/6/imported = false tracks/6/enabled = true -tracks/6/path = NodePath("Attackbox/Collider:disabled") +tracks/6/path = NodePath("Sprite2D:frame") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [true] +"values": [0] } tracks/7/type = "value" tracks/7/imported = false @@ -513,18 +514,19 @@ tracks/4/keys = { [sub_resource type="Animation" id="Animation_3oagy"] resource_name = "idle_east" -length = 0.6 +length = 5.40001 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +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": [5] +"values": [ExtResource("4_86osg")] } tracks/1/type = "value" tracks/1/imported = false @@ -536,7 +538,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [20] +"values": [2] } tracks/2/type = "value" tracks/2/imported = false @@ -548,19 +550,19 @@ tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [4] } 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, 5.2), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [2, 3] } [sub_resource type="Animation" id="Animation_pjwlc"] @@ -617,7 +619,8 @@ tracks/3/keys = { [sub_resource type="Animation" id="Animation_x2yda"] resource_name = "idle_south" -length = 0.6 +length = 5.40001 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -625,10 +628,10 @@ tracks/0/path = NodePath("Sprite2D:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 5.2), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [0] +"values": [0, 1] } tracks/1/type = "value" tracks/1/imported = false @@ -640,7 +643,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [20] +"values": [2] } tracks/2/type = "value" tracks/2/imported = false @@ -652,7 +655,7 @@ tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [4] } tracks/3/type = "value" tracks/3/imported = false @@ -664,59 +667,60 @@ tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [ExtResource("4_86osg")] } [sub_resource type="Animation" id="Animation_w1ari"] resource_name = "idle_west" -length = 0.6 +length = 5.40001 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite2D:vframes") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [15] +"values": [4] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:vframes") +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": [1] +"values": [2] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:hframes") +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": [20] +"values": [ExtResource("4_86osg")] } 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, 5.2), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [6, 7] } [sub_resource type="Animation" id="Animation_ji461"] @@ -1884,50 +1888,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": [6, 7, 8, 9] +"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), +"times": PackedFloat32Array(0, 0.125, 0.25, 0.375), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [6, 7, 8, 9] } [sub_resource type="Animation" id="Animation_bg701"] @@ -1938,50 +1942,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_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), +"times": PackedFloat32Array(0, 0.125, 0.25, 0.375), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [11, 12, 13, 14] } [sub_resource type="Animation" id="Animation_sroq6"] @@ -2046,50 +2050,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": [16, 17, 18, 19] +"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), +"times": PackedFloat32Array(0, 0.125, 0.25, 0.375), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 1, -"values": [ExtResource("1_hc7kj")] +"values": [16, 17, 18, 19] } [resource] diff --git a/Hiro/hiro_player.tscn b/Hiro/hiro_player.tscn index 2382812..8fdefc3 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(61, 90.3541) +graph_offset = Vector2(-53, -43.6459) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"] radius = 9.0 @@ -279,13 +279,13 @@ tree_root = SubResource("AnimationNodeStateMachine_b2867") 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.949916, -0.0132159) -parameters/idle/blend_position = Vector2(-0.0243112, 0.73545) +parameters/hurt/blend_position = Vector2(0.000877976, -0.756614) +parameters/idle/blend_position = Vector2(0.00263393, -0.830688) 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/walk/blend_position = Vector2(0.00965762, 0.94709) [node name="Hitbox" type="Area2D" parent="."] position = Vector2(0, 1) diff --git a/Reed/Reed_Idle_Blink_Sprites.png b/Reed/Reed_Idle_Blink_Sprites.png new file mode 100644 index 0000000..594392f --- /dev/null +++ b/Reed/Reed_Idle_Blink_Sprites.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0f1d88f210b3bbb8acabb8a750dbcdff60aa546108b28fdab7d233f01370d74 +size 6968 diff --git a/Reed/Reed_Idle_Blink_Sprites.png.import b/Reed/Reed_Idle_Blink_Sprites.png.import new file mode 100644 index 0000000..e739b6c --- /dev/null +++ b/Reed/Reed_Idle_Blink_Sprites.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmix77hgm7q21" +path="res://.godot/imported/Reed_Idle_Blink_Sprites.png-e99e6235c89444e1677b2bec4620c6c7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Reed/Reed_Idle_Blink_Sprites.png" +dest_files=["res://.godot/imported/Reed_Idle_Blink_Sprites.png-e99e6235c89444e1677b2bec4620c6c7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Reed/reed_ai.tscn b/Reed/reed_ai.tscn index 3023af7..61b1d60 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(65, 24) +graph_offset = Vector2(-82, 74) [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.949916, -0.0132159) -parameters/idle/blend_position = Vector2(-0.0243112, 0.73545) +parameters/hurt/blend_position = Vector2(-0.0114135, 0.915344) +parameters/idle/blend_position = Vector2(0.0201931, 0.968254) parameters/melee/blend_position = 0.0 -parameters/melee/0/blend_position = Vector2(0.66778, -0.765217) +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.0100167, -0.0729166) +parameters/walk/blend_position = Vector2(-0.00790167, 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 17faa82..acd237a 100644 --- a/Reed/reed_animation.tres +++ b/Reed/reed_animation.tres @@ -1,8 +1,9 @@ -[gd_resource type="AnimationLibrary" load_steps=34 format=3 uid="uid://bhg3cnhjeq85r"] +[gd_resource type="AnimationLibrary" load_steps=35 format=3 uid="uid://bhg3cnhjeq85r"] [ext_resource type="Texture2D" uid="uid://pittqsk5eskq" path="res://Reed/Reed Walk Sprite Cycle Line Up.png" id="1_4xts1"] [ext_resource type="Texture2D" uid="uid://clbdgd8f7isb4" path="res://Reed/Reed_Reed_Defeated_Sprite_.png" id="2_7ny10"] [ext_resource type="Texture2D" uid="uid://c7q83hvbvaifu" path="res://Reed/Reed_Hurt_Sprites.png" id="3_ynckf"] +[ext_resource type="Texture2D" uid="uid://bmix77hgm7q21" path="res://Reed/Reed_Idle_Blink_Sprites.png" id="4_peeea"] [ext_resource type="Texture2D" uid="uid://ctajre4ylwoqp" path="res://Reed/Reed_Melee_Sprites_Y.png" id="4_uq1j6"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_m3ug4"] @@ -14,50 +15,50 @@ step = 0.5 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +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": [0] +"values": [ExtResource("1_4xts1")] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:texture") +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": [ExtResource("1_4xts1")] +"values": [20] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:hframes") +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": [20] +"values": [1] } tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Sprite2D:vframes") +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": [1] +"values": [0] } tracks/4/type = "value" tracks/4/imported = false @@ -512,54 +513,55 @@ tracks/4/keys = { [sub_resource type="Animation" id="Animation_3oagy"] resource_name = "idle_east" -length = 0.6 +length = 5.40001 +loop_mode = 1 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": [5] +"values": [2] } 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": [4] } 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("4_peeea")] } 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, 4, 4.3), +"transitions": PackedFloat32Array(1, 1, 1), "update": 1, -"values": [ExtResource("1_4xts1")] +"values": [2, 3, 2] } [sub_resource type="Animation" id="Animation_pjwlc"] @@ -616,7 +618,8 @@ tracks/3/keys = { [sub_resource type="Animation" id="Animation_x2yda"] resource_name = "idle_south" -length = 0.6 +length = 5.40001 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -624,10 +627,10 @@ tracks/0/path = NodePath("Sprite2D:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 4.1, 4.3), +"transitions": PackedFloat32Array(1, 1, 1), "update": 1, -"values": [0] +"values": [0, 1, 0] } tracks/1/type = "value" tracks/1/imported = false @@ -639,7 +642,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [20] +"values": [2] } tracks/2/type = "value" tracks/2/imported = false @@ -651,7 +654,7 @@ tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [1] +"values": [4] } tracks/3/type = "value" tracks/3/imported = false @@ -663,59 +666,60 @@ tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("1_4xts1")] +"values": [ExtResource("4_peeea")] } [sub_resource type="Animation" id="Animation_w1ari"] resource_name = "idle_west" -length = 0.6 +length = 5.40001 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite2D:vframes") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [15] +"values": [4] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Sprite2D:vframes") +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": [1] +"values": [2] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Sprite2D:hframes") +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": [20] +"values": [ExtResource("4_peeea")] } 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, 4, 4.3), +"transitions": PackedFloat32Array(1, 1, 1), "update": 1, -"values": [ExtResource("1_4xts1")] +"values": [6, 7, 6] } [sub_resource type="Animation" id="Animation_ji461"] @@ -1883,50 +1887,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": [6, 7, 8, 9] +"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": [6, 7, 8, 9] } [sub_resource type="Animation" id="Animation_bg701"] @@ -2045,50 +2049,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": [16, 17, 18, 19] +"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": [16, 17, 18, 19] } [resource]