add week3 (up to tilesets)

scenes/bullet.tscn

@@ -1,11 +1,13 @@
-[gd_scene load_steps=3 format=3 uid="uid://b53r5iysu7d4t"]
+[gd_scene load_steps=4 format=3 uid="uid://b53r5iysu7d4t"]
 
 [ext_resource type="Script" path="res://scripts/bullet.gd" id="1_qubif"]
+[ext_resource type="Texture2D" uid="uid://66hnfsu3e8ll" path="res://assets/graphics/projectiles/pixel_bullet.png" id="2_ifgvb"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_qxj7e"]
 size = Vector2(19, 4)
 
 [node name="Area2D" type="Area2D"]
+position = Vector2(1, 0)
 script = ExtResource("1_qubif")
 metadata/_edit_group_ = true
 
@@ -14,4 +16,11 @@ position = Vector2(-0.5, 0)
 shape = SubResource("RectangleShape2D_qxj7e")
 debug_color = Color(0.717124, 0, 0.290401, 0.42)
 
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture_filter = 1
+position = Vector2(-6, -2)
+rotation = -3.14159
+scale = Vector2(0.151432, 0.0740068)
+texture = ExtResource("2_ifgvb")
+
 [connection signal="body_entered" from="." to="." method="_on_body_entered"]

scenes/crate.tscn

@@ -1,11 +1,19 @@
-[gd_scene load_steps=2 format=3 uid="uid://djkjmi7bo58uv"]
+[gd_scene load_steps=3 format=3 uid="uid://djkjmi7bo58uv"]
+
+[ext_resource type="Texture2D" uid="uid://dwx4x0wq3vetw" path="res://assets/graphics/objects/crate.png" id="1_6lxxi"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ilk50"]
 size = Vector2(47, 44)
 
-[node name="RigidBody2D" type="RigidBody2D"]
+[node name="RigidBody2D" type="RigidBody2D" groups=["destructables"]]
 metadata/_edit_group_ = true
 
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture_filter = 1
+position = Vector2(0, 3)
+scale = Vector2(0.1762, 0.152876)
+texture = ExtResource("1_6lxxi")
+
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_ilk50")
 debug_color = Color(0.889053, 0.327177, 5.77569e-07, 0.42)

scenes/game.tscn

@@ -1,9 +1,11 @@
-[gd_scene load_steps=8 format=3 uid="uid://dhgts0kodsujx"]
+[gd_scene load_steps=12 format=3 uid="uid://dhgts0kodsujx"]
 
 [ext_resource type="PackedScene" uid="uid://djkjmi7bo58uv" path="res://scenes/crate.tscn" id="1_6shkr"]
-[ext_resource type="Script" path="res://scripts/gameController.gd" id="1_7tjsy"]
+[ext_resource type="Script" path="res://scripts/gameController.gd" id="1_50x63"]
+[ext_resource type="Script" path="res://scripts/sceneManager.gd" id="1_ooich"]
 [ext_resource type="PackedScene" uid="uid://b2hyqfqh02ep6" path="res://scenes/player.tscn" id="3_bssht"]
 [ext_resource type="Script" path="res://scripts/trigger.gd" id="3_t4lk8"]
+[ext_resource type="Texture2D" uid="uid://dktvd8atklmau" path="res://assets/graphics/terrains/Terrain (32x32).png" id="6_jpfcs"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_n7xvc"]
 size = Vector2(92, 20)
@@ -14,8 +16,63 @@ distance = -484.0
 [sub_resource type="CircleShape2D" id="CircleShape2D_5ph8t"]
 radius = 62.0
 
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_v72u6"]
+texture = ExtResource("6_jpfcs")
+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_fj5fk"]
+tile_size = Vector2i(32, 32)
+sources/0 = SubResource("TileSetAtlasSource_v72u6")
+
 [node name="Game" type="Node2D"]
-script = ExtResource("1_7tjsy")
+script = ExtResource("1_50x63")
 
 [node name="firstPlatform" type="StaticBody2D" parent="."]
 position = Vector2(595, 310)
@@ -30,7 +87,7 @@ shape = SubResource("RectangleShape2D_n7xvc")
 shape = SubResource("WorldBoundaryShape2D_gasd3")
 
 [node name="CharacterBody2D" parent="." instance=ExtResource("3_bssht")]
-position = Vector2(188, 575)
+position = Vector2(174, 430)
 
 [node name="Area2D" type="Area2D" parent="."]
 position = Vector2(952, 434)
@@ -41,17 +98,32 @@ metadata/_edit_group_ = true
 shape = SubResource("CircleShape2D_5ph8t")
 debug_color = Color(0.630721, 0.529414, 1.92523e-07, 0.42)
 
-[node name="RigidBody2D" parent="." groups=["pushables"] instance=ExtResource("1_6shkr")]
+[node name="SceneManager" type="Node" parent="."]
+unique_name_in_owner = true
+script = ExtResource("1_ooich")
+
+[node name="crates" type="Node2D" parent="."]
+
+[node name="RigidBody2D4" parent="crates" instance=ExtResource("1_6shkr")]
+position = Vector2(603, 24)
+
+[node name="RigidBody2D" parent="crates" groups=["pushables"] instance=ExtResource("1_6shkr")]
 position = Vector2(209, 113)
 rotation = 2.09219
 
-[node name="RigidBody2D2" parent="." groups=["pushables"] instance=ExtResource("1_6shkr")]
+[node name="RigidBody2D2" parent="crates" groups=["pushables"] instance=ExtResource("1_6shkr")]
 position = Vector2(595, 192)
-rotation = 4.86807
+rotation = -1.41512
 
-[node name="RigidBody2D3" parent="." groups=["pushables"] instance=ExtResource("1_6shkr")]
+[node name="RigidBody2D3" parent="crates" groups=["pushables"] instance=ExtResource("1_6shkr")]
 position = Vector2(373, 200)
 rotation = -0.0982481
 
+[node name="RigidBody2D5" parent="crates" instance=ExtResource("1_6shkr")]
+position = Vector2(251, 69)
+
+[node name="TileMapLayer" type="TileMapLayer" parent="."]
+tile_set = SubResource("TileSet_fj5fk")
+
 [connection signal="areaTrigger" from="Area2D" to="." method="_on_trigger"]
 [connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]

scenes/player.tscn

@@ -1,11 +1,179 @@
-[gd_scene load_steps=3 format=3 uid="uid://b2hyqfqh02ep6"]
+[gd_scene load_steps=28 format=3 uid="uid://b2hyqfqh02ep6"]
 
 [ext_resource type="Script" path="res://scripts/charController.gd" id="1_4o8do"]
+[ext_resource type="Texture2D" uid="uid://bfhqvl875is6f" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_yfuca"]
+[ext_resource type="Texture2D" uid="uid://c2s48joyna11q" path="res://assets/graphics/player/jump/player jump 48x48.png" id="3_p8gbr"]
+[ext_resource type="Texture2D" uid="uid://bvat1vqwtua2p" path="res://assets/graphics/player/run/player run 48x48.png" id="3_y36hw"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_uvblg"]
 radius = 32.5576
 
-[node name="CharacterBody2D" type="CharacterBody2D"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_cdvw1"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(0, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q1l1v"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(48, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6hv7e"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(96, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4h4qw"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(144, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_638nb"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(192, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_73fjy"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(240, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7r0nq"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(288, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5potv"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(336, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_c5yi2"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(384, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_flju4"]
+atlas = ExtResource("2_yfuca")
+region = Rect2(432, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4ckr0"]
+atlas = ExtResource("3_p8gbr")
+region = Rect2(0, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7vs6r"]
+atlas = ExtResource("3_p8gbr")
+region = Rect2(48, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ktf26"]
+atlas = ExtResource("3_p8gbr")
+region = Rect2(96, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_csmmg"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(0, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qwm4e"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(48, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mynlp"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(96, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q5scx"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(144, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j0rp2"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(192, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7fytd"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(240, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_nw067"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(288, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1caon"]
+atlas = ExtResource("3_y36hw")
+region = Rect2(336, 0, 48, 48)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_52pno"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_cdvw1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q1l1v")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6hv7e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4h4qw")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_638nb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_73fjy")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7r0nq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5potv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_c5yi2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_flju4")
+}],
+"loop": true,
+"name": &"playerIdle",
+"speed": 12.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4ckr0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7vs6r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ktf26")
+}],
+"loop": false,
+"name": &"playerJump",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_csmmg")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qwm4e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mynlp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q5scx")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j0rp2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7fytd")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_nw067")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1caon")
+}],
+"loop": true,
+"name": &"playerRun",
+"speed": 12.0
+}]
+
+[node name="CharacterBody2D" type="CharacterBody2D" groups=["player"]]
 script = ExtResource("1_4o8do")
 PUSH_FORCE = 100
 metadata/_edit_group_ = true
@@ -25,3 +193,15 @@ position = Vector2(35, -10)
 
 [node name="MarkerLeft" type="Node2D" parent="."]
 position = Vector2(-35, -10)
+
+[node name="Camera2D" type="Camera2D" parent="."]
+position = Vector2(0, -75)
+zoom = Vector2(0.5, 0.5)
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+texture_filter = 1
+position = Vector2(-1, -4)
+scale = Vector2(2.22855, 2.22855)
+sprite_frames = SubResource("SpriteFrames_52pno")
+animation = &"playerJump"
+autoplay = "playerIdle"