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

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

@@ -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/items/jump_thing.tscn

@@ -31,7 +31,7 @@ animations = [{
 }]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mnewg"]
-size = Vector2(14, 25)
+size = Vector2(14, 47)
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_luw3y"]
 size = Vector2(16, 24)
@@ -42,14 +42,13 @@ script = ExtResource("1_nrv87")
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 position = Vector2(8, -12)
 sprite_frames = SubResource("SpriteFrames_1s1v4")
-animation = &"down"
 autoplay = "default"
 
 [node name="Area2D" type="Area2D" parent="."]
 collision_mask = 2
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
-position = Vector2(8, -12.5)
+position = Vector2(8, -23.5)
 shape = SubResource("RectangleShape2D_mnewg")
 
 [node name="StaticBody2D" type="StaticBody2D" parent="."]

scenes/levels/level_1.tscn

@@ -19464,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

@@ -45851,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

@@ -7881,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

@@ -7459,5 +7459,26 @@ hit_object = ExtResource("7_vhpxe")
 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/enemies/coopa.gd

@@ -75,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/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
@@ -73,10 +73,18 @@ 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:
-		camera_2d.limit_bottom = 32
-		camera_2d.limit_top = -1000
+		if position.y < -640:
+			camera_2d.limit_bottom = -640
+		else:
+			camera_2d.limit_bottom = 32
+			camera_2d.limit_top = -1000
 	else:
 		camera_2d.limit_bottom = 272
 		camera_2d.limit_top = 32
@@ -192,6 +200,7 @@ func shrink():
 		player_die()
 		
 func player_die():
+	visible = false
 	die_player.play("die")
 	on_pause = true
 	music.stop()