diff --git a/assets/graphics/objects/crate.png b/assets/graphics/objects/crate.png new file mode 100644 index 0000000..2b8bdcd Binary files /dev/null and b/assets/graphics/objects/crate.png differ diff --git a/assets/graphics/objects/crate.png.import b/assets/graphics/objects/crate.png.import new file mode 100644 index 0000000..0199e50 --- /dev/null +++ b/assets/graphics/objects/crate.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bqob0e6lqh00m" +path="res://.godot/imported/crate.png-b286bd97caa3cbc59746f2db7de46191.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/objects/crate.png" +dest_files=["res://.godot/imported/crate.png-b286bd97caa3cbc59746f2db7de46191.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/graphics/player/idle/Player Idle 48x48.png b/assets/graphics/player/idle/Player Idle 48x48.png new file mode 100644 index 0000000..b618511 Binary files /dev/null and b/assets/graphics/player/idle/Player Idle 48x48.png differ diff --git a/assets/graphics/player/idle/Player Idle 48x48.png.import b/assets/graphics/player/idle/Player Idle 48x48.png.import new file mode 100644 index 0000000..007a70a --- /dev/null +++ b/assets/graphics/player/idle/Player Idle 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbcs1873oc7m7" +path="res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/idle/Player Idle 48x48.png" +dest_files=["res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.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/graphics/player/jump/player jump 48x48.png b/assets/graphics/player/jump/player jump 48x48.png new file mode 100644 index 0000000..dff105c Binary files /dev/null and b/assets/graphics/player/jump/player jump 48x48.png differ diff --git a/assets/graphics/player/jump/player jump 48x48.png.import b/assets/graphics/player/jump/player jump 48x48.png.import new file mode 100644 index 0000000..4dace56 --- /dev/null +++ b/assets/graphics/player/jump/player jump 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x7vc805d7m4t" +path="res://.godot/imported/player jump 48x48.png-1ccba0c36041038682bf917e1f6cf991.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/jump/player jump 48x48.png" +dest_files=["res://.godot/imported/player jump 48x48.png-1ccba0c36041038682bf917e1f6cf991.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/graphics/player/melee/Player Punch 64x64.png b/assets/graphics/player/melee/Player Punch 64x64.png new file mode 100644 index 0000000..c9a4660 Binary files /dev/null and b/assets/graphics/player/melee/Player Punch 64x64.png differ diff --git a/assets/graphics/player/melee/Player Punch 64x64.png.import b/assets/graphics/player/melee/Player Punch 64x64.png.import new file mode 100644 index 0000000..31aca63 --- /dev/null +++ b/assets/graphics/player/melee/Player Punch 64x64.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqwcn03jnrupq" +path="res://.godot/imported/Player Punch 64x64.png-33e4e573bec61bfc6c49e25fc6b5a4fc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/melee/Player Punch 64x64.png" +dest_files=["res://.godot/imported/Player Punch 64x64.png-33e4e573bec61bfc6c49e25fc6b5a4fc.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/graphics/player/run/player run 48x48.png b/assets/graphics/player/run/player run 48x48.png new file mode 100644 index 0000000..aca5b55 Binary files /dev/null and b/assets/graphics/player/run/player run 48x48.png differ diff --git a/assets/graphics/player/run/player run 48x48.png.import b/assets/graphics/player/run/player run 48x48.png.import new file mode 100644 index 0000000..325bd11 --- /dev/null +++ b/assets/graphics/player/run/player run 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chiih26xngprp" +path="res://.godot/imported/player run 48x48.png-6d66612d48bfa4c8721495ba557ab7c6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/run/player run 48x48.png" +dest_files=["res://.godot/imported/player run 48x48.png-6d66612d48bfa4c8721495ba557ab7c6.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/graphics/projectiles/pixel_bullet.png b/assets/graphics/projectiles/pixel_bullet.png new file mode 100644 index 0000000..900d030 Binary files /dev/null and b/assets/graphics/projectiles/pixel_bullet.png differ diff --git a/assets/graphics/projectiles/pixel_bullet.png.import b/assets/graphics/projectiles/pixel_bullet.png.import new file mode 100644 index 0000000..bafd944 --- /dev/null +++ b/assets/graphics/projectiles/pixel_bullet.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bkrkdhusuqjlc" +path="res://.godot/imported/pixel_bullet.png-30d6d1e8b5e1332f8b2e2cee72a9e790.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/projectiles/pixel_bullet.png" +dest_files=["res://.godot/imported/pixel_bullet.png-30d6d1e8b5e1332f8b2e2cee72a9e790.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/graphics/terrain/Terrain (32x32).png b/assets/graphics/terrain/Terrain (32x32).png new file mode 100644 index 0000000..ddf1eaf Binary files /dev/null and b/assets/graphics/terrain/Terrain (32x32).png differ diff --git a/assets/graphics/terrain/Terrain (32x32).png.import b/assets/graphics/terrain/Terrain (32x32).png.import new file mode 100644 index 0000000..ef3ed49 --- /dev/null +++ b/assets/graphics/terrain/Terrain (32x32).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c386aypkw54oc" +path="res://.godot/imported/Terrain (32x32).png-194c6de0879a7b165a791510d6d55058.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/terrain/Terrain (32x32).png" +dest_files=["res://.godot/imported/Terrain (32x32).png-194c6de0879a7b165a791510d6d55058.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/sounds/Grass Running(1).wav b/assets/sounds/Grass Running(1).wav new file mode 100644 index 0000000..75e7657 Binary files /dev/null and b/assets/sounds/Grass Running(1).wav differ diff --git a/assets/sounds/Grass Running(1).wav.import b/assets/sounds/Grass Running(1).wav.import new file mode 100644 index 0000000..b593ed3 --- /dev/null +++ b/assets/sounds/Grass Running(1).wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c75tmkma6y3n" +path="res://.godot/imported/Grass Running(1).wav-02909ffc50e1c01e7d561079487e01d4.sample" + +[deps] + +source_file="res://assets/sounds/Grass Running(1).wav" +dest_files=["res://.godot/imported/Grass Running(1).wav-02909ffc50e1c01e7d561079487e01d4.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/project.godot b/project.godot index 6e5c7d5..034f95b 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,14 @@ run/main_scene="res://scenes/game.tscn" config/features=PackedStringArray("4.4", "Forward Plus") config/icon="res://icon.svg" +[display] + +window/size/viewport_width=320 +window/size/viewport_height=180 +window/size/window_width_override=960 +window/size/window_height_override=540 +window/stretch/mode="viewport" + [file_customization] folder_colors={ diff --git a/scenes/bullet.tscn b/scenes/bullet.tscn index 62d5c31..b1f8825 100644 --- a/scenes/bullet.tscn +++ b/scenes/bullet.tscn @@ -1,15 +1,23 @@ -[gd_scene load_steps=3 format=3 uid="uid://c633ux67ehud7"] +[gd_scene load_steps=4 format=3 uid="uid://c633ux67ehud7"] [ext_resource type="Script" uid="uid://d165adohwtkk5" path="res://scripts/bullet.gd" id="1_mkf8s"] +[ext_resource type="Texture2D" uid="uid://bkrkdhusuqjlc" path="res://assets/graphics/projectiles/pixel_bullet.png" id="2_y25gk"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_y25gk"] -size = Vector2(14, 6) +size = Vector2(13, 5) [node name="Area2D" type="Area2D"] script = ExtResource("1_mkf8s") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(-0.5, 0.5) shape = SubResource("RectangleShape2D_y25gk") debug_color = Color(0.255636, 0.520768, 0.950461, 0.42) +[node name="bulletImage" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(4, 3) +scale = Vector2(0.1, 0.1) +texture = ExtResource("2_y25gk") + [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/crate.tscn b/scenes/crate.tscn index 2b44931..f35d154 100644 --- a/scenes/crate.tscn +++ b/scenes/crate.tscn @@ -1,14 +1,20 @@ -[gd_scene load_steps=3 format=3 uid="uid://cym46ub26gs80"] +[gd_scene load_steps=4 format=3 uid="uid://cym46ub26gs80"] [ext_resource type="Script" uid="uid://dqvbrplt605am" path="res://scripts/crate.gd" id="1_b66cd"] +[ext_resource type="Texture2D" uid="uid://bqob0e6lqh00m" path="res://assets/graphics/objects/crate.png" id="2_dwt0d"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_gk4xx"] [node name="RigidBody2D" type="RigidBody2D" groups=["pushables"]] -rotation = 1.13734 script = ExtResource("1_b66cd") metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_gk4xx") debug_color = Color(0.854534, 0.360936, 0.197499, 0.42) + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(4.29153e-06, 1.5) +scale = Vector2(0.0728571, 0.0664286) +texture = ExtResource("2_dwt0d") diff --git a/scenes/game.tscn b/scenes/game.tscn index db0366c..ac5997d 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,12 +1,68 @@ -[gd_scene load_steps=9 format=3 uid="uid://cwuxdg5c8ylmp"] +[gd_scene load_steps=12 format=3 uid="uid://cwuxdg5c8ylmp"] [ext_resource type="Script" uid="uid://cw3ucen7ivcu3" path="res://scripts/gamecontroller.gd" id="1_wj22x"] [ext_resource type="Script" uid="uid://bus3b1g717jlm" path="res://scripts/scene_manager.gd" id="2_lbhrr"] [ext_resource type="PackedScene" uid="uid://cgk1d1f5ffbbd" path="res://scenes/player.tscn" id="2_lnu2h"] [ext_resource type="PackedScene" uid="uid://clf5mhteceas4" path="res://scenes/trigger.tscn" id="3_jlag1"] +[ext_resource type="Texture2D" uid="uid://c386aypkw54oc" path="res://assets/graphics/terrain/Terrain (32x32).png" id="3_u5sy4"] [ext_resource type="PackedScene" uid="uid://cym46ub26gs80" path="res://scenes/crate.tscn" id="4_iywne"] [ext_resource type="PackedScene" uid="uid://c633ux67ehud7" path="res://scenes/bullet.tscn" id="6_p57ef"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_gee14"] +texture = ExtResource("3_u5sy4") +texture_region_size = Vector2i(32, 32) +0:0/0 = 0 +1:0/0 = 0 +2:0/0 = 0 +4:0/0 = 0 +6:0/0 = 0 +7:0/0 = 0 +9:0/0 = 0 +10:0/0 = 0 +12:0/0 = 0 +13:0/0 = 0 +15:0/0 = 0 +0:1/0 = 0 +1:1/0 = 0 +2:1/0 = 0 +4:1/0 = 0 +6:1/0 = 0 +7:1/0 = 0 +9:1/0 = 0 +10:1/0 = 0 +12:1/0 = 0 +13:1/0 = 0 +15:1/0 = 0 +16:1/0 = 0 +0:2/0 = 0 +1:2/0 = 0 +2:2/0 = 0 +4:2/0 = 0 +6:3/0 = 0 +7:3/0 = 0 +9:3/0 = 0 +10:3/0 = 0 +12:3/0 = 0 +13:3/0 = 0 +15:3/0 = 0 +16:3/0 = 0 +0:4/0 = 0 +1:4/0 = 0 +2:4/0 = 0 +4:4/0 = 0 +6:4/0 = 0 +7:4/0 = 0 +9:4/0 = 0 +10:4/0 = 0 +12:4/0 = 0 +13:4/0 = 0 +15:4/0 = 0 +16:4/0 = 0 + +[sub_resource type="TileSet" id="TileSet_0tnpc"] +tile_size = Vector2i(32, 32) +sources/0 = SubResource("TileSetAtlasSource_gee14") + [sub_resource type="RectangleShape2D" id="RectangleShape2D_um86g"] size = Vector2(55.5, 41) @@ -19,13 +75,19 @@ script = ExtResource("1_wj22x") unique_name_in_owner = true script = ExtResource("2_lbhrr") +[node name="TileMapLayer" type="TileMapLayer" parent="."] +texture_filter = 1 +tile_map_data = PackedByteArray(0, 0, 14, 0, 10, 0, 0, 0, 4, 0, 4, 0, 0, 0, 17, 0, 8, 0, 0, 0, 0, 0, 4, 0, 0, 0, 18, 0, 8, 0, 0, 0, 1, 0, 4, 0, 0, 0, 19, 0, 8, 0, 0, 0, 1, 0, 4, 0, 0, 0, 20, 0, 8, 0, 0, 0, 2, 0, 4, 0, 0, 0) +tile_set = SubResource("TileSet_0tnpc") + [node name="CharacterBody2D" parent="." instance=ExtResource("2_lnu2h")] position = Vector2(471, 287) [node name="level" type="Node2D" parent="."] [node name="StaticBody2D" type="StaticBody2D" parent="level"] -position = Vector2(461, 335) +position = Vector2(465, 331) +scale = Vector2(0.600002, 1) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="level/StaticBody2D"] @@ -41,7 +103,8 @@ position = Vector2(-0.75, 10.5) shape = SubResource("RectangleShape2D_um86g") [node name="StaticBody2D3" type="StaticBody2D" parent="level"] -position = Vector2(586, 271) +position = Vector2(610, 267) +scale = Vector2(2.2, 1) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="level/StaticBody2D3"] diff --git a/scenes/player.tscn b/scenes/player.tscn index 74d6b9b..cf622c2 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,216 @@ -[gd_scene load_steps=3 format=3 uid="uid://cgk1d1f5ffbbd"] +[gd_scene load_steps=33 format=3 uid="uid://cgk1d1f5ffbbd"] [ext_resource type="Script" uid="uid://dmchcjip7pcfj" path="res://scripts/player.gd" id="1_3vyb7"] +[ext_resource type="Texture2D" uid="uid://x7vc805d7m4t" path="res://assets/graphics/player/jump/player jump 48x48.png" id="2_dqkch"] +[ext_resource type="Texture2D" uid="uid://dbcs1873oc7m7" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_g2els"] +[ext_resource type="Texture2D" uid="uid://chiih26xngprp" path="res://assets/graphics/player/run/player run 48x48.png" id="3_qhqgy"] +[ext_resource type="Texture2D" uid="uid://dqwcn03jnrupq" path="res://assets/graphics/player/melee/Player Punch 64x64.png" id="4_qlg0r"] [sub_resource type="CircleShape2D" id="CircleShape2D_ryu2m"] +[sub_resource type="AtlasTexture" id="AtlasTexture_i4ail"] +atlas = ExtResource("2_dqkch") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qhqgy"] +atlas = ExtResource("2_g2els") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dqkch"] +atlas = ExtResource("2_g2els") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qlg0r"] +atlas = ExtResource("2_g2els") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_tuyoq"] +atlas = ExtResource("2_g2els") +region = Rect2(144, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fjrip"] +atlas = ExtResource("2_g2els") +region = Rect2(192, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_smehm"] +atlas = ExtResource("2_g2els") +region = Rect2(240, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ur7pv"] +atlas = ExtResource("2_g2els") +region = Rect2(288, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y4r1p"] +atlas = ExtResource("2_g2els") +region = Rect2(336, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_d2wvv"] +atlas = ExtResource("2_g2els") +region = Rect2(384, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3v2ag"] +atlas = ExtResource("2_g2els") +region = Rect2(432, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_a38lo"] +atlas = ExtResource("2_dqkch") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4ni07"] +atlas = ExtResource("2_dqkch") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_l71n6"] +atlas = ExtResource("2_dqkch") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ke2ow"] +atlas = ExtResource("4_qlg0r") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ujl30"] +atlas = ExtResource("4_qlg0r") +region = Rect2(192, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_31cv2"] +atlas = ExtResource("4_qlg0r") +region = Rect2(256, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jej6c"] +atlas = ExtResource("3_qhqgy") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"] +atlas = ExtResource("3_qhqgy") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_oprun"] +atlas = ExtResource("3_qhqgy") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_a8ls1"] +atlas = ExtResource("3_qhqgy") +region = Rect2(144, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qfm1y"] +atlas = ExtResource("3_qhqgy") +region = Rect2(192, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fulsm"] +atlas = ExtResource("3_qhqgy") +region = Rect2(240, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4r5pv"] +atlas = ExtResource("3_qhqgy") +region = Rect2(288, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_60mlk"] +atlas = ExtResource("3_qhqgy") +region = Rect2(336, 0, 48, 48) + +[sub_resource type="SpriteFrames" id="SpriteFrames_jej6c"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_i4ail") +}], +"loop": false, +"name": &"fall", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_qhqgy") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dqkch") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qlg0r") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_tuyoq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fjrip") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_smehm") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ur7pv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_y4r1p") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_d2wvv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3v2ag") +}], +"loop": true, +"name": &"idle", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_a38lo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4ni07") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_l71n6") +}], +"loop": false, +"name": &"jump", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_ke2ow") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ujl30") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_31cv2") +}], +"loop": false, +"name": &"melee", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_jej6c") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_f1ej7") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_oprun") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_a8ls1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qfm1y") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fulsm") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4r5pv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_60mlk") +}], +"loop": true, +"name": &"run", +"speed": 12.0 +}] + [node name="CharacterBody2D" type="CharacterBody2D"] script = ExtResource("1_3vyb7") metadata/_edit_group_ = true @@ -23,3 +230,21 @@ position = Vector2(12, -5) [node name="LeftSpawn" type="Node2D" parent="."] position = Vector2(-13, -5) + +[node name="JumpBufferTimer" type="Timer" parent="."] +wait_time = 0.5 +one_shot = true + +[node name="PlayerGraphic" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -7) +sprite_frames = SubResource("SpriteFrames_jej6c") +animation = &"melee" +autoplay = "idle" + +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2(0, -20) + +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] + +[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"] diff --git a/scripts/bullet.gd b/scripts/bullet.gd index a938bcd..1b85662 100644 --- a/scripts/bullet.gd +++ b/scripts/bullet.gd @@ -1,10 +1,15 @@ class_name Bullet extends Area2D var speed = 700 +@onready var bullet_image: Sprite2D = $bulletImage signal bulletHit(body, bullet) func setSpeed(value): speed = value + if speed <0: + bullet_image.flip_h = true + if speed >0: + bullet_image.flip_h = false func _physics_process(delta: float) -> void: position += transform.x * speed * delta diff --git a/scripts/gamecontroller.gd b/scripts/gamecontroller.gd index d2d0f75..f7a260c 100644 --- a/scripts/gamecontroller.gd +++ b/scripts/gamecontroller.gd @@ -11,10 +11,10 @@ func _ready() -> void: timer.connect("timeout", secondCounter) timer.start() func secondCounter(): - print("tick") + timeLimit -=1 if timeLimit <= 0: - print("you lose baby") + get_tree().reload_current_scene() # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/scripts/player.gd b/scripts/player.gd index d2ffd83..c74af7d 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -1,29 +1,47 @@ class_name Player extends CharacterBody2D +@onready var audio_stream_player_2d: AudioStreamPlayer2D = $AudioStreamPlayer2D + +const GRASS_RUNNING = preload("res://assets/sounds/Grass Running(1).wav") @onready var right_cast: RayCast2D = $RightCast @onready var left_cast: RayCast2D = $LeftCast @onready var right_spawn: Node2D = $RightSpawn @onready var left_spawn: Node2D = $LeftSpawn +@onready var jump_buffer_timer: Timer = $JumpBufferTimer +@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic const SPEED = 300.0 const JUMP_VELOCITY = -400.0 @export var bump_power = 80 @export var shove_power = 500 +@export var acceleration = 15 +@export var hard_gravity = 5 + +enum State{IDLE, RUN, JUMP, FALLING, MELEE} +var current_state = State.IDLE enum FaceDirection{LEFT, RIGHT} var facing:FaceDirection = FaceDirection.RIGHT +var direction:float = 0 var pushTarget:RigidBody2D var pushEnabled:bool = false +var upJump:bool = false func _physics_process(delta: float) -> void: # Add the gravity. - if not is_on_floor(): + if current_state == State.JUMP: + # apply normal gravity velocity += get_gravity() * delta - + else: + #apply hard gravity + velocity += get_gravity() * hard_gravity * delta handle_input() + update_movement() + update_states() + update_animation() move_and_slide() handle_collisions() @@ -37,6 +55,7 @@ func handle_input() -> void: if Input.is_action_just_pressed("shove") && pushEnabled: print("Shove attack!") + current_state = State.MELEE if facing == FaceDirection.LEFT: print("facing left") pushTarget.apply_central_impulse(Vector2(-1,0) * shove_power) @@ -46,27 +65,69 @@ func handle_input() -> void: pushTarget.apply_central_impulse(Vector2(1,0) * shove_power) pushEnabled = false # Handle jump. - if Input.is_action_just_pressed("ui_accept") and is_on_floor(): + if Input.is_action_just_pressed("ui_accept"): + jump_buffer_timer.start() + if is_on_floor() && jump_buffer_timer.time_left >0: velocity.y = JUMP_VELOCITY + current_state = State.JUMP + upJump = true + jump_buffer_timer.stop() # Get the input direction and handle the movement/deceleration. # As good practice, you should replace UI actions with custom gameplay actions. - var direction := Input.get_axis("ui_left", "ui_right") - if direction: - velocity.x = direction * SPEED - if direction <0: - facing = FaceDirection.LEFT - if direction > 0: - facing = FaceDirection.RIGHT - else: - velocity.x = move_toward(velocity.x, 0, SPEED) + direction = Input.get_axis("ui_left", "ui_right") + func update_movement()-> void: - pass + if direction: + velocity.x = move_toward(velocity.x, SPEED * direction, acceleration) + if direction <0: + facing = FaceDirection.LEFT + player_graphic.flip_h = true + if direction > 0: + player_graphic.flip_h = false + facing = FaceDirection.RIGHT + else: + velocity.x = move_toward(velocity.x, 0, acceleration) func update_states()->void: - pass - + match current_state: + #describe all the rules state + State.IDLE when velocity.x !=0: + current_state = State.RUN + #player stops running + State.RUN: + if velocity.x == 0: + current_state = State.IDLE + if not is_on_floor() && velocity.y > 0: + current_state = State.FALLING + + State.JUMP when velocity.y > 0: + current_state = State.FALLING + + State.FALLING when is_on_floor(): + if velocity.x ==0: + current_state = State.IDLE + else: + current_state = State.RUN + +func update_animation()->void: + match current_state: + State.IDLE: + player_graphic.play("idle") + State.RUN: + player_graphic.play("run") + if not audio_stream_player_2d.playing: + audio_stream_player_2d.stream=GRASS_RUNNING + audio_stream_player_2d.playing = true + State.JUMP: + if upJump: + player_graphic.play("jump") + State.FALLING: + player_graphic.play("fall") + State.MELEE: + player_graphic.play("melee") + func handle_collisions()->void: for i in get_slide_collision_count(): var c = get_slide_collision(i) @@ -74,19 +135,25 @@ func handle_collisions()->void: c.get_collider().apply_central_impulse(-c.get_normal() * bump_power) if right_cast.is_colliding() && facing==FaceDirection.RIGHT: - print("right raycast is hitting something") + var collider = right_cast.get_collider() if collider is Node && collider is RigidBody2D: - print("I think it is a crate") pushTarget = collider pushEnabled = true if left_cast.is_colliding() && facing==FaceDirection.LEFT: - print("left raycast is hitting something") + var collider = left_cast.get_collider() if collider is Node && collider is RigidBody2D: - print("I think it is a crate on the left") pushTarget = collider pushEnabled = true if not right_cast.is_colliding() and not left_cast.is_colliding(): pushEnabled = false + + +func _on_animation_finished() -> void: + match current_state: + State.JUMP: + upJump = false + State.MELEE: + current_state = State.IDLE