diff --git a/Assets/Sprites/Characters/base.ase b/Assets/Sprites/Characters/base.ase new file mode 100644 index 0000000..ed5e1da Binary files /dev/null and b/Assets/Sprites/Characters/base.ase differ diff --git a/Assets/Sprites/Characters/forsen2.ase b/Assets/Sprites/Characters/forsen2.ase new file mode 100644 index 0000000..3590540 Binary files /dev/null and b/Assets/Sprites/Characters/forsen2.ase differ diff --git a/Assets/Sprites/Characters/forsen2.png b/Assets/Sprites/Characters/forsen2.png new file mode 100644 index 0000000..14ca95e Binary files /dev/null and b/Assets/Sprites/Characters/forsen2.png differ diff --git a/Assets/Sprites/Characters/forsen2.png.import b/Assets/Sprites/Characters/forsen2.png.import new file mode 100644 index 0000000..b7cddcf --- /dev/null +++ b/Assets/Sprites/Characters/forsen2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bej8thq7ruyty" +path="res://.godot/imported/forsen2.png-8301023a2bec675455049399a4141c47.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Characters/forsen2.png" +dest_files=["res://.godot/imported/forsen2.png-8301023a2bec675455049399a4141c47.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/Assets/Sprites/palette.pal b/Assets/Sprites/palette.pal new file mode 100644 index 0000000..9770424 --- /dev/null +++ b/Assets/Sprites/palette.pal @@ -0,0 +1,49 @@ +JASC-PAL +0100 +46 +23 32 56 +37 58 94 +60 94 139 +79 143 186 +115 190 211 +164 221 219 +25 51 45 +37 86 46 +70 130 50 +117 167 67 +168 202 88 +208 218 145 +77 43 50 +122 72 65 +173 119 87 +192 148 115 +215 181 148 +231 213 179 +52 28 39 +96 44 44 +136 75 43 +190 119 43 +222 158 65 +232 193 112 +36 21 39 +65 29 49 +117 36 56 +165 48 48 +207 87 60 +218 134 62 +30 29 57 +64 39 81 +122 54 123 +162 62 140 +198 81 151 +223 132 165 +9 10 20 +16 20 31 +21 29 40 +32 46 55 +57 74 80 +87 114 119 +129 151 150 +168 181 178 +199 207 204 +235 237 233 diff --git a/Characters/ExampleEnemy.tscn b/Characters/ExampleEnemy.tscn index 7077955..8104da0 100644 --- a/Characters/ExampleEnemy.tscn +++ b/Characters/ExampleEnemy.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=25 format=3 uid="uid://ddcf6bfv212wj"] +[gd_scene load_steps=26 format=3 uid="uid://ddcf6bfv212wj"] [ext_resource type="Script" path="res://Characters/Enemy.cs" id="1_2yopk"] [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="1_fx1w5"] [ext_resource type="Script" path="res://Characters/States/Machine.cs" id="3_k4ypw"] -[ext_resource type="Texture2D" uid="uid://dxymfduyrbuvx" path="res://Assets/Sprites/Characters/forsen.png" id="3_oxsgl"] +[ext_resource type="Texture2D" uid="uid://bej8thq7ruyty" path="res://Assets/Sprites/Characters/forsen2.png" id="3_ocaae"] [ext_resource type="Script" path="res://Characters/States/NPCIdleState.cs" id="4_8r2qn"] [ext_resource type="Script" path="res://Characters/States/NPCMoveState.cs" id="5_utogm"] [ext_resource type="PackedScene" uid="uid://cjgxyhgcyvsv7" path="res://BoundingBoxes/Hurtbox.tscn" id="6_jo0cg"] @@ -16,42 +16,46 @@ shader = ExtResource("1_fx1w5") shader_parameter/color = Quaternion(1, 1, 1, 1) shader_parameter/intensity = 0.0 -[sub_resource type="AtlasTexture" id="AtlasTexture_6d2tf"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_55yt4"] +atlas = ExtResource("3_ocaae") region = Rect2(0, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_bdyma"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_xa1bi"] +atlas = ExtResource("3_ocaae") region = Rect2(24, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_0dwbr"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_hiodl"] +atlas = ExtResource("3_ocaae") region = Rect2(48, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_r7fn6"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_tok7d"] +atlas = ExtResource("3_ocaae") region = Rect2(72, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_py8k0"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_dp8x6"] +atlas = ExtResource("3_ocaae") region = Rect2(96, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_g3nb2"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_sglor"] +atlas = ExtResource("3_ocaae") region = Rect2(120, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_jauql"] -atlas = ExtResource("3_oxsgl") +[sub_resource type="AtlasTexture" id="AtlasTexture_gb41o"] +atlas = ExtResource("3_ocaae") region = Rect2(144, 0, 24, 24) -[sub_resource type="SpriteFrames" id="SpriteFrames_4tm2b"] +[sub_resource type="AtlasTexture" id="AtlasTexture_bx6qq"] +atlas = ExtResource("3_ocaae") +region = Rect2(168, 0, 24, 24) + +[sub_resource type="SpriteFrames" id="SpriteFrames_6pejo"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_6d2tf") +"texture": SubResource("AtlasTexture_55yt4") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_bdyma") +"texture": SubResource("AtlasTexture_xa1bi") }], "loop": true, "name": &"idle", @@ -59,19 +63,22 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_0dwbr") +"texture": SubResource("AtlasTexture_hiodl") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_r7fn6") +"texture": SubResource("AtlasTexture_tok7d") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_py8k0") +"texture": SubResource("AtlasTexture_dp8x6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_g3nb2") +"texture": SubResource("AtlasTexture_sglor") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_jauql") +"texture": SubResource("AtlasTexture_gb41o") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bx6qq") }], "loop": true, "name": &"move", @@ -82,7 +89,7 @@ animations = [{ size = Vector2(16, 8) [sub_resource type="RectangleShape2D" id="RectangleShape2D_8lxmf"] -size = Vector2(16, 24) +size = Vector2(16, 18) [sub_resource type="Animation" id="Animation_dxevc"] resource_name = "Hurt" @@ -134,7 +141,8 @@ StateMachine = NodePath("StateMachine") Faction = 2 [node name="Sprite" type="AnimatedSprite2D" parent="."] -sprite_frames = SubResource("SpriteFrames_4tm2b") +use_parent_material = true +sprite_frames = SubResource("SpriteFrames_6pejo") animation = &"move" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] @@ -158,6 +166,7 @@ IdleState = NodePath("../Idle") Faction = 2 [node name="CollisionShape2D" parent="Hurtbox" index="0"] +position = Vector2(0, 4) shape = SubResource("RectangleShape2D_8lxmf") [node name="Inventory" type="Node2D" parent="."] diff --git a/Characters/Player.tscn b/Characters/Player.tscn index fe35f8f..44ebaaa 100644 --- a/Characters/Player.tscn +++ b/Characters/Player.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=28 format=3 uid="uid://b2254pup8k161"] +[gd_scene load_steps=29 format=3 uid="uid://b2254pup8k161"] [ext_resource type="Script" path="res://Characters/Player.cs" id="1_flygr"] [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="2_ngsgt"] -[ext_resource type="Texture2D" uid="uid://dxymfduyrbuvx" path="res://Assets/Sprites/Characters/forsen.png" id="3_ig4hs"] [ext_resource type="Script" path="res://Characters/States/Machine.cs" id="3_npkjp"] [ext_resource type="Script" path="res://Characters/States/PlayerIdleState.cs" id="4_4k4mb"] +[ext_resource type="Texture2D" uid="uid://bej8thq7ruyty" path="res://Assets/Sprites/Characters/forsen2.png" id="4_5vird"] [ext_resource type="PackedScene" uid="uid://cl56eadpklnbo" path="res://Utils/PlayerCamera.tscn" id="4_ym125"] [ext_resource type="Script" path="res://Characters/States/PlayerMoveState.cs" id="5_tx5rw"] [ext_resource type="Script" path="res://Characters/States/PlayerRollState.cs" id="6_6bgrj"] @@ -18,42 +18,46 @@ shader = ExtResource("2_ngsgt") shader_parameter/color = Quaternion(1, 1, 1, 1) shader_parameter/intensity = 0.0 -[sub_resource type="AtlasTexture" id="AtlasTexture_us1ce"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_55yt4"] +atlas = ExtResource("4_5vird") region = Rect2(0, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_hn4kf"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_xa1bi"] +atlas = ExtResource("4_5vird") region = Rect2(24, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_wfbeq"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_hiodl"] +atlas = ExtResource("4_5vird") region = Rect2(48, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_qlmwk"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_tok7d"] +atlas = ExtResource("4_5vird") region = Rect2(72, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_l1vgu"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_dp8x6"] +atlas = ExtResource("4_5vird") region = Rect2(96, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_ytlaa"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_sglor"] +atlas = ExtResource("4_5vird") region = Rect2(120, 0, 24, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_1q30d"] -atlas = ExtResource("3_ig4hs") +[sub_resource type="AtlasTexture" id="AtlasTexture_gb41o"] +atlas = ExtResource("4_5vird") region = Rect2(144, 0, 24, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_bx6qq"] +atlas = ExtResource("4_5vird") +region = Rect2(168, 0, 24, 24) + [sub_resource type="SpriteFrames" id="SpriteFrames_2h7cf"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_us1ce") +"texture": SubResource("AtlasTexture_55yt4") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_hn4kf") +"texture": SubResource("AtlasTexture_xa1bi") }], "loop": true, "name": &"idle", @@ -61,19 +65,22 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_wfbeq") +"texture": SubResource("AtlasTexture_hiodl") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qlmwk") +"texture": SubResource("AtlasTexture_tok7d") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_l1vgu") +"texture": SubResource("AtlasTexture_dp8x6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_ytlaa") +"texture": SubResource("AtlasTexture_sglor") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1q30d") +"texture": SubResource("AtlasTexture_gb41o") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bx6qq") }], "loop": true, "name": &"move", @@ -87,7 +94,7 @@ size = Vector2(16, 8) font_size = 24 [sub_resource type="RectangleShape2D" id="RectangleShape2D_cjk6b"] -size = Vector2(16, 24) +size = Vector2(11, 14) [sub_resource type="Animation" id="Animation_dxevc"] resource_name = "Hurt" @@ -146,7 +153,7 @@ position_smoothing_speed = 8.0 [node name="Sprite" type="AnimatedSprite2D" parent="."] use_parent_material = true sprite_frames = SubResource("SpriteFrames_2h7cf") -animation = &"idle" +animation = &"move" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(0, 8) @@ -199,11 +206,13 @@ InventoryMap = { } [node name="Sword" parent="Inventory" instance=ExtResource("7_4rxuv")] +position = Vector2(0, 0) [node name="Hurtbox" parent="." instance=ExtResource("9_avyu4")] Faction = 1 [node name="CollisionShape2D" parent="Hurtbox" index="0"] +position = Vector2(-0.5, 5) shape = SubResource("RectangleShape2D_cjk6b") [node name="FlashAnimation" type="AnimationPlayer" parent="."] diff --git a/Items/Weapons/Sword.tscn b/Items/Weapons/Sword.tscn index 86ae2fd..ba48772 100644 --- a/Items/Weapons/Sword.tscn +++ b/Items/Weapons/Sword.tscn @@ -7,10 +7,6 @@ [ext_resource type="Texture2D" uid="uid://do1bui3bblkk7" path="res://Assets/Sprites/sword-swing.png" id="5_pywek"] [ext_resource type="AudioStream" uid="uid://c4n7ioxpukdwi" path="res://Assets/Sounds/parry.wav" id="6_8nxjm"] -[sub_resource type="Gradient" id="Gradient_jjxq2"] -offsets = PackedFloat32Array(0, 0.945312) -colors = PackedColorArray(1, 1, 1, 1, 0.687215, 0.687215, 0.687215, 0) - [sub_resource type="Curve" id="Curve_4cxtp"] _data = [Vector2(0.00687286, 1), 0.0, 0.0, 0, 0, Vector2(0.879725, 0.190909), -2.93145, -2.93145, 0, 0, Vector2(1, 0.0454545), 0.0483926, 0.0, 0, 0] point_count = 3 @@ -19,6 +15,10 @@ point_count = 3 offsets = PackedFloat32Array(0.835938, 0.992188) colors = PackedColorArray(1, 1, 1, 0.498039, 1, 1, 1, 0) +[sub_resource type="Gradient" id="Gradient_jjxq2"] +offsets = PackedFloat32Array(0, 0.945312) +colors = PackedColorArray(1, 1, 1, 1, 0.687215, 0.687215, 0.687215, 0) + [sub_resource type="Animation" id="Animation_b7327"] length = 0.001 tracks/0/type = "value" @@ -302,7 +302,7 @@ position = Vector2(2, 0) script = ExtResource("1_mlo73") Hitbox = NodePath("Hitbox") AnimationPlayer = NodePath("AnimationPlayer") -ParryParticles = NodePath("Anchor/Sprite2D/ParryParticles") +ParryParticles = NodePath("Anchor/Node2D/Sprite2D/ParryParticles") Damage = 20.0 UseTime = 0.5 Knockback = 20.0 @@ -311,12 +311,22 @@ Knockback = 20.0 y_sort_enabled = true rotation = -0.610865 -[node name="Sprite2D" type="Sprite2D" parent="Anchor"] +[node name="Trail" parent="Anchor" node_paths=PackedStringArray("Tracking") instance=ExtResource("4_pt6lq")] +position = Vector2(2.40734, -0.55655) +rotation = 0.945464 +width_curve = SubResource("Curve_4cxtp") +gradient = SubResource("Gradient_2ablm") +Tracking = NodePath("../Node2D/Sprite2D") + +[node name="Node2D" type="Node2D" parent="Anchor"] +position = Vector2(0, -4) + +[node name="Sprite2D" type="Sprite2D" parent="Anchor/Node2D"] y_sort_enabled = true -position = Vector2(0, -10) +position = Vector2(-1.19209e-07, -10) texture = ExtResource("2_rnfo4") -[node name="ParryParticles" type="CPUParticles2D" parent="Anchor/Sprite2D"] +[node name="ParryParticles" type="CPUParticles2D" parent="Anchor/Node2D/Sprite2D"] position = Vector2(-0.221825, -3.12132) rotation = 0.785398 emitting = false @@ -333,13 +343,6 @@ initial_velocity_min = 8.0 initial_velocity_max = 64.0 color_ramp = SubResource("Gradient_jjxq2") -[node name="Trail" parent="Anchor" node_paths=PackedStringArray("Tracking") instance=ExtResource("4_pt6lq")] -position = Vector2(2.40734, -0.55655) -rotation = 0.945464 -width_curve = SubResource("Curve_4cxtp") -gradient = SubResource("Gradient_2ablm") -Tracking = NodePath("../Sprite2D") - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_tao4k")