Compare commits

...

2 Commits

31 changed files with 71 additions and 54 deletions

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dr3rp5hv7rexv"
path="res://.godot/imported/Player Idle 48x48.png-febc6ee73b16c6ae56feb25eebf8110d.ctex"
path="res://.godot/imported/Player Idle 48x48.png-381e508f88edf25243cab356c0fbe31c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_idle/Player Idle 48x48.png"
dest_files=["res://.godot/imported/Player Idle 48x48.png-febc6ee73b16c6ae56feb25eebf8110d.ctex"]
source_file="res://graphics/animations/Player Idle 48x48.png"
dest_files=["res://.godot/imported/Player Idle 48x48.png-381e508f88edf25243cab356c0fbe31c.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bnnj3lw3souky"
path="res://.godot/imported/Player Punch 64x64(1).png-30d66d61ef3a1f371d6375dad7a62029.ctex"
path="res://.godot/imported/Player Punch 64x64(1).png-49ed0f463d46ab2b5187d2030394d84a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_punch/Player Punch 64x64(1).png"
dest_files=["res://.godot/imported/Player Punch 64x64(1).png-30d66d61ef3a1f371d6375dad7a62029.ctex"]
source_file="res://graphics/animations/Player Punch 64x64(1).png"
dest_files=["res://.godot/imported/Player Punch 64x64(1).png-49ed0f463d46ab2b5187d2030394d84a.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dadvc8tsvmkb6"
path="res://.godot/imported/Player Running Shooting 48x48.png-3d2df69d2a49613816850d2eb5e6129a.ctex"
path="res://.godot/imported/Player Running Shooting 48x48.png-1a559df7db6d3e522b49a674319d83ae.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_shoot/Player Running Shooting 48x48.png"
dest_files=["res://.godot/imported/Player Running Shooting 48x48.png-3d2df69d2a49613816850d2eb5e6129a.ctex"]
source_file="res://graphics/animations/Player Running Shooting 48x48.png"
dest_files=["res://.godot/imported/Player Running Shooting 48x48.png-1a559df7db6d3e522b49a674319d83ae.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1021 B

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://uxdt2cgxicmt"
path="res://.godot/imported/player jump 48x48.png-53153cc022c0f5f1a72bef88bb5e05df.ctex"
path="res://.godot/imported/player jump 48x48.png-ac06435e7566ccee5ff27def894632a8.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_jump/player jump 48x48.png"
dest_files=["res://.godot/imported/player jump 48x48.png-53153cc022c0f5f1a72bef88bb5e05df.ctex"]
source_file="res://graphics/animations/player jump 48x48.png"
dest_files=["res://.godot/imported/player jump 48x48.png-ac06435e7566ccee5ff27def894632a8.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://8esdepvbc2c6"
path="res://.godot/imported/player land 48x48.png-73bf83889efcd0c346ed73018c7c0f6a.ctex"
path="res://.godot/imported/player land 48x48.png-5b66cd46c74a28df58237c3a87d5d801.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_land/player land 48x48.png"
dest_files=["res://.godot/imported/player land 48x48.png-73bf83889efcd0c346ed73018c7c0f6a.ctex"]
source_file="res://graphics/animations/player land 48x48.png"
dest_files=["res://.godot/imported/player land 48x48.png-5b66cd46c74a28df58237c3a87d5d801.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cmng5hu2bk4v6"
path="res://.godot/imported/player new jump 48x48.png-085528a4cee6917e773b178651dd57ae.ctex"
path="res://.godot/imported/player new jump 48x48.png-53322daf9a7ca2b5c05dd0fca1413903.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_jump/player new jump 48x48.png"
dest_files=["res://.godot/imported/player new jump 48x48.png-085528a4cee6917e773b178651dd57ae.ctex"]
source_file="res://graphics/animations/player new jump 48x48.png"
dest_files=["res://.godot/imported/player new jump 48x48.png-53322daf9a7ca2b5c05dd0fca1413903.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bgp8oow6hgh5o"
path="res://.godot/imported/player run 48x48.png-e4bb17293a9ce0c0c03376a7369aee02.ctex"
path="res://.godot/imported/player run 48x48.png-1c1aa897dbd179bd3eaa4182702eff10.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_run/player run 48x48.png"
dest_files=["res://.godot/imported/player run 48x48.png-e4bb17293a9ce0c0c03376a7369aee02.ctex"]
source_file="res://graphics/animations/player run 48x48.png"
dest_files=["res://.godot/imported/player run 48x48.png-1c1aa897dbd179bd3eaa4182702eff10.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://crll0t2wjtsly"
path="res://.godot/imported/player shoot 2H 48x48.png-6d3782d73196ec488a7fe7b78e5f5532.ctex"
path="res://.godot/imported/player shoot 2H 48x48.png-0d9f1ff6c2c832dd5172f205c1c94a24.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/animations/player_shoot/player shoot 2H 48x48.png"
dest_files=["res://.godot/imported/player shoot 2H 48x48.png-6d3782d73196ec488a7fe7b78e5f5532.ctex"]
source_file="res://graphics/animations/player shoot 2H 48x48.png"
dest_files=["res://.godot/imported/player shoot 2H 48x48.png-0d9f1ff6c2c832dd5172f205c1c94a24.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://rejfd2gqjk7w"
path="res://.godot/imported/14.png-b80bda9481eb03b9296615b658f23b86.ctex"
path="res://.godot/imported/bullet.png-997b4cba14ff93efa21eb83dfc31cdfe.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/effects/14.png"
dest_files=["res://.godot/imported/14.png-b80bda9481eb03b9296615b658f23b86.ctex"]
source_file="res://graphics/effects/bullet.png"
dest_files=["res://.godot/imported/bullet.png-997b4cba14ff93efa21eb83dfc31cdfe.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 908 B

After

Width:  |  Height:  |  Size: 908 B

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://wgf50h6hbeib"
path="res://.godot/imported/slime_green(1).png-681a56605c941b0b260c890dc1e66a86.ctex"
path="res://.godot/imported/slime_green.png-5465ec1b559c454faabc599e0b746844.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/enemies/slime_green(1).png"
dest_files=["res://.godot/imported/slime_green(1).png-681a56605c941b0b260c890dc1e66a86.ctex"]
source_file="res://graphics/enemies/slime_green.png"
dest_files=["res://.godot/imported/slime_green.png-5465ec1b559c454faabc599e0b746844.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://7jy7xuy24fug"
path="res://.godot/imported/crate-100-custom.png-5420ee27cb0ee861df6e762945a123b6.ctex"
path="res://.godot/imported/crate-100-custom.png-c94c99c951701ff4b74d28ec204bb2e5.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/tiles/crate-100-custom.png"
dest_files=["res://.godot/imported/crate-100-custom.png-5420ee27cb0ee861df6e762945a123b6.ctex"]
source_file="res://graphics/objects/crate-100-custom.png"
dest_files=["res://.godot/imported/crate-100-custom.png-c94c99c951701ff4b74d28ec204bb2e5.ctex"]
[params]

View File

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 500 B

View File

@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b3i7e40h88wh0"
path="res://.godot/imported/coin(1).png-19d802c455c83c490b6727491bcbe9e7.ctex"
path="res://.godot/imported/coin.png-b04a16f8896ddd41f884de642ba05be4.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/pickups/coin(1).png"
dest_files=["res://.godot/imported/coin(1).png-19d802c455c83c490b6727491bcbe9e7.ctex"]
source_file="res://graphics/pickups/coin.png"
dest_files=["res://.godot/imported/coin.png-b04a16f8896ddd41f884de642ba05be4.ctex"]
[params]

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://cyy6jr7mxu0jl"]
[ext_resource type="Script" uid="uid://cb874g2gkrukb" path="res://scripts/bullet.gd" id="1_mkf8s"]
[ext_resource type="Texture2D" uid="uid://rejfd2gqjk7w" path="res://graphics/effects/14.png" id="2_y25gk"]
[ext_resource type="Texture2D" uid="uid://rejfd2gqjk7w" path="res://graphics/effects/bullet.png" id="2_y25gk"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_h1aey"]
size = Vector2(16, 20)

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=17 format=3 uid="uid://31idmjadvk3t"]
[ext_resource type="Script" uid="uid://dpcuif8u6kqj5" path="res://scripts/coin.gd" id="1_i64fm"]
[ext_resource type="Texture2D" uid="uid://b3i7e40h88wh0" path="res://graphics/pickups/coin(1).png" id="1_rwqht"]
[ext_resource type="Texture2D" uid="uid://b3i7e40h88wh0" path="res://graphics/pickups/coin.png" id="1_rwqht"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i64fm"]
atlas = ExtResource("1_rwqht")

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://dnarbab7jjqmk"]
[ext_resource type="Texture2D" uid="uid://7jy7xuy24fug" path="res://graphics/tiles/crate-100-custom.png" id="1_b66cd"]
[ext_resource type="Texture2D" uid="uid://7jy7xuy24fug" path="res://graphics/objects/crate-100-custom.png" id="1_b66cd"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"]
size = Vector2(100, 100)

View File

@ -1,12 +1,13 @@
[gd_scene load_steps=56 format=3 uid="uid://d3y1iqmpknpyo"]
[gd_scene load_steps=57 format=3 uid="uid://d3y1iqmpknpyo"]
[ext_resource type="Script" uid="uid://d3hp5rjoph7hg" path="res://scripts/player.gd" id="1_3vyb7"]
[ext_resource type="Texture2D" uid="uid://dr3rp5hv7rexv" path="res://graphics/animations/player_idle/Player Idle 48x48.png" id="2_g2els"]
[ext_resource type="Texture2D" uid="uid://uxdt2cgxicmt" path="res://graphics/animations/player_jump/player jump 48x48.png" id="3_dqkch"]
[ext_resource type="Texture2D" uid="uid://bnnj3lw3souky" path="res://graphics/animations/player_punch/Player Punch 64x64(1).png" id="4_fjrip"]
[ext_resource type="Texture2D" uid="uid://bgp8oow6hgh5o" path="res://graphics/animations/player_run/player run 48x48.png" id="4_qlg0r"]
[ext_resource type="Texture2D" uid="uid://dadvc8tsvmkb6" path="res://graphics/animations/player_shoot/Player Running Shooting 48x48.png" id="5_tuyoq"]
[ext_resource type="Texture2D" uid="uid://crll0t2wjtsly" path="res://graphics/animations/player_shoot/player shoot 2H 48x48.png" id="6_fjrip"]
[ext_resource type="Texture2D" uid="uid://dr3rp5hv7rexv" path="res://graphics/animations/Player Idle 48x48.png" id="2_g2els"]
[ext_resource type="Texture2D" uid="uid://uxdt2cgxicmt" path="res://graphics/animations/player jump 48x48.png" id="3_dqkch"]
[ext_resource type="Texture2D" uid="uid://bnnj3lw3souky" path="res://graphics/animations/Player Punch 64x64(1).png" id="4_fjrip"]
[ext_resource type="Texture2D" uid="uid://bgp8oow6hgh5o" path="res://graphics/animations/player run 48x48.png" id="4_qlg0r"]
[ext_resource type="Texture2D" uid="uid://dadvc8tsvmkb6" path="res://graphics/animations/Player Running Shooting 48x48.png" id="5_tuyoq"]
[ext_resource type="Texture2D" uid="uid://crll0t2wjtsly" path="res://graphics/animations/player shoot 2H 48x48.png" id="6_fjrip"]
[ext_resource type="Script" uid="uid://bo1v353uh33hx" path="res://scenes/state_machine.gd" id="8_smehm"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3vyb7"]
radius = 6.0
@ -381,6 +382,16 @@ metadata/_edit_group_ = true
shape = SubResource("CapsuleShape2D_3vyb7")
debug_color = Color(0.521569, 0.572549, 0, 1)
[node name="PlayerSprite" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_3vyb7")
animation = &"punch"
autoplay = "idle"
frame = 7
frame_progress = 1.0
[node name="StateMachine" type="Node" parent="."]
script = ExtResource("8_smehm")
[node name="RightCast" type="RayCast2D" parent="."]
target_position = Vector2(50, 0)
collision_mask = 6
@ -395,13 +406,6 @@ position = Vector2(16, -7)
[node name="LeftSpawn" type="Marker2D" parent="."]
position = Vector2(-16, -7)
[node name="PlayerSprite" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_3vyb7")
animation = &"punch"
autoplay = "idle"
frame = 7
frame_progress = 1.0
[node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2(0, -50)

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=9 format=3 uid="uid://bts74sqcd7k7h"]
[ext_resource type="Texture2D" uid="uid://wgf50h6hbeib" path="res://graphics/enemies/slime_green(1).png" id="1_02r3y"]
[ext_resource type="Texture2D" uid="uid://wgf50h6hbeib" path="res://graphics/enemies/slime_green.png" id="1_02r3y"]
[ext_resource type="Script" uid="uid://bcxorf6dwnwbv" path="res://scripts/slimer.gd" id="1_4oill"]
[sub_resource type="AtlasTexture" id="AtlasTexture_4oill"]

12
scenes/state_machine.gd Normal file
View File

@ -0,0 +1,12 @@
class_name StateMachine
extends Node
## Node-based Finite State Machine (FSM) for the player
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
pass

View File

@ -0,0 +1 @@
uid://bo1v353uh33hx