diff --git a/Resources/Sprites/player.tres b/Resources/Sprites/player.tres index afdfdeaa..3cdae964 100644 --- a/Resources/Sprites/player.tres +++ b/Resources/Sprites/player.tres @@ -1,102 +1,92 @@ -[gd_resource type="SpriteFrames" load_steps=28 format=3 uid="uid://bc7mghjx75qip"] +[gd_resource type="SpriteFrames" load_steps=24 format=3 uid="uid://bc7mghjx75qip"] -[ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="1_nsg0m"] -[ext_resource type="Texture2D" uid="uid://bvjyivjk530r5" path="res://Sprites/Actors/Cirno_Surprised.png" id="1_smg7h"] -[ext_resource type="Texture2D" uid="uid://calorbo7lwx72" path="res://Sprites/Actors/Cirno_Drowning.png" id="2_dod2v"] +[ext_resource type="Texture2D" uid="uid://d3he41g6x7w2x" path="res://Sprites/Actors/Cirno_Walk.png" id="1_nsg0m"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_gvb6b"] +atlas = ExtResource("1_nsg0m") +region = Rect2(0, 80, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_smg7h"] +atlas = ExtResource("1_nsg0m") +region = Rect2(16, 80, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dod2v"] +atlas = ExtResource("1_nsg0m") +region = Rect2(32, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_qt0xq"] -atlas = ExtResource("1_smg7h") -region = Rect2(0, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(48, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_j8jir"] -atlas = ExtResource("1_smg7h") -region = Rect2(16, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(64, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_6sqmb"] -atlas = ExtResource("2_dod2v") -region = Rect2(0, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(80, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_bl8yu"] -atlas = ExtResource("2_dod2v") -region = Rect2(16, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(96, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_a680j"] -atlas = ExtResource("2_dod2v") -region = Rect2(32, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(112, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_cab7f"] -atlas = ExtResource("2_dod2v") -region = Rect2(48, 0, 16, 16) +atlas = ExtResource("1_nsg0m") +region = Rect2(128, 80, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_la2t0"] -atlas = ExtResource("2_dod2v") -region = Rect2(64, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_eqxxe"] -atlas = ExtResource("2_dod2v") -region = Rect2(80, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7j3x3"] -atlas = ExtResource("2_dod2v") -region = Rect2(96, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_j4qq6"] -atlas = ExtResource("2_dod2v") -region = Rect2(112, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_34li8"] -atlas = ExtResource("2_dod2v") -region = Rect2(128, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6tpxx"] atlas = ExtResource("1_nsg0m") region = Rect2(0, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_wp7gh"] +[sub_resource type="AtlasTexture" id="AtlasTexture_eqxxe"] +atlas = ExtResource("1_nsg0m") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7j3x3"] atlas = ExtResource("1_nsg0m") region = Rect2(16, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_ke1tg"] -atlas = ExtResource("1_nsg0m") -region = Rect2(0, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_t8hpb"] +[sub_resource type="AtlasTexture" id="AtlasTexture_j4qq6"] atlas = ExtResource("1_nsg0m") region = Rect2(32, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_qarhr"] -atlas = ExtResource("1_nsg0m") -region = Rect2(16, 32, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_3cgoj"] +[sub_resource type="AtlasTexture" id="AtlasTexture_34li8"] atlas = ExtResource("1_nsg0m") region = Rect2(0, 32, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_3o5ec"] +[sub_resource type="AtlasTexture" id="AtlasTexture_th8bd"] +atlas = ExtResource("1_nsg0m") +region = Rect2(16, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qlee1"] atlas = ExtResource("1_nsg0m") region = Rect2(32, 32, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_mcevb"] -atlas = ExtResource("1_nsg0m") -region = Rect2(16, 48, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6voax"] +[sub_resource type="AtlasTexture" id="AtlasTexture_lcakh"] atlas = ExtResource("1_nsg0m") region = Rect2(0, 48, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_s2loq"] +[sub_resource type="AtlasTexture" id="AtlasTexture_3lcgt"] +atlas = ExtResource("1_nsg0m") +region = Rect2(16, 48, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y1j67"] atlas = ExtResource("1_nsg0m") region = Rect2(32, 48, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_a8lgq"] -atlas = ExtResource("1_nsg0m") -region = Rect2(16, 16, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_sv6wb"] +[sub_resource type="AtlasTexture" id="AtlasTexture_ymhb3"] atlas = ExtResource("1_nsg0m") region = Rect2(0, 16, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_taqav"] +[sub_resource type="AtlasTexture" id="AtlasTexture_nl5lm"] +atlas = ExtResource("1_nsg0m") +region = Rect2(16, 16, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_s6kro"] atlas = ExtResource("1_nsg0m") region = Rect2(32, 16, 16, 16) @@ -104,16 +94,13 @@ region = Rect2(32, 16, 16, 16) animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_qt0xq") +"texture": SubResource("AtlasTexture_gvb6b") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_j8jir") +"texture": SubResource("AtlasTexture_smg7h") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qt0xq") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_j8jir") +"texture": SubResource("AtlasTexture_dod2v") }, { "duration": 1.0, "texture": SubResource("AtlasTexture_qt0xq") @@ -134,24 +121,6 @@ animations = [{ "texture": SubResource("AtlasTexture_cab7f") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_la2t0") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_eqxxe") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7j3x3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7j3x3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_j4qq6") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_34li8") -}, { -"duration": 1.0, "texture": null }], "loop": false, @@ -160,7 +129,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_6tpxx") +"texture": SubResource("AtlasTexture_la2t0") }], "loop": true, "name": &"idle", @@ -168,13 +137,13 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_wp7gh") +"texture": SubResource("AtlasTexture_eqxxe") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_ke1tg") +"texture": SubResource("AtlasTexture_7j3x3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_t8hpb") +"texture": SubResource("AtlasTexture_j4qq6") }], "loop": true, "name": &"walk_down", @@ -182,13 +151,13 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_qarhr") +"texture": SubResource("AtlasTexture_34li8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_3cgoj") +"texture": SubResource("AtlasTexture_th8bd") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_3o5ec") +"texture": SubResource("AtlasTexture_qlee1") }], "loop": true, "name": &"walk_left", @@ -196,13 +165,13 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_mcevb") +"texture": SubResource("AtlasTexture_lcakh") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6voax") +"texture": SubResource("AtlasTexture_3lcgt") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_s2loq") +"texture": SubResource("AtlasTexture_y1j67") }], "loop": true, "name": &"walk_right", @@ -210,13 +179,13 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_a8lgq") +"texture": SubResource("AtlasTexture_ymhb3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_sv6wb") +"texture": SubResource("AtlasTexture_nl5lm") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_taqav") +"texture": SubResource("AtlasTexture_s6kro") }], "loop": true, "name": &"walk_up", diff --git a/Scenes/Actors/IsoPlayer_FSM.tscn b/Scenes/Actors/IsoPlayer_FSM.tscn index 5b42dfec..a5d72b38 100644 --- a/Scenes/Actors/IsoPlayer_FSM.tscn +++ b/Scenes/Actors/IsoPlayer_FSM.tscn @@ -11,7 +11,6 @@ [ext_resource type="Script" uid="uid://eop2ue3otxcs" path="res://Scripts/Components/FSM/3DPlayer/IsoPlayerStorageModule.cs" id="6_habpy"] [ext_resource type="Script" uid="uid://bwdmhpotan5ai" path="res://Scripts/Components/FSM/3DPlayer/Drowning.cs" id="6_nk07c"] [ext_resource type="Script" uid="uid://cq1joxgoj3jdp" path="res://Scripts/Components/Actors/3D/PlayerAnimationProvider3D.cs" id="6_onfm2"] -[ext_resource type="SpriteFrames" uid="uid://c6exoa8pxbc6w" path="res://Resources/Sprites/player_float.tres" id="6_yq7h2"] [ext_resource type="Script" uid="uid://dq338w2lw5phl" path="res://Scripts/Components/Actors/KeyboardInputProvider.cs" id="7_4cdxq"] [ext_resource type="SpriteFrames" uid="uid://byb4cbb23cawf" path="res://Resources/Sprites/player_float_legs.tres" id="7_l4f8l"] [ext_resource type="Script" uid="uid://dls68t7f8eoqb" path="res://Scripts/Components/FSM/3DPlayer/Teleporting.cs" id="7_nwocn"] @@ -24,6 +23,7 @@ [ext_resource type="Script" uid="uid://bm73kgly8gv2i" path="res://Scripts/Components/FSM/3DPlayer/IsoInteractionController.cs" id="10_habpy"] [ext_resource type="Script" uid="uid://d1ixvdcii6uy7" path="res://Scripts/Components/FSM/3DPlayer/SelectorController.cs" id="11_4cdxq"] [ext_resource type="Script" uid="uid://vne180ohyucn" path="res://Scripts/Components/FSM/3DPlayer/IsoActivationProvider.cs" id="11_4exx2"] +[ext_resource type="SpriteFrames" uid="uid://bc7mghjx75qip" path="res://Resources/Sprites/player.tres" id="12_j6bpw"] [ext_resource type="AudioStream" uid="uid://myr6n2c1u503" path="res://SFX/581602__samsterbirdies__beep-error.mp3" id="13_2ffwi"] [ext_resource type="Script" uid="uid://d2psafx4f3f58" path="res://Scripts/Components/FSM/3DPlayer/PlayerWeaponModule3D.cs" id="15_el8as"] [ext_resource type="Script" uid="uid://by0x0qmbmkoak" path="res://Scripts/Components/FSM/3DPlayer/PlayerWeaponProvider3D.cs" id="16_olwak"] @@ -269,13 +269,14 @@ transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, - material_override = ExtResource("7_yarib") pixel_size = 0.05 texture_filter = 0 -sprite_frames = ExtResource("6_yq7h2") +sprite_frames = ExtResource("12_j6bpw") animation = &"walk_down" -frame_progress = 0.402096 +frame_progress = 0.44331232 script = ExtResource("9_yarib") [node name="Legs" type="AnimatedSprite3D" parent="AnimationProvider"] transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0) +visible = false pixel_size = 0.05 texture_filter = 0 sprite_frames = ExtResource("7_l4f8l") diff --git a/Sprites/Actors/Cirno_Walk.png b/Sprites/Actors/Cirno_Walk.png new file mode 100644 index 00000000..731b45aa --- /dev/null +++ b/Sprites/Actors/Cirno_Walk.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3319174d9f3aa823ee3c94806b4239311622be63242be20346e4b1833a4843ae +size 2234 diff --git a/Sprites/Actors/Cirno_Walk.png.import b/Sprites/Actors/Cirno_Walk.png.import new file mode 100644 index 00000000..1de417a8 --- /dev/null +++ b/Sprites/Actors/Cirno_Walk.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3he41g6x7w2x" +path="res://.godot/imported/Cirno_Walk.png-b2f384461b3b6591dee558b20f370acd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/Cirno_Walk.png" +dest_files=["res://.godot/imported/Cirno_Walk.png-b2f384461b3b6591dee558b20f370acd.ctex"] + +[params] + +compress/mode=3 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=0