diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 1ec5fbd6..fed36f8b 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=1831 format=4 uid="uid://cfecvvav8kkp6"] +[gd_scene load_steps=1865 format=4 uid="uid://cfecvvav8kkp6"] [ext_resource type="Script" uid="uid://yxmiqy7i0t7r" path="res://src/player/Player.cs" id="1_xcol5"] [ext_resource type="PackedScene" uid="uid://dqvlemme0iwa" path="res://src/camera/ShakeCamera.tscn" id="2_jtmj1"] @@ -419,6 +419,7 @@ [ext_resource type="Texture2D" uid="uid://dwfqyfjsj8nro" path="res://src/vfx/Items Etc/persiko/persiko127.png" id="401_28ame"] [ext_resource type="Texture2D" uid="uid://8elghtvwum52" path="res://src/vfx/Items Etc/keystaff_use.png" id="410_s86wq"] [ext_resource type="Texture2D" uid="uid://cyxbldpei8efj" path="res://src/vfx/Weapon Strikes/Palm of Heaven Sprite Sheet.png" id="420_2ntku"] +[ext_resource type="Texture2D" uid="uid://fegm3min228k" path="res://src/vfx/Weapon Strikes/lovejudgementslash.png" id="426_rislv"] [ext_resource type="Texture2D" uid="uid://dw3v3q35m6yuu" path="res://src/vfx/Items Etc/item_breaking.png" id="489_w5dir"] [ext_resource type="Texture2D" uid="uid://faeu0hjhpxcu" path="res://src/vfx/Weapon Strikes/Axe/0003.webp" id="497_h6lkg"] [ext_resource type="Texture2D" uid="uid://cvvemiv8f33o7" path="res://src/vfx/Weapon Strikes/earth_Strike.png" id="498_c70d3"] @@ -1932,6 +1933,7 @@ tracks/2/keys = { [sub_resource type="Animation" id="Animation_7rguc"] resource_name = "Love Judgement" +step = 31.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -1947,26 +1949,26 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Control/Love Judgement:animation") +tracks/1/path = NodePath("Control/Love Judgement:frame") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"love_judgement"] +"times": PackedFloat32Array(0, 0.966667), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [0, 31] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Control/Love Judgement:frame") +tracks/2/path = NodePath("Control/Love Judgement:animation") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.966667), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [0, 29] +"values": [&"default"] } [sub_resource type="Animation" id="Animation_cqsul"] @@ -2147,27 +2149,27 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Control/Palm:animation") +tracks/1/path = NodePath("Control/Palm:frame") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"Palm"] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Control/Palm:frame") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { "times": PackedFloat32Array(0, 1.03333), "transitions": PackedFloat32Array(1, 1), "update": 0, "values": [0, 31] } +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Control/Palm:animation") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [&"Palm"] +} [sub_resource type="Animation" id="Animation_aodty"] resource_name = "Persuader" @@ -2349,50 +2351,50 @@ tracks/10/keys = { tracks/11/type = "value" tracks/11/imported = false tracks/11/enabled = true -tracks/11/path = NodePath("Control/Love Judgement:animation") +tracks/11/path = NodePath("Control/Love Judgement:frame") tracks/11/interp = 1 tracks/11/loop_wrap = true tracks/11/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"Palm"] +"update": 0, +"values": [0] } tracks/12/type = "value" tracks/12/imported = false tracks/12/enabled = true -tracks/12/path = NodePath("Control/Love Judgement:frame") +tracks/12/path = NodePath("Control/Love Judgement:animation") tracks/12/interp = 1 tracks/12/loop_wrap = true tracks/12/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] +"update": 0, +"values": [&"default"] } tracks/13/type = "value" tracks/13/imported = false tracks/13/enabled = true -tracks/13/path = NodePath("Control/Palm:animation") +tracks/13/path = NodePath("Control/Palm:frame") tracks/13/interp = 1 tracks/13/loop_wrap = true tracks/13/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [&"Palm"] +"update": 0, +"values": [0] } tracks/14/type = "value" tracks/14/imported = false tracks/14/enabled = true -tracks/14/path = NodePath("Control/Palm:frame") +tracks/14/path = NodePath("Control/Palm:animation") tracks/14/interp = 1 tracks/14/loop_wrap = true tracks/14/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] +"update": 0, +"values": [&"Palm"] } [sub_resource type="Animation" id="Animation_34gm2"] @@ -10954,6 +10956,238 @@ animations = [{ "speed": 24.0 }] +[sub_resource type="AtlasTexture" id="AtlasTexture_3lbfl"] +atlas = ExtResource("426_rislv") +region = Rect2(0, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_p8bo1"] +atlas = ExtResource("426_rislv") +region = Rect2(512, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_iyyyb"] +atlas = ExtResource("426_rislv") +region = Rect2(1024, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4gp8m"] +atlas = ExtResource("426_rislv") +region = Rect2(1536, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ku3m1"] +atlas = ExtResource("426_rislv") +region = Rect2(2048, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y6ydj"] +atlas = ExtResource("426_rislv") +region = Rect2(2560, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1ahca"] +atlas = ExtResource("426_rislv") +region = Rect2(3072, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1kesl"] +atlas = ExtResource("426_rislv") +region = Rect2(3584, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ee281"] +atlas = ExtResource("426_rislv") +region = Rect2(4096, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bv16y"] +atlas = ExtResource("426_rislv") +region = Rect2(4608, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4mifj"] +atlas = ExtResource("426_rislv") +region = Rect2(5120, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_a3r4p"] +atlas = ExtResource("426_rislv") +region = Rect2(5632, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1t7ua"] +atlas = ExtResource("426_rislv") +region = Rect2(6144, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_de11d"] +atlas = ExtResource("426_rislv") +region = Rect2(6656, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_uiup0"] +atlas = ExtResource("426_rislv") +region = Rect2(7168, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_h2y2x"] +atlas = ExtResource("426_rislv") +region = Rect2(7680, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_w87tc"] +atlas = ExtResource("426_rislv") +region = Rect2(8192, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3uvd6"] +atlas = ExtResource("426_rislv") +region = Rect2(8704, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_o0k2a"] +atlas = ExtResource("426_rislv") +region = Rect2(9216, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5w451"] +atlas = ExtResource("426_rislv") +region = Rect2(9728, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_nw4v5"] +atlas = ExtResource("426_rislv") +region = Rect2(10240, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vlw8a"] +atlas = ExtResource("426_rislv") +region = Rect2(10752, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_lokei"] +atlas = ExtResource("426_rislv") +region = Rect2(11264, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_217y4"] +atlas = ExtResource("426_rislv") +region = Rect2(11776, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_skejj"] +atlas = ExtResource("426_rislv") +region = Rect2(12288, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4a6k6"] +atlas = ExtResource("426_rislv") +region = Rect2(12800, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jqmwl"] +atlas = ExtResource("426_rislv") +region = Rect2(13312, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0gcsk"] +atlas = ExtResource("426_rislv") +region = Rect2(13824, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xrquc"] +atlas = ExtResource("426_rislv") +region = Rect2(14336, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qlerd"] +atlas = ExtResource("426_rislv") +region = Rect2(14848, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hyd01"] +atlas = ExtResource("426_rislv") +region = Rect2(15360, 0, 512, 1024) + +[sub_resource type="AtlasTexture" id="AtlasTexture_onylb"] +atlas = ExtResource("426_rislv") +region = Rect2(15872, 0, 512, 1024) + +[sub_resource type="SpriteFrames" id="SpriteFrames_2ntku"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_3lbfl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_p8bo1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_iyyyb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4gp8m") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ku3m1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_y6ydj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1ahca") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1kesl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ee281") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bv16y") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4mifj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_a3r4p") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1t7ua") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_de11d") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_uiup0") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_h2y2x") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_w87tc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3uvd6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_o0k2a") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5w451") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_nw4v5") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vlw8a") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_lokei") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_217y4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_skejj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4a6k6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jqmwl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_0gcsk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_xrquc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qlerd") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_hyd01") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_onylb") +}], +"loop": false, +"name": &"default", +"speed": 30.0 +}] + [sub_resource type="AtlasTexture" id="AtlasTexture_sem03"] atlas = ExtResource("420_2ntku") region = Rect2(0, 0, 512, 512) @@ -12884,10 +13118,9 @@ sprite_frames = SubResource("SpriteFrames_h00b0") animation = &"earth_slash" [node name="Love Judgement" type="AnimatedSprite2D" parent="ScreenFX/Control"] -position = Vector2(-61.25, 41.75) +position = Vector2(0, 800) scale = Vector2(2.86426, 2.86426) -sprite_frames = SubResource("SpriteFrames_h00b0") -animation = &"Palm" +sprite_frames = SubResource("SpriteFrames_2ntku") [node name="Palm" type="AnimatedSprite2D" parent="ScreenFX/Control"] texture_filter = 1