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..a9aad14 --- /dev/null +++ b/assets/Graphics/Objects/crate.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5njx5bnaw5hh" +path="res://.godot/imported/crate.png-a531a05d3c42890c714e0d401dee9ee9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Graphics/Objects/crate.png" +dest_files=["res://.godot/imported/crate.png-a531a05d3c42890c714e0d401dee9ee9.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..f4e1842 --- /dev/null +++ b/assets/Graphics/Player/Idle/Player Idle 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bgoelfb8aet7q" +path="res://.godot/imported/Player Idle 48x48.png-efd2826edd9a6533d58e7d863b181d2e.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-efd2826edd9a6533d58e7d863b181d2e.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..554c9ef --- /dev/null +++ b/assets/Graphics/Player/Jump/player jump 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cyc2lhuw8rqjp" +path="res://.godot/imported/player jump 48x48.png-da51fb2fca152ea767a87a559b98b050.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-da51fb2fca152ea767a87a559b98b050.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..d0a0d98 --- /dev/null +++ b/assets/Graphics/Player/Run/player run 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dgnq6klmbtmnr" +path="res://.godot/imported/player run 48x48.png-40c45949bd53c17f4c1d95d93a9440fe.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-40c45949bd53c17f4c1d95d93a9440fe.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/Projectile/pixel_bullet.png b/assets/Graphics/Projectile/pixel_bullet.png new file mode 100644 index 0000000..900d030 Binary files /dev/null and b/assets/Graphics/Projectile/pixel_bullet.png differ diff --git a/assets/Graphics/Projectile/pixel_bullet.png.import b/assets/Graphics/Projectile/pixel_bullet.png.import new file mode 100644 index 0000000..f20cc6e --- /dev/null +++ b/assets/Graphics/Projectile/pixel_bullet.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4wrlbnmaq42e" +path="res://.godot/imported/pixel_bullet.png-bc41c453d48c8ac8246c62e098308335.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Graphics/Projectile/pixel_bullet.png" +dest_files=["res://.godot/imported/pixel_bullet.png-bc41c453d48c8ac8246c62e098308335.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/Terrains/Terrain (32x32).png b/assets/Graphics/Terrains/Terrain (32x32).png new file mode 100644 index 0000000..ddf1eaf Binary files /dev/null and b/assets/Graphics/Terrains/Terrain (32x32).png differ diff --git a/assets/Graphics/Terrains/Terrain (32x32).png.import b/assets/Graphics/Terrains/Terrain (32x32).png.import new file mode 100644 index 0000000..2123d48 --- /dev/null +++ b/assets/Graphics/Terrains/Terrain (32x32).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cfghfv0tk8mvk" +path="res://.godot/imported/Terrain (32x32).png-babef81f0ab972222f512990ecfdde3c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Graphics/Terrains/Terrain (32x32).png" +dest_files=["res://.godot/imported/Terrain (32x32).png-babef81f0ab972222f512990ecfdde3c.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/scenes/bullet.tscn b/scenes/bullet.tscn index 1478aae..f5068d8 100644 --- a/scenes/bullet.tscn +++ b/scenes/bullet.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://cc7r60jbw6uyo"] +[gd_scene load_steps=4 format=3 uid="uid://cc7r60jbw6uyo"] [ext_resource type="Script" uid="uid://bayboh7t0ss7p" path="res://scripts/bullet.gd" id="1_mkf8s"] +[ext_resource type="Texture2D" uid="uid://c4wrlbnmaq42e" path="res://assets/Graphics/Projectile/pixel_bullet.png" id="2_y25gk"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_y25gk"] size = Vector2(18, 6) @@ -9,6 +10,12 @@ size = Vector2(18, 6) script = ExtResource("1_mkf8s") metadata/_edit_group_ = true +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(-6, 3) +scale = Vector2(-0.141958, 0.122063) +texture = ExtResource("2_y25gk") + [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_y25gk") debug_color = Color(0.690582, 0.49486, 0.146364, 0.42) diff --git a/scenes/crate.tscn b/scenes/crate.tscn index 24d3ac1..a45a342 100644 --- a/scenes/crate.tscn +++ b/scenes/crate.tscn @@ -1,11 +1,20 @@ -[gd_scene load_steps=2 format=3 uid="uid://dm0s1wei11x43"] +[gd_scene load_steps=3 format=3 uid="uid://dm0s1wei11x43"] + +[ext_resource type="Texture2D" uid="uid://5njx5bnaw5hh" path="res://assets/Graphics/Objects/crate.png" id="1_b66cd"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"] +size = Vector2(20, 19) [node name="RigidBody2D3" type="RigidBody2D"] -rotation = 1.00826 metadata/_edit_group_ = true +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, 1) +scale = Vector2(0.0754546, 0.0689688) +texture = ExtResource("1_b66cd") + [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(0, -0.5) shape = SubResource("RectangleShape2D_uwrxv") debug_color = Color(0.869503, 0.340519, 0.233585, 0.42) diff --git a/scenes/game.tscn b/scenes/game.tscn index 75ea2c5..a29ded2 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,25 +1,87 @@ -[gd_scene load_steps=8 format=3 uid="uid://dc4obqdsdq81h"] +[gd_scene load_steps=12 format=4 uid="uid://dc4obqdsdq81h"] [ext_resource type="Script" uid="uid://dflv3rb4v8c0r" path="res://scripts/gamecontroller.gd" id="1_lnu2h"] [ext_resource type="Script" uid="uid://lbasdkinbtif" path="res://scripts/scene_manager.gd" id="2_p57ef"] +[ext_resource type="Texture2D" uid="uid://cfghfv0tk8mvk" path="res://assets/Graphics/Terrains/Terrain (32x32).png" id="2_u5sy4"] [ext_resource type="PackedScene" uid="uid://dm0s1wei11x43" path="res://scenes/crate.tscn" id="3_lbhrr"] [ext_resource type="PackedScene" uid="uid://bu03yhhfncspe" path="res://scenes/trigger.tscn" id="4_iywne"] [ext_resource type="PackedScene" uid="uid://dgf4ypom7mnn4" path="res://scenes/player.tscn" id="4_lbhrr"] [ext_resource type="PackedScene" uid="uid://cc7r60jbw6uyo" path="res://scenes/bullet.tscn" id="5_iywne"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_gee14"] +texture = ExtResource("2_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_8cj0n"] size = Vector2(60, 20) +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_u5sy4"] + [node name="Game" type="Node2D"] script = ExtResource("1_lnu2h") +[node name="TileMapLayer" type="TileMapLayer" parent="."] +tile_map_data = PackedByteArray("AAARAAsAAAAEAAQAAAASAAsAAAAEAAQAAAATAAsAAAAEAAQAAAAQAAsAAAAEAAQAAAAPAAsAAAAEAAQAAAAUAAsAAAAEAAQAAAA=") +tile_set = SubResource("TileSet_0tnpc") + [node name="SceneManager" type="Node2D" parent="."] unique_name_in_owner = true script = ExtResource("2_p57ef") [node name="StaticBody2D" type="StaticBody2D" parent="."] -position = Vector2(571, 369) -scale = Vector2(2.6, 1) +position = Vector2(576, 369) +scale = Vector2(3.15361, 1.6) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] @@ -28,13 +90,6 @@ shape = SubResource("RectangleShape2D_8cj0n") [node name="RigidBody2D3" parent="." instance=ExtResource("3_lbhrr")] position = Vector2(551, 270) -[node name="Area2D" parent="." instance=ExtResource("4_iywne")] -position = Vector2(519, 453) - -[node name="Area2D2" parent="." instance=ExtResource("4_iywne")] -position = Vector2(653, 461) -effect = "powerup" - [node name="RigidBody2D4" parent="." instance=ExtResource("3_lbhrr")] position = Vector2(570, 193) @@ -47,5 +102,21 @@ position = Vector2(559, 339) [node name="Bullet" parent="." instance=ExtResource("5_iywne")] position = Vector2(435, 324) -[connection signal="areatrigger" from="Area2D" to="." method="_on_areatrigger"] -[connection signal="areatrigger" from="Area2D2" to="." method="_on_areatrigger"] +[node name="triggers" type="Node2D" parent="."] + +[node name="Area2D" parent="triggers" instance=ExtResource("4_iywne")] +position = Vector2(519, 453) + +[node name="Area2D2" parent="triggers" instance=ExtResource("4_iywne")] +position = Vector2(653, 461) +effect = "powerup" + +[node name="StaticBody2D2" type="StaticBody2D" parent="."] +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"] +position = Vector2(583, 546) +shape = SubResource("WorldBoundaryShape2D_u5sy4") + +[connection signal="areatrigger" from="triggers/Area2D" to="." method="_on_areatrigger"] +[connection signal="areatrigger" from="triggers/Area2D2" to="." method="_on_areatrigger"] diff --git a/scenes/player.tscn b/scenes/player.tscn index 210ae9d..388f7d2 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,182 @@ -[gd_scene load_steps=3 format=3 uid="uid://dgf4ypom7mnn4"] +[gd_scene load_steps=28 format=3 uid="uid://dgf4ypom7mnn4"] [ext_resource type="Script" uid="uid://dmyw2bn6gnbbv" path="res://scripts/character_body_2d.gd" id="1_4flbx"] +[ext_resource type="Texture2D" uid="uid://cyc2lhuw8rqjp" path="res://assets/Graphics/Player/Jump/player jump 48x48.png" id="2_dqkch"] +[ext_resource type="Texture2D" uid="uid://bgoelfb8aet7q" path="res://assets/Graphics/Player/Idle/Player Idle 48x48.png" id="2_g2els"] +[ext_resource type="Texture2D" uid="uid://dgnq6klmbtmnr" path="res://assets/Graphics/Player/Run/player run 48x48.png" id="3_qhqgy"] [sub_resource type="CircleShape2D" id="CircleShape2D_8cj0n"] +[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_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": &"Falling", +"speed": 12.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") +}], +"loop": false, +"name": &"Jump", +"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_4flbx") metadata/_edit_group_ = true @@ -23,3 +196,12 @@ position = Vector2(14, -8) [node name="LeftSpawn" type="Node2D" parent="."] position = Vector2(-14, -8) + +[node name="PlayerGraphic" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -6) +sprite_frames = SubResource("SpriteFrames_jej6c") +animation = &"Falling" +autoplay = "Idle" + +[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"] diff --git a/scripts/character_body_2d.gd b/scripts/character_body_2d.gd index 5f0bf2f..3375146 100644 --- a/scripts/character_body_2d.gd +++ b/scripts/character_body_2d.gd @@ -7,19 +7,36 @@ const JUMP_VELOCITY = -400.0 @onready var left_cast: RayCast2D = $"Left cast" @onready var right_spawn: Node2D = $RightSpawn @onready var left_spawn: Node2D = $LeftSpawn +@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic enum FaceDirection{LEFT, RIGHT} var facing:FaceDirection = FaceDirection.RIGHT +enum State{IDLE, RUN, JUMP, FALLING} +var current_state:State = State.IDLE var pushTarget var pushEnable = false - +var direction +var upJump = false func _physics_process(delta: float) -> void: + #game loop + handle_input() + #calculate movment + handle_movement(delta) + #change states + update_states() + #play animations + update_animation() + #object raycasts + #handle_collisions() # Add the gravity. - if not is_on_floor(): - velocity += get_gravity() * delta + + + move_and_slide() + handle_collisions() +func handle_input(): if Input.is_action_just_pressed("shove") && pushEnable: print("shove pressed") if facing == FaceDirection.RIGHT: @@ -41,20 +58,13 @@ func _physics_process(delta: float) -> void: # Handle jump.x if Input.is_action_just_pressed("ui_accept") and is_on_floor(): velocity.y = JUMP_VELOCITY - + current_state = State.JUMP + upJump = true # 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) - - move_and_slide() + direction = Input.get_axis("ui_left", "ui_right") + +func handle_collisions(): for i in get_slide_collision_count(): var c = get_slide_collision(i) if c.get_collider() is RigidBody2D: @@ -77,4 +87,51 @@ func _physics_process(delta: float) -> void: pushEnable = true if not right_cast.is_colliding() && not left_cast.is_colliding(): pushEnable = false +func handle_movement(delta): + if not is_on_floor(): + velocity += get_gravity() * delta + if direction: + velocity.x = direction * SPEED + if direction <0: + facing = FaceDirection.LEFT + player_graphic.flip_h = true + if direction >0: + facing = FaceDirection.RIGHT + player_graphic.flip_h = false + else: + velocity.x = move_toward(velocity.x, 0, SPEED) +func update_animation(): + match current_state: + State.IDLE: + player_graphic.play("Idle") + State.RUN: + print("play run animation") + player_graphic.play("run") + State.JUMP: + if upJump: + player_graphic.play("Jump") + State.FALLING: + player_graphic.play("Falling") +func update_states(): + match current_state: + #idle when movment in x + State.IDLE when velocity.x !=0: + current_state = State.RUN + State.RUN: + if velocity.x ==0: + current_state = State.IDLE + #jumping when reaching apex + 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 _on_animation_finished() -> void: + match current_state: + State.JUMP: + upJump = false diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index ca1b119..47e3c2f 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -3,7 +3,13 @@ extends Node2D var bullet = preload("res://scenes/bullet.tscn") var bulletArray = [] var totalAllowedBullets = 7 +@onready var triggers: Node2D = $"../triggers" +@onready var gameController: Node2D = $".." + +func _ready() -> void: + for obj in triggers.get_children(): + obj.areatrigger.connect(gameController._on_areatrigger) #makes bullets func bulletFactory(): var mybullet