diff --git a/player/Player_Walk/Walk 1.png b/player/Player_Walk/Walk 1.png new file mode 100644 index 0000000..6e43f64 Binary files /dev/null and b/player/Player_Walk/Walk 1.png differ diff --git a/player/player_walk.png.import b/player/Player_Walk/Walk 1.png.import similarity index 74% rename from player/player_walk.png.import rename to player/Player_Walk/Walk 1.png.import index ab112ae..7803358 100644 --- a/player/player_walk.png.import +++ b/player/Player_Walk/Walk 1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cyvxm1hf1rc12" -path="res://.godot/imported/player_walk.png-59515d82f701e5545419ecd7b3460e66.ctex" +uid="uid://c4xg25s8loxp0" +path="res://.godot/imported/Walk 1.png-47c623e9d3540b4a00d2bddf52ae0b2a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://player/player_walk.png" -dest_files=["res://.godot/imported/player_walk.png-59515d82f701e5545419ecd7b3460e66.ctex"] +source_file="res://player/Player_Walk/Walk 1.png" +dest_files=["res://.godot/imported/Walk 1.png-47c623e9d3540b4a00d2bddf52ae0b2a.ctex"] [params] diff --git a/player/Player_Walk/Walk 2.png b/player/Player_Walk/Walk 2.png new file mode 100644 index 0000000..e69f3ea Binary files /dev/null and b/player/Player_Walk/Walk 2.png differ diff --git a/player/Player_Walk/Walk 2.png.import b/player/Player_Walk/Walk 2.png.import new file mode 100644 index 0000000..48f18ef --- /dev/null +++ b/player/Player_Walk/Walk 2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chxob4jg7qhqu" +path="res://.godot/imported/Walk 2.png-5dea4fdec55fa43e26680e08090fd654.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/Player_Walk/Walk 2.png" +dest_files=["res://.godot/imported/Walk 2.png-5dea4fdec55fa43e26680e08090fd654.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/player/Player_Walk/Walk 3.png b/player/Player_Walk/Walk 3.png new file mode 100644 index 0000000..16fae56 Binary files /dev/null and b/player/Player_Walk/Walk 3.png differ diff --git a/player/Player_Walk/Walk 3.png.import b/player/Player_Walk/Walk 3.png.import new file mode 100644 index 0000000..285ace3 --- /dev/null +++ b/player/Player_Walk/Walk 3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vwbnqmbol6hh" +path="res://.godot/imported/Walk 3.png-27890c0cb512383b8ecbd848c73efee1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/Player_Walk/Walk 3.png" +dest_files=["res://.godot/imported/Walk 3.png-27890c0cb512383b8ecbd848c73efee1.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/player/Player_Walk/Walk 4.png b/player/Player_Walk/Walk 4.png new file mode 100644 index 0000000..1d70b04 Binary files /dev/null and b/player/Player_Walk/Walk 4.png differ diff --git a/player/Player_Walk/Walk 4.png.import b/player/Player_Walk/Walk 4.png.import new file mode 100644 index 0000000..03aa90d --- /dev/null +++ b/player/Player_Walk/Walk 4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dawbam413fob" +path="res://.godot/imported/Walk 4.png-232b1eae2acf3ad82130431014262cde.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/Player_Walk/Walk 4.png" +dest_files=["res://.godot/imported/Walk 4.png-232b1eae2acf3ad82130431014262cde.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/player/Player_Walk/Walk 5.png b/player/Player_Walk/Walk 5.png new file mode 100644 index 0000000..c51ba70 Binary files /dev/null and b/player/Player_Walk/Walk 5.png differ diff --git a/player/Player_Walk/Walk 5.png.import b/player/Player_Walk/Walk 5.png.import new file mode 100644 index 0000000..fe3ebef --- /dev/null +++ b/player/Player_Walk/Walk 5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://y32k1koww7oy" +path="res://.godot/imported/Walk 5.png-cfb8eb15ace876127c083283fe74cdc0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/Player_Walk/Walk 5.png" +dest_files=["res://.godot/imported/Walk 5.png-cfb8eb15ace876127c083283fe74cdc0.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/player/Player_Walk/Walk 6.png b/player/Player_Walk/Walk 6.png new file mode 100644 index 0000000..524a119 Binary files /dev/null and b/player/Player_Walk/Walk 6.png differ diff --git a/player/Player_Walk/Walk 6.png.import b/player/Player_Walk/Walk 6.png.import new file mode 100644 index 0000000..22d7868 --- /dev/null +++ b/player/Player_Walk/Walk 6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bo7h3yc40kon3" +path="res://.godot/imported/Walk 6.png-f243f98e182be67eb8681a11d34ee554.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/Player_Walk/Walk 6.png" +dest_files=["res://.godot/imported/Walk 6.png-f243f98e182be67eb8681a11d34ee554.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/player/player.gd b/player/player.gd index d007d05..0d85b57 100644 --- a/player/player.gd +++ b/player/player.gd @@ -40,9 +40,9 @@ var atk_timer = 0 func _physics_process(delta: float) -> void: manage_iframes(delta) - manage_attack(delta) manage_movement_options() manage_animation() + manage_attack(delta) manage_velocity(delta) move_and_slide() diff --git a/player/player.tscn b/player/player.tscn index 768670a..2e3c2e1 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,49 +1,37 @@ [gd_scene load_steps=12 format=3 uid="uid://cmaovvr15b3qk"] [ext_resource type="Script" uid="uid://ddidj1uau28ck" path="res://player/player.gd" id="1_4flbx"] -[ext_resource type="Texture2D" uid="uid://cyvxm1hf1rc12" path="res://player/player_walk.png" id="2_onrkg"] +[ext_resource type="Texture2D" uid="uid://c4xg25s8loxp0" path="res://player/Player_Walk/Walk 1.png" id="2_hg6s5"] +[ext_resource type="Texture2D" uid="uid://chxob4jg7qhqu" path="res://player/Player_Walk/Walk 2.png" id="3_8t03j"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_i3pqv"] +[ext_resource type="Texture2D" uid="uid://vwbnqmbol6hh" path="res://player/Player_Walk/Walk 3.png" id="4_2ieo8"] [ext_resource type="PackedScene" uid="uid://d3e3kuyeh6mr1" path="res://player/sword.tscn" id="4_yw30f"] +[ext_resource type="Texture2D" uid="uid://dawbam413fob" path="res://player/Player_Walk/Walk 4.png" id="5_ebec5"] +[ext_resource type="Texture2D" uid="uid://y32k1koww7oy" path="res://player/Player_Walk/Walk 5.png" id="6_yllr7"] +[ext_resource type="Texture2D" uid="uid://bo7h3yc40kon3" path="res://player/Player_Walk/Walk 6.png" id="7_kb6p2"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_onrkg"] -[sub_resource type="AtlasTexture" id="AtlasTexture_i3pqv"] -atlas = ExtResource("2_onrkg") -region = Rect2(0, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hqtel"] -atlas = ExtResource("2_onrkg") -region = Rect2(240, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_sweqy"] -atlas = ExtResource("2_onrkg") -region = Rect2(480, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2hs0m"] -atlas = ExtResource("2_onrkg") -region = Rect2(720, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1jxqw"] -atlas = ExtResource("2_onrkg") -region = Rect2(960, 0, 240, 240) - [sub_resource type="SpriteFrames" id="SpriteFrames_dw050"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_i3pqv") +"texture": ExtResource("2_hg6s5") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_hqtel") +"texture": ExtResource("3_8t03j") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_sweqy") +"texture": ExtResource("4_2ieo8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_2hs0m") +"texture": ExtResource("5_ebec5") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1jxqw") +"texture": ExtResource("6_yllr7") +}, { +"duration": 1.0, +"texture": ExtResource("7_kb6p2") }], "loop": true, "name": &"walk", @@ -60,10 +48,10 @@ scale = Vector2(0.7, 0.72) shape = SubResource("CapsuleShape2D_onrkg") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(5.96046e-08, 0) -scale = Vector2(0.2, 0.2) +scale = Vector2(0.37, 0.37) sprite_frames = SubResource("SpriteFrames_dw050") animation = &"walk" +frame_progress = 0.433977 [node name="Camera2D" type="Camera2D" parent="."] position = Vector2(0, -50) diff --git a/player/player_walk.png b/player/player_walk.png deleted file mode 100644 index 794faa9..0000000 Binary files a/player/player_walk.png and /dev/null differ diff --git a/player/sword.gd b/player/sword.gd index 175d081..2053173 100644 --- a/player/sword.gd +++ b/player/sword.gd @@ -10,11 +10,12 @@ func _ready() -> void: func swing() -> void: facing = -get_parent().facing + scale.x = facing anim_sprite.visible = true + await get_tree().create_timer(0.01).timeout slash_timer = slash_duration func _physics_process(delta: float) -> void: - scale.x = facing if slash_timer > 0: slash_timer = max(0, slash_timer-delta) if(slash_timer == 0): diff --git a/player/sword.tscn b/player/sword.tscn index 6c4b80b..355a79d 100644 --- a/player/sword.tscn +++ b/player/sword.tscn @@ -1,47 +1,15 @@ -[gd_scene load_steps=10 format=3 uid="uid://d3e3kuyeh6mr1"] +[gd_scene load_steps=5 format=3 uid="uid://d3e3kuyeh6mr1"] -[ext_resource type="Texture2D" uid="uid://cyvxm1hf1rc12" path="res://player/player_walk.png" id="1_74bdg"] [ext_resource type="Script" uid="uid://cpyc4qqgpyx38" path="res://player/sword.gd" id="1_hv1tj"] +[ext_resource type="Texture2D" uid="uid://c4xg25s8loxp0" path="res://player/Player_Walk/Walk 1.png" id="2_hv1tj"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_e4ynd"] -[sub_resource type="AtlasTexture" id="AtlasTexture_r76a6"] -atlas = ExtResource("1_74bdg") -region = Rect2(0, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_dwvek"] -atlas = ExtResource("1_74bdg") -region = Rect2(240, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rx5id"] -atlas = ExtResource("1_74bdg") -region = Rect2(480, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_v4ynp"] -atlas = ExtResource("1_74bdg") -region = Rect2(720, 0, 240, 240) - -[sub_resource type="AtlasTexture" id="AtlasTexture_83fnj"] -atlas = ExtResource("1_74bdg") -region = Rect2(960, 0, 240, 240) - [sub_resource type="SpriteFrames" id="SpriteFrames_fahsa"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_r76a6") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_dwvek") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rx5id") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_v4ynp") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_83fnj") +"texture": ExtResource("2_hv1tj") }], "loop": true, "name": &"default", @@ -62,5 +30,5 @@ shape = SubResource("CapsuleShape2D_e4ynd") visible = false position = Vector2(-13, 5) rotation = 1.5708 -scale = Vector2(-0.1, -0.15) +scale = Vector2(-0.185, -0.278) sprite_frames = SubResource("SpriteFrames_fahsa")