Update project.godot

README.md

@@ -1 +1,2 @@
-see [Releases](https://git.sechat.de/jonas/retromariogodot/-/releases)
+see [Releases](https://git.sechat.de/jonas/retromariogodot/-/releases)<br/>
+https://mariomaker32.itch.io/mario-bros-retro - pwd: 1234

assets/bg-2-1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dpsuhnumiv82j"
+path="res://.godot/imported/bg-2-1.png-5097df23ce250700d0d91ce99bc5a171.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/bg-2-1.png"
+dest_files=["res://.godot/imported/bg-2-1.png-5097df23ce250700d0d91ce99bc5a171.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

export_presets.cfg

@@ -419,7 +419,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../../../../../home/jonas/Schreibtisch/Export_Web/retromario.html"
+export_path="../../../../../home/jonas/Schreibtisch/Export_Web/index.html"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false

project.godot

@@ -20,7 +20,7 @@ config/icon="res://assets/icon.png"
 [display]
 
 window/stretch/mode="viewport"
-window/stretch/aspect="keep_height"
+window/vsync/vsync_mode=0
 
 [global]
 
@@ -41,30 +41,35 @@ move_left={
 "deadzone": 0.5,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":13,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 move_right={
 "deadzone": 0.5,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 jump={
 "deadzone": 0.5,
 "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 crawl={
 "deadzone": 0.5,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 flower={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 

scenes/blocks/itemblock_invisible.tscn

@@ -0,0 +1,26 @@
+[gd_scene load_steps=4 format=3 uid="uid://badk308gvg1my"]
+
+[ext_resource type="Script" path="res://scripts/blocks/itemblock_invisible.gd" id="1_ap62p"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_4kmo0"]
+size = Vector2(16, 16)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_enc16"]
+size = Vector2(10, 1)
+
+[node name="itemblock_invisible" type="RigidBody2D"]
+gravity_scale = 0.0
+script = ExtResource("1_ap62p")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(8, -8)
+shape = SubResource("RectangleShape2D_4kmo0")
+
+[node name="activate" type="Area2D" parent="."]
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="activate"]
+position = Vector2(8, 0.5)
+shape = SubResource("RectangleShape2D_enc16")
+
+[connection signal="body_entered" from="activate" to="." method="_on_activate_body_entered"]

scenes/enemies/gumba.tscn

@@ -50,6 +50,7 @@ lock_rotation = true
 script = ExtResource("1_o30u3")
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+z_index = 3
 position = Vector2(8, -8)
 sprite_frames = SubResource("SpriteFrames_xnecu")
 autoplay = "default"

scenes/items/itemblock_flower.tscn

@@ -0,0 +1,80 @@
+[gd_scene load_steps=11 format=3 uid="uid://cwhx0kcemeyx"]
+
+[ext_resource type="Script" path="res://scripts/blocks/itemblock.gd" id="1_rbj5t"]
+[ext_resource type="PackedScene" uid="uid://bp71ntkh281k5" path="res://scenes/items/fire_flower.tscn" id="2_ov77e"]
+[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="3_v5sih"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_lo6hv"]
+atlas = ExtResource("3_v5sih")
+region = Rect2(4, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ghd0r"]
+atlas = ExtResource("3_v5sih")
+region = Rect2(34, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5py80"]
+atlas = ExtResource("3_v5sih")
+region = Rect2(64, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4m3oc"]
+atlas = ExtResource("3_v5sih")
+region = Rect2(4, 4, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_r54gk"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_lo6hv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ghd0r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5py80")
+}],
+"loop": false,
+"name": &"destroy",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4m3oc")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 5.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_4kmo0"]
+size = Vector2(16, 16)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_enc16"]
+size = Vector2(10, 1)
+
+[node name="itemblock" type="RigidBody2D"]
+gravity_scale = 0.0
+script = ExtResource("1_rbj5t")
+hit_object = ExtResource("2_ov77e")
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+position = Vector2(8, -8)
+sprite_frames = SubResource("SpriteFrames_r54gk")
+animation = &"destroy"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(8, -8)
+shape = SubResource("RectangleShape2D_4kmo0")
+
+[node name="activate" type="Area2D" parent="."]
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="activate"]
+position = Vector2(8, 0.5)
+shape = SubResource("RectangleShape2D_enc16")
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 0.3
+one_shot = true
+
+[connection signal="body_entered" from="activate" to="." method="_on_activate_body_entered"]
+[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

scenes/items/itemblock_mushroom.tscn

@@ -0,0 +1,80 @@
+[gd_scene load_steps=11 format=3 uid="uid://d032da33bfwtu"]
+
+[ext_resource type="Script" path="res://scripts/blocks/itemblock.gd" id="1_3b5hu"]
+[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="2_iid7x"]
+[ext_resource type="PackedScene" uid="uid://b4dp88urmm7g8" path="res://scenes/items/mushroom.tscn" id="2_np1mh"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_lo6hv"]
+atlas = ExtResource("2_iid7x")
+region = Rect2(4, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ghd0r"]
+atlas = ExtResource("2_iid7x")
+region = Rect2(34, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5py80"]
+atlas = ExtResource("2_iid7x")
+region = Rect2(64, 4, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4m3oc"]
+atlas = ExtResource("2_iid7x")
+region = Rect2(4, 4, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_r54gk"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_lo6hv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ghd0r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5py80")
+}],
+"loop": false,
+"name": &"destroy",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4m3oc")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 5.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_4kmo0"]
+size = Vector2(16, 16)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_enc16"]
+size = Vector2(10, 1)
+
+[node name="itemblock" type="RigidBody2D"]
+gravity_scale = 0.0
+script = ExtResource("1_3b5hu")
+hit_object = ExtResource("2_np1mh")
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+position = Vector2(8, -8)
+sprite_frames = SubResource("SpriteFrames_r54gk")
+animation = &"destroy"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(8, -8)
+shape = SubResource("RectangleShape2D_4kmo0")
+
+[node name="activate" type="Area2D" parent="."]
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="activate"]
+position = Vector2(8, 0.5)
+shape = SubResource("RectangleShape2D_enc16")
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 0.3
+one_shot = true
+
+[connection signal="body_entered" from="activate" to="." method="_on_activate_body_entered"]
+[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

scenes/items/jump_thing.tscn

@@ -0,0 +1,61 @@
+[gd_scene load_steps=8 format=3 uid="uid://daaajdv7ve15a"]
+
+[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="1_cnc0s"]
+[ext_resource type="Script" path="res://scripts/items/jump_thing.gd" id="1_nrv87"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jjx8i"]
+atlas = ExtResource("1_cnc0s")
+region = Rect2(94, 0, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8phfu"]
+atlas = ExtResource("1_cnc0s")
+region = Rect2(154, 8, 16, 8)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_1s1v4"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jjx8i")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8phfu")
+}],
+"loop": true,
+"name": &"down",
+"speed": 5.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_mnewg"]
+size = Vector2(14, 47)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_luw3y"]
+size = Vector2(16, 24)
+
+[node name="jump_thing" type="Node2D"]
+script = ExtResource("1_nrv87")
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+position = Vector2(8, -12)
+sprite_frames = SubResource("SpriteFrames_1s1v4")
+autoplay = "default"
+
+[node name="Area2D" type="Area2D" parent="."]
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+position = Vector2(8, -23.5)
+shape = SubResource("RectangleShape2D_mnewg")
+
+[node name="StaticBody2D" type="StaticBody2D" parent="."]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
+position = Vector2(8, -12)
+shape = SubResource("RectangleShape2D_luw3y")
+
+[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"]
+[connection signal="body_exited" from="Area2D" to="." method="_on_area_2d_body_exited"]

scenes/levels/level_0.tscn

@@ -86,7 +86,26 @@ theme_override_font_sizes/font_size = 24
 disabled = true
 text = "Level 4"
 
+[node name="Button_5" type="Button" parent="Control"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -240.0
+offset_top = 76.0
+offset_right = -32.0
+offset_bottom = 140.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_fonts/font = ExtResource("2_3ebbo")
+theme_override_font_sizes/font_size = 24
+disabled = true
+text = "Level 5"
+
 [connection signal="pressed" from="Control/Button_1" to="." method="_on_button_pressed" binds= ["1"]]
 [connection signal="pressed" from="Control/Button_2" to="." method="_on_button_pressed" binds= ["2"]]
 [connection signal="pressed" from="Control/Button_3" to="." method="_on_button_pressed" binds= ["3"]]
 [connection signal="pressed" from="Control/Button_4" to="." method="_on_button_pressed" binds= ["4"]]
+[connection signal="pressed" from="Control/Button_5" to="." method="_on_button_pressed" binds= ["5"]]

scenes/levels/level_1.tscn

@@ -19089,6 +19089,8 @@ auto_collect = true
 
 [node name="destroyblock" parent="interactable_blocks" instance=ExtResource("5_k4kpc")]
 position = Vector2(160, -48)
+hit_object = ExtResource("4_7ycg6")
+auto_collect = true
 
 [node name="itemblock2" parent="interactable_blocks" instance=ExtResource("3_4oas0")]
 position = Vector2(176, -48)
@@ -19096,6 +19098,8 @@ hit_object = ExtResource("6_1e33i")
 
 [node name="destroyblock2" parent="interactable_blocks" instance=ExtResource("5_k4kpc")]
 position = Vector2(192, -48)
+hit_object = ExtResource("4_7ycg6")
+auto_collect = true
 
 [node name="itemblock3" parent="interactable_blocks" instance=ExtResource("3_4oas0")]
 position = Vector2(208, -48)
@@ -19160,6 +19164,8 @@ auto_collect = true
 
 [node name="destroyblock17" parent="interactable_blocks" instance=ExtResource("5_k4kpc")]
 position = Vector2(1424, -48)
+hit_object = ExtResource("4_7ycg6")
+auto_collect = true
 
 [node name="destroyblock18" parent="interactable_blocks" instance=ExtResource("5_k4kpc")]
 position = Vector2(1520, -48)
@@ -19316,19 +19322,22 @@ position = Vector2(736, 0)
 position = Vector2(768, 0)
 
 [node name="Gumba4" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(1120, 0)
+position = Vector2(1200, -128)
 
 [node name="Gumba5" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(1152, 0)
+position = Vector2(1232, -128)
 
 [node name="Gumba6" parent="Enemies" instance=ExtResource("8_6vd8t")]
 position = Vector2(1472, 0)
 
+[node name="Gumba16" parent="Enemies" instance=ExtResource("8_6vd8t")]
+position = Vector2(1504, 0)
+
 [node name="Gumba8" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(2672, 0)
+position = Vector2(2784, 0)
 
 [node name="Gumba9" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(2752, 0)
+position = Vector2(2816, 0)
 
 [node name="Gumba10" parent="Enemies" instance=ExtResource("8_6vd8t")]
 position = Vector2(576, 0)
@@ -19343,10 +19352,10 @@ position = Vector2(1760, 0)
 position = Vector2(1792, 0)
 
 [node name="Gumba12" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(1904, 0)
+position = Vector2(1936, 0)
 
 [node name="Gumba13" parent="Enemies" instance=ExtResource("8_6vd8t")]
-position = Vector2(1936, 0)
+position = Vector2(1968, 0)
 
 [node name="Gumba14" parent="Enemies" instance=ExtResource("8_6vd8t")]
 position = Vector2(2016, 0)
@@ -19455,5 +19464,26 @@ position = Vector2(1296, 0)
 [node name="StaticBody2D3" parent="." instance=ExtResource("15_ac2kk")]
 position = Vector2(1328, 0)
 
+[node name="Camera2D" type="Camera2D" parent="."]
+unique_name_in_owner = true
+position = Vector2(35, 0)
+zoom = Vector2(3, 3)
+limit_left = -160
+limit_top = -184
+limit_bottom = 32
+position_smoothing_enabled = true
+position_smoothing_speed = 10.0
+
+[node name="ColorRect" type="ColorRect" parent="Camera2D"]
+unique_name_in_owner = true
+visible = false
+z_index = 50
+offset_left = -3995.0
+offset_top = -1678.0
+offset_right = 3965.0
+offset_bottom = 1594.0
+mouse_filter = 1
+color = Color(0, 0, 0, 1)
+
 [connection signal="body_entered" from="WorldBoundDown" to="WorldBoundDown" method="_on_body_entered"]
 [connection signal="timeout" from="WorldBoundDown/Timer" to="WorldBoundDown" method="_on_timer_timeout"]

scenes/levels/level_2.tscn

@@ -45095,6 +45095,8 @@ text = "120"
 
 [node name="destroyblock_dark" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(336, -64)
+hit_object = ExtResource("9_a4rwl")
+auto_collect = true
 
 [node name="destroyblock_dark2" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(480, -48)
@@ -45239,6 +45241,7 @@ position = Vector2(864, -144)
 
 [node name="destroyblock_dark80" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(960, -48)
+hit_object = ExtResource("14_kgxub")
 
 [node name="destroyblock_dark118" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(944, -48)
@@ -45293,6 +45296,8 @@ position = Vector2(1008, -64)
 
 [node name="destroyblock_dark85" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(1024, -64)
+hit_object = ExtResource("9_a4rwl")
+auto_collect = true
 
 [node name="destroyblock_dark86" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(1008, -80)
@@ -45614,6 +45619,7 @@ position = Vector2(2336, -64)
 
 [node name="destroyblock_dark174" parent="breakBlocks" instance=ExtResource("6_hol3k")]
 position = Vector2(2352, -64)
+hit_object = ExtResource("14_kgxub")
 
 [node name="interactionBlocks" type="Node" parent="."]
 
@@ -45641,10 +45647,6 @@ position = Vector2(96, -48)
 hit_object = ExtResource("9_a4rwl")
 auto_collect = true
 
-[node name="itemblock6" parent="interactionBlocks" instance=ExtResource("6_1xseh")]
-position = Vector2(960, -64)
-hit_object = ExtResource("14_kgxub")
-
 [node name="coins" type="Node" parent="."]
 
 [node name="Coin" parent="coins" instance=ExtResource("9_a4rwl")]
@@ -45768,19 +45770,19 @@ target = Vector2(-80, -736)
 [node name="enemies" type="Node" parent="."]
 
 [node name="Gumba" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(96, 0)
+position = Vector2(112, 0)
 
 [node name="Gumba2" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(128, 0)
+position = Vector2(144, -16)
 
 [node name="Gumba3" parent="enemies" instance=ExtResource("16_qpvvg")]
 position = Vector2(336, 0)
 
 [node name="coopa" parent="enemies" instance=ExtResource("17_4rxmp")]
-position = Vector2(496, 0)
+position = Vector2(560, 0)
 
 [node name="coopa2" parent="enemies" instance=ExtResource("17_4rxmp")]
-position = Vector2(528, 0)
+position = Vector2(592, 0)
 
 [node name="coopa3" parent="enemies" instance=ExtResource("17_4rxmp")]
 position = Vector2(800, 0)
@@ -45792,17 +45794,20 @@ position = Vector2(848, 0)
 position = Vector2(896, 0)
 
 [node name="Gumba6" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(1120, 0)
+position = Vector2(1104, -64)
 
 [node name="Gumba7" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(1088, 0)
+position = Vector2(960, -64)
 
 [node name="Gumba8" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(1088, -64)
+position = Vector2(1072, -64)
 
 [node name="Gumba9" parent="enemies" instance=ExtResource("16_qpvvg")]
 position = Vector2(1424, 0)
 
+[node name="Gumba14" parent="enemies" instance=ExtResource("16_qpvvg")]
+position = Vector2(1632, 0)
+
 [node name="Gumba10" parent="enemies" instance=ExtResource("16_qpvvg")]
 position = Vector2(1392, 0)
 
@@ -45810,10 +45815,10 @@ position = Vector2(1392, 0)
 position = Vector2(1360, 0)
 
 [node name="Gumba12" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(2000, -48)
+position = Vector2(2032, -64)
 
 [node name="Gumba13" parent="enemies" instance=ExtResource("16_qpvvg")]
-position = Vector2(1968, -16)
+position = Vector2(2000, -48)
 
 [node name="coopa4" parent="enemies" instance=ExtResource("17_4rxmp")]
 position = Vector2(2272, 0)
@@ -45829,18 +45834,6 @@ position = Vector2(1584, -64)
 [node name="StaticBody2D" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
 position = Vector2(1824, 0)
 
-[node name="StaticBody2D2" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
-position = Vector2(1168, 0)
-
-[node name="StaticBody2D3" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
-position = Vector2(1136, 0)
-
-[node name="StaticBody2D6" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
-position = Vector2(1056, -64)
-
-[node name="StaticBody2D7" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
-position = Vector2(1136, -64)
-
 [node name="StaticBody2D8" parent="invisibleBarriers" instance=ExtResource("18_ujrgy")]
 position = Vector2(2160, 0)
 
@@ -45858,5 +45851,26 @@ position = Vector2(216, -679)
 load_level = "level_0"
 level_score = 3
 
+[node name="Camera2D" type="Camera2D" parent="."]
+unique_name_in_owner = true
+position = Vector2(35, 0)
+zoom = Vector2(3, 3)
+limit_left = -160
+limit_top = -184
+limit_bottom = 32
+position_smoothing_enabled = true
+position_smoothing_speed = 10.0
+
+[node name="ColorRect" type="ColorRect" parent="Camera2D"]
+unique_name_in_owner = true
+visible = false
+z_index = 50
+offset_left = -3995.0
+offset_top = -1678.0
+offset_right = 3965.0
+offset_bottom = 1594.0
+mouse_filter = 1
+color = Color(0, 0, 0, 1)
+
 [connection signal="body_entered" from="WorldBoundDown" to="WorldBoundDown" method="_on_body_entered"]
 [connection signal="timeout" from="WorldBoundDown/Timer" to="WorldBoundDown" method="_on_timer_timeout"]

scenes/levels/level_3.tscn

@@ -7863,24 +7863,9 @@ level_score = 4
 
 [node name="invisibleBarriers" type="Node" parent="."]
 
-[node name="StaticBody2D" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
-position = Vector2(256, -128)
-
-[node name="StaticBody2D2" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
+[node name="StaticBody2D12" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
 position = Vector2(352, -128)
 
-[node name="StaticBody2D3" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
-position = Vector2(480, -144)
-
-[node name="StaticBody2D4" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
-position = Vector2(608, -144)
-
-[node name="StaticBody2D5" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
-position = Vector2(960, -64)
-
-[node name="StaticBody2D6" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
-position = Vector2(1024, -64)
-
 [node name="StaticBody2D7" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
 position = Vector2(1040, -112)
 
@@ -7896,5 +7881,26 @@ position = Vector2(1712, -96)
 [node name="StaticBody2D11" parent="invisibleBarriers" instance=ExtResource("13_6mf4p")]
 position = Vector2(1968, 0)
 
+[node name="Camera2D" type="Camera2D" parent="."]
+unique_name_in_owner = true
+position = Vector2(35, 0)
+zoom = Vector2(3, 3)
+limit_left = -160
+limit_top = -184
+limit_bottom = 32
+position_smoothing_enabled = true
+position_smoothing_speed = 10.0
+
+[node name="ColorRect" type="ColorRect" parent="Camera2D"]
+unique_name_in_owner = true
+visible = false
+z_index = 50
+offset_left = -3995.0
+offset_top = -1678.0
+offset_right = 3965.0
+offset_bottom = 1594.0
+mouse_filter = 1
+color = Color(0, 0, 0, 1)
+
 [connection signal="body_entered" from="WorldBoundDown" to="WorldBoundDown" method="_on_body_entered"]
 [connection signal="timeout" from="WorldBoundDown/Timer" to="WorldBoundDown" method="_on_timer_timeout"]

scenes/levels/level_4.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=3 uid="uid://dlotvf0vtwjr4"]
+[gd_scene load_steps=21 format=3 uid="uid://dlotvf0vtwjr4"]
 
 [ext_resource type="PackedScene" uid="uid://dk1aby88pygtr" path="res://scenes/player.tscn" id="1_cf8aw"]
 [ext_resource type="Texture2D" uid="uid://cbcqfbbrmin4n" path="res://assets/bg-1-4.png" id="1_g3kb1"]
@@ -8,11 +8,12 @@
 [ext_resource type="Script" path="res://scripts/WorldBoundDown.gd" id="6_ilol3"]
 [ext_resource type="PackedScene" uid="uid://d25ukpt8ot8xv" path="res://scenes/blocks/itemblock.tscn" id="7_vhpxe"]
 [ext_resource type="PackedScene" uid="uid://b4dp88urmm7g8" path="res://scenes/items/mushroom.tscn" id="8_kin5r"]
-[ext_resource type="PackedScene" uid="uid://nm5keea43u56" path="res://scenes/items/coin.tscn" id="9_oqkue"]
-[ext_resource type="PackedScene" uid="uid://bp71ntkh281k5" path="res://scenes/items/fire_flower.tscn" id="10_6j1wi"]
 [ext_resource type="PackedScene" uid="uid://d0npbb0w73ajk" path="res://scenes/enemies/bridge.tscn" id="11_v5iex"]
 [ext_resource type="PackedScene" uid="uid://byk5q0ddm54hi" path="res://scenes/enemies/bowserjr.tscn" id="12_isomg"]
+[ext_resource type="PackedScene" uid="uid://badk308gvg1my" path="res://scenes/blocks/itemblock_invisible.tscn" id="12_rb6r5"]
+[ext_resource type="PackedScene" uid="uid://d032da33bfwtu" path="res://scenes/items/itemblock_mushroom.tscn" id="13_iv1rd"]
 [ext_resource type="PackedScene" uid="uid://bobox153pirkx" path="res://scenes/blocks/platform_short.tscn" id="13_lt15j"]
+[ext_resource type="PackedScene" uid="uid://cwhx0kcemeyx" path="res://scenes/items/itemblock_flower.tscn" id="14_xdsdd"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_2aufj"]
 texture = ExtResource("1_g3kb1")
@@ -7304,6 +7305,21 @@ sources/0 = SubResource("TileSetAtlasSource_2aufj")
 a = Vector2(3435, -6.03052)
 b = Vector2(-161, -6.99857)
 
+[sub_resource type="Animation" id="Animation_4k6b7"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(2096, -112)]
+}
+
 [sub_resource type="Animation" id="Animation_w556l"]
 resource_name = "default"
 length = 3.0
@@ -7321,21 +7337,6 @@ tracks/0/keys = {
 "values": [Vector2(2096, -112), Vector2(1936, -112)]
 }
 
-[sub_resource type="Animation" id="Animation_4k6b7"]
-length = 0.001
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Vector2(2096, -112)]
-}
-
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_icyc2"]
 _data = {
 "RESET": SubResource("Animation_4k6b7"),
@@ -7419,34 +7420,6 @@ position = Vector2(2048, -48)
 position = Vector2(352, -96)
 hit_object = ExtResource("8_kin5r")
 
-[node name="itemblock2" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1568, -48)
-hit_object = ExtResource("8_kin5r")
-
-[node name="itemblock3" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1616, -48)
-hit_object = ExtResource("9_oqkue")
-auto_collect = true
-
-[node name="itemblock4" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1664, -48)
-hit_object = ExtResource("9_oqkue")
-auto_collect = true
-
-[node name="itemblock5" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1584, -112)
-hit_object = ExtResource("9_oqkue")
-auto_collect = true
-
-[node name="itemblock6" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1632, -112)
-hit_object = ExtResource("9_oqkue")
-auto_collect = true
-
-[node name="itemblock7" parent="interactable" instance=ExtResource("7_vhpxe")]
-position = Vector2(1680, -112)
-hit_object = ExtResource("10_6j1wi")
-
 [node name="WorldBoundDown" type="Area2D" parent="."]
 position = Vector2(0, 16)
 collision_layer = 32768
@@ -7474,5 +7447,38 @@ libraries = {
 }
 autoplay = "default"
 
+[node name="itemblock_invisible" parent="." instance=ExtResource("12_rb6r5")]
+position = Vector2(1568, -48)
+hit_object = ExtResource("13_iv1rd")
+
+[node name="itemblock_invisible2" parent="." instance=ExtResource("12_rb6r5")]
+position = Vector2(1616, -48)
+hit_object = ExtResource("7_vhpxe")
+
+[node name="itemblock_invisible3" parent="." instance=ExtResource("12_rb6r5")]
+position = Vector2(1664, -48)
+hit_object = ExtResource("14_xdsdd")
+
+[node name="Camera2D" type="Camera2D" parent="."]
+unique_name_in_owner = true
+position = Vector2(35, 0)
+zoom = Vector2(3, 3)
+limit_left = -160
+limit_top = -184
+limit_bottom = 32
+position_smoothing_enabled = true
+position_smoothing_speed = 10.0
+
+[node name="ColorRect" type="ColorRect" parent="Camera2D"]
+unique_name_in_owner = true
+visible = false
+z_index = 50
+offset_left = -3995.0
+offset_top = -1678.0
+offset_right = 3965.0
+offset_bottom = 1594.0
+mouse_filter = 1
+color = Color(0, 0, 0, 1)
+
 [connection signal="body_entered" from="WorldBoundDown" to="WorldBoundDown" method="_on_body_entered"]
 [connection signal="timeout" from="WorldBoundDown/Timer" to="WorldBoundDown" method="_on_timer_timeout"]

scenes/player.tscn

@@ -190,7 +190,7 @@ length = 0.001
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Camera2D/ColorRect:visible")
+tracks/0/path = NodePath("dieSound:playing")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
@@ -199,18 +199,6 @@ tracks/0/keys = {
 "update": 1,
 "values": [false]
 }
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("dieSound:playing")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [false]
-}
 
 [sub_resource type="Animation" id="Animation_jgvs8"]
 resource_name = "die"
@@ -218,34 +206,22 @@ length = 3.0
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Camera2D/ColorRect:visible")
+tracks/0/path = NodePath("dieSound:playing")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [true]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("dieSound:playing")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
 "times": PackedFloat32Array(0.1),
 "transitions": PackedFloat32Array(1),
 "update": 1,
 "values": [true]
 }
-tracks/2/type = "method"
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/path = NodePath(".")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/keys = {
+tracks/1/type = "method"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath(".")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
 "times": PackedFloat32Array(3),
 "transitions": PackedFloat32Array(1),
 "values": [{
@@ -266,25 +242,6 @@ collision_layer = 2
 script = ExtResource("1_lm7ix")
 fireball_prefab = ExtResource("2_owoxk")
 
-[node name="Camera2D" type="Camera2D" parent="."]
-position = Vector2(35, 0)
-zoom = Vector2(3, 3)
-limit_left = -160
-limit_top = -184
-limit_bottom = 32
-limit_smoothed = true
-position_smoothing_speed = 8.0
-
-[node name="ColorRect" type="ColorRect" parent="Camera2D"]
-visible = false
-z_index = 50
-offset_left = -3995.0
-offset_top = -1678.0
-offset_right = 3965.0
-offset_bottom = 1594.0
-mouse_filter = 1
-color = Color(0, 0, 0, 1)
-
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 z_index = 25
 position = Vector2(0, 2)

scripts/LevelSelect.gd

@@ -1,7 +1,7 @@
 extends CanvasLayer
 
 @onready var buttons = [$Control/Button_1, $Control/Button_2, $Control/Button_3,
-	$Control/Button_4
+	$Control/Button_4, $Control/Button_5
 ]
 var available_level = 0
 

scripts/blocks/destroyblock.gd

@@ -2,10 +2,22 @@ extends RigidBody2D
 
 @onready var animated_sprite_2d = $AnimatedSprite2D
 @onready var animation_player = $AnimationPlayer
+@export var hit_object : PackedScene
+@export var auto_collect : bool
+const ITEMBLOCK = preload("res://scenes/blocks/itemblock.tscn")
 
 func _ready():
 	animated_sprite_2d.play("default")
 
 func _on_activate_body_entered(body):
+	if hit_object == null:
 		if body.is_big:
 			animation_player.play("destroy")
+	else:
+		var inst2 = ITEMBLOCK.instantiate()
+		get_parent().add_child(inst2)
+		inst2.position.x = position.x
+		inst2.position.y = position.y
+		inst2.hit_object = hit_object
+		inst2.auto_collect = auto_collect
+		queue_free()

scripts/blocks/itemblock_invisible.gd

@@ -0,0 +1,19 @@
+extends RigidBody2D
+@export var hit_object:PackedScene
+@onready var collision_shape_2d = $CollisionShape2D
+
+func _ready():
+	collision_shape_2d.disabled = true
+
+func _on_activate_body_entered(body):
+	if hit_object == null:
+		return
+		
+	if body.velocity.y > 0:
+		return
+	
+	var instance = hit_object.instantiate()
+	get_parent().add_child(instance)
+	instance.position.x = position.x
+	instance.position.y = position.y
+	queue_free()

scripts/enemies/coopa.gd

@@ -14,6 +14,7 @@ var is_down = false
 @onready var collision_shape_2d = $CollisionShape2D
 @onready var ray_cast_left_3 = $RayCastLeft3
 @onready var ray_cast_right_3 = $RayCastRight3
+@onready var player = %player
 
 func _ready():
 	var coll = CapsuleShape2D.new()
@@ -22,6 +23,7 @@ func _ready():
 	collision_shape_2d.shape = coll
 
 func _physics_process(delta):
+	if abs(position.x - player.position.x) < 225 or is_down:
 		linear_velocity.x = speed
 
 	if ray_cast_left_2 == null:
@@ -73,6 +75,9 @@ func _physics_process(delta):
 @onready var die_sound = $dieSound
 
 func f_die():
+	gravity_scale = 0
+	collision_shape_2d.queue_free()
+	die.queue_free()
 	die_sound.play()
 	speed = 0
 	innocent = true

scripts/enemies/gumba.gd

@@ -11,8 +11,10 @@ extends RigidBody2D
 var innocent = false
 @onready var timer_2 = $Timer2
 @onready var gumba = $"."
+@onready var player = %player
 
 func _physics_process(delta):
+	if abs(position.x - player.position.x) < 225:
 		linear_velocity.x = speed
 	
 	if ray_cast_left_2 == null:

scripts/items/jump_thing.gd

@@ -0,0 +1,18 @@
+extends Node2D
+@onready var animated_sprite_2d = $AnimatedSprite2D
+@onready var collision_shape_2d = $StaticBody2D/CollisionShape2D
+
+func _on_area_2d_body_entered(body):
+	animated_sprite_2d.play("down")
+	body.JUMPt_velocity *= 1.6
+	animated_sprite_2d.position.y += 8
+	collision_shape_2d.position.y += 8
+	collision_shape_2d.shape.size.y -= 16
+
+
+func _on_area_2d_body_exited(body):
+	animated_sprite_2d.play("default")
+	body.JUMPt_velocity /= 1.6
+	animated_sprite_2d.position.y -= 8
+	collision_shape_2d.position.y -= 8
+	collision_shape_2d.shape.size.y += 16

scripts/player.gd

@@ -1,7 +1,7 @@
 extends CharacterBody2D
 @onready var animated_sprite_2d = $AnimatedSprite2D
-@onready var camera_2d = $Camera2D
-@onready var color_rect = $Camera2D/ColorRect
+@onready var camera_2d = %Camera2D
+@onready var color_rect = %ColorRect
 @onready var pipe_timer = $pipe_timer
 @onready var pipe_timer_half = $pipe_timer_half
 @onready var coin_amt = $CanvasLayer/Control/CoinAmt
@@ -16,7 +16,7 @@ extends CharacterBody2D
 
 
 const SPEED = 130.0
-const JUMPt_velocity = -360.0
+var JUMPt_velocity = -360.0
 var on_pipe = false
 var right_pipe = false
 var left_pipe = false
@@ -73,8 +73,16 @@ func _ready():
 	collision_shape_2d.shape.height = 15
 
 func _process(delta):
+	camera_2d.position.x = position.x + 50
+	
+	if is_on_floor() or velocity.y > 0 and camera_2d.position.y < position.y:
+		camera_2d.position.y = position.y if not is_big else position.y + 8
+	
 	# set camera 
 	if position.y <= 32:
+		if position.y < -640:
+			camera_2d.limit_bottom = -640
+		else:
 			camera_2d.limit_bottom = 32
 			camera_2d.limit_top = -1000
 	else:
@@ -83,6 +91,7 @@ func _process(delta):
 	
 	# check pipe
 	if on_pipe and (Input.is_action_just_pressed("crawl") or crawl) and is_on_floor() or right_pipe and (Input.is_action_pressed("move_right") or t_velocity > 0):
+		on_pause = true
 		pipe_sound.play()
 		crawl = false
 		t_velocity = 0
@@ -191,6 +200,7 @@ func shrink():
 		player_die()
 		
 func player_die():
+	visible = false
 	die_player.play("die")
 	on_pause = true
 	music.stop()