tilemap layer, state maschine, scenemanager, animations, accel

scenes/bullet.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://lg8k51aicde4"]
 
-[ext_resource type="Script" path="res://scripts/bullet.gd" id="1_bpcfw"]
+[ext_resource type="Script" uid="uid://p7brl4n4miw6" path="res://scripts/bullet.gd" id="1_bpcfw"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_oprgb"]
 size = Vector2(8, 4)

scenes/crate.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://d0mw3eh00s3kr"]
 
-[ext_resource type="Script" path="res://scripts/crate.gd" id="1_j2btj"]
+[ext_resource type="Script" uid="uid://bv1u5eyjco2m8" path="res://scripts/crate.gd" id="1_j2btj"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"]
 

scenes/game.tscn

@@ -1,11 +1,66 @@
-[gd_scene load_steps=9 format=3 uid="uid://doctwh8lc63y5"]
+[gd_scene load_steps=11 format=3 uid="uid://doctwh8lc63y5"]
 
-[ext_resource type="Script" path="res://scripts/gamecontroller.gd" id="1_lnu2h"]
+[ext_resource type="Script" uid="uid://cpua8fr5bby78" path="res://scripts/gamecontroller.gd" id="1_lnu2h"]
 [ext_resource type="PackedScene" uid="uid://b5p1mlv4c1olv" path="res://scenes/player.tscn" id="2_5tj0f"]
-[ext_resource type="Script" path="res://scripts/scene_manager.gd" id="2_w84c1"]
+[ext_resource type="Script" uid="uid://chu805lvjnh7s" path="res://scripts/scene_manager.gd" id="2_w84c1"]
 [ext_resource type="PackedScene" uid="uid://6n3305pqp43a" path="res://scenes/trigger.tscn" id="2_yqjtg"]
+[ext_resource type="Texture2D" uid="uid://cfoysdgyt6nar" path="res://assets/graphics/environment/terrain/Terrain (32x32)(1).png" id="4_p57ef"]
 [ext_resource type="PackedScene" uid="uid://d0mw3eh00s3kr" path="res://scenes/crate.tscn" id="4_syc2o"]
-[ext_resource type="PackedScene" uid="uid://lg8k51aicde4" path="res://scenes/bullet.tscn" id="5_3trti"]
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u5sy4"]
+texture = ExtResource("4_p57ef")
+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_gee14"]
+tile_size = Vector2i(32, 32)
+sources/0 = SubResource("TileSetAtlasSource_u5sy4")
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_8cj0n"]
 size = Vector2(52, 20)
@@ -19,8 +74,17 @@ script = ExtResource("1_lnu2h")
 unique_name_in_owner = true
 script = ExtResource("2_w84c1")
 
+[node name="Player" parent="." instance=ExtResource("2_5tj0f")]
+position = Vector2(580, 368)
+
+[node name="TileMapLayer" type="TileMapLayer" parent="."]
+texture_filter = 1
+tile_map_data = PackedByteArray(0, 0, 17, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 18, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 19, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 20, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0)
+tile_set = SubResource("TileSet_gee14")
+
 [node name="StaticBody2D" type="StaticBody2D" parent="."]
-position = Vector2(580, 413)
+position = Vector2(610, 430)
+scale = Vector2(2.47859, 1.32127)
 metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
@@ -33,19 +97,25 @@ metadata/_edit_group_ = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="ground"]
 shape = SubResource("WorldBoundaryShape2D_8cj0n")
 
-[node name="Player" parent="." instance=ExtResource("2_5tj0f")]
-position = Vector2(580, 368)
-
-[node name="Area2D" parent="." instance=ExtResource("2_yqjtg")]
-position = Vector2(872, 521)
-
 [node name="Crate" parent="." instance=ExtResource("4_syc2o")]
 position = Vector2(592, 261)
 
-[node name="trigger" parent="." instance=ExtResource("2_yqjtg")]
+[node name="Crate2" parent="." instance=ExtResource("4_syc2o")]
+position = Vector2(554, 287)
+
+[node name="Crate3" parent="." instance=ExtResource("4_syc2o")]
+position = Vector2(671, 320)
+
+[node name="Crate4" parent="." instance=ExtResource("4_syc2o")]
+position = Vector2(640, 382)
+
+[node name="triggers" type="Node2D" parent="."]
+
+[node name="player hurt" parent="triggers" instance=ExtResource("2_yqjtg")]
+position = Vector2(872, 521)
+effect = "player_hurt"
+
+[node name="trigger" parent="triggers" instance=ExtResource("2_yqjtg")]
 position = Vector2(389, 519)
 
-[node name="Bullet" parent="." instance=ExtResource("5_3trti")]
-position = Vector2(433, 332)
-
-[connection signal="areaTriggerSignal" from="Area2D" to="." method="_on_trigger"]
+[connection signal="areaTriggerSignal" from="triggers/player hurt" to="." method="_on_trigger"]

scenes/player.tscn

@@ -1,9 +1,182 @@
-[gd_scene load_steps=3 format=3 uid="uid://b5p1mlv4c1olv"]
+[gd_scene load_steps=28 format=3 uid="uid://b5p1mlv4c1olv"]
 
-[ext_resource type="Script" path="res://scripts/player.gd" id="1_bqfhv"]
+[ext_resource type="Script" uid="uid://cnwga6l2btdbk" path="res://scripts/player.gd" id="1_bqfhv"]
+[ext_resource type="Texture2D" uid="uid://daf4mmxa2xsjv" path="res://assets/graphics/player/jump_fall/player jump 48x48(1).png" id="2_dqkch"]
+[ext_resource type="Texture2D" uid="uid://djtlpe43a18d5" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_g2els"]
+[ext_resource type="Texture2D" uid="uid://dctuuekg8fi6i" 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": &"fall",
+"speed": 2.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="Player" type="CharacterBody2D"]
 script = ExtResource("1_bqfhv")
 metadata/_edit_group_ = true
@@ -23,3 +196,16 @@ position = Vector2(12, -7)
 
 [node name="LeftSpawn" type="Node2D" parent="."]
 position = Vector2(-12, -7)
+
+[node name="jumpBufferTimer" type="Timer" parent="."]
+wait_time = 1.5
+one_shot = true
+
+[node name="PlayerGraphic" type="AnimatedSprite2D" parent="."]
+texture_filter = 1
+position = Vector2(2, -7)
+sprite_frames = SubResource("SpriteFrames_jej6c")
+animation = &"jump"
+autoplay = "idle"
+
+[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"]

scenes/trigger.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://6n3305pqp43a"]
 
-[ext_resource type="Script" path="res://scripts/trigger.gd" id="1_du5ex"]
+[ext_resource type="Script" uid="uid://c57chsew3r87y" path="res://scripts/trigger.gd" id="1_du5ex"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_uwrxv"]