This commit is contained in:
Jonas Braus
2024-07-31 20:52:28 +02:00
parent b18dfee7dc
commit a4476f2ce2
6 changed files with 219 additions and 12 deletions
+85 -10
View File
File diff suppressed because one or more lines are too long
+86 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=3 uid="uid://dk1aby88pygtr"] [gd_scene load_steps=33 format=3 uid="uid://dk1aby88pygtr"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_lm7ix"] [ext_resource type="Script" path="res://scripts/player.gd" id="1_lm7ix"]
[ext_resource type="Texture2D" uid="uid://dhw3lpuskbvku" path="res://assets/mario-luigi-4.png" id="1_w3chr"] [ext_resource type="Texture2D" uid="uid://dhw3lpuskbvku" path="res://assets/mario-luigi-4.png" id="1_w3chr"]
@@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://cbs4okawh444d" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Warp.wav" id="5_kvw73"] [ext_resource type="AudioStream" uid="uid://cbs4okawh444d" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Warp.wav" id="5_kvw73"]
[ext_resource type="AudioStream" uid="uid://bo4big602rvtr" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Jump.wav" id="6_aq3u4"] [ext_resource type="AudioStream" uid="uid://bo4big602rvtr" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Jump.wav" id="6_aq3u4"]
[ext_resource type="AudioStream" uid="uid://bh8t167vl6j2n" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Kick.wav" id="8_6t158"] [ext_resource type="AudioStream" uid="uid://bh8t167vl6j2n" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Kick.wav" id="8_6t158"]
[ext_resource type="AudioStream" uid="uid://b0h07g0c8i84c" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Die.wav" id="9_pu5vq"]
[sub_resource type="AtlasTexture" id="AtlasTexture_l22ll"] [sub_resource type="AtlasTexture" id="AtlasTexture_l22ll"]
atlas = ExtResource("1_w3chr") atlas = ExtResource("1_w3chr")
@@ -184,6 +185,81 @@ size = Vector2(8, 1)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_okc7h"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_okc7h"]
size = Vector2(1, 2) size = Vector2(1, 2)
[sub_resource type="Animation" id="Animation_miyjx"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Camera2D/ColorRect:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"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"
length = 3.0
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Camera2D/ColorRect:visible")
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 = {
"times": PackedFloat32Array(3),
"transitions": PackedFloat32Array(1),
"values": [{
"args": [],
"method": &"reload_scene"
}]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_uuoiq"]
_data = {
"RESET": SubResource("Animation_miyjx"),
"die": SubResource("Animation_jgvs8")
}
[node name="player" type="CharacterBody2D"] [node name="player" type="CharacterBody2D"]
position = Vector2(0, -10) position = Vector2(0, -10)
collision_layer = 2 collision_layer = 2
@@ -259,6 +335,7 @@ offset_right = 241.0
offset_bottom = 104.0 offset_bottom = 104.0
mouse_filter = 1 mouse_filter = 1
theme_override_colors/font_color = Color(1, 0.627451, 0.266667, 1) theme_override_colors/font_color = Color(1, 0.627451, 0.266667, 1)
theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
theme_override_fonts/font = ExtResource("3_mkgvb") theme_override_fonts/font = ExtResource("3_mkgvb")
theme_override_font_sizes/font_size = 40 theme_override_font_sizes/font_size = 40
text = "0 text = "0
@@ -282,6 +359,14 @@ stream = ExtResource("6_aq3u4")
[node name="shrinkSound" type="AudioStreamPlayer2D" parent="."] [node name="shrinkSound" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("8_6t158") stream = ExtResource("8_6t158")
[node name="dieSound" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("9_pu5vq")
[node name="diePlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_uuoiq")
}
[connection signal="area_entered" from="pipedetector_ground" to="." method="_on_pipedetector_area_entered"] [connection signal="area_entered" from="pipedetector_ground" to="." method="_on_pipedetector_area_entered"]
[connection signal="area_exited" from="pipedetector_ground" to="." method="_on_pipedetector_area_exited"] [connection signal="area_exited" from="pipedetector_ground" to="." method="_on_pipedetector_area_exited"]
[connection signal="area_entered" from="pipedetector_right" to="." method="_on_pipedetector_right_area_entered"] [connection signal="area_entered" from="pipedetector_right" to="." method="_on_pipedetector_right_area_entered"]
+5
View File
@@ -0,0 +1,5 @@
extends Area2D
func _on_body_entered(body):
pass
+16
View File
@@ -0,0 +1,16 @@
extends Label
@onready var label = $"."
@onready var label_2 = $"../Label2"
@onready var label_3 = $"../Label3"
func _ready():
var platform = ""
match OS.get_name():
"Windows", "macOS", "Linux", "FreeBSD", "NetBSD", "OpenBSD", "BSD", "Web":
label.text = "A, S, D To Move"
label_2.text = "Space To Jump"
label_3.text = "E To Fire"
"Android", "iOS":
pass
+17
View File
@@ -0,0 +1,17 @@
extends Area2D
@onready var timer = $Timer
@onready var label = $"../CanvasLayer/Control/Label"
@onready var player = %player
func _on_body_entered(body):
body.player_die()
func _ready():
timer.start()
func _process(delta):
var x = str(int(timer.time_left))
label.text = x
func _on_timer_timeout():
player.player_die()
+10 -1
View File
@@ -10,6 +10,8 @@ extends CharacterBody2D
@onready var pipe_sound = $PipeSound @onready var pipe_sound = $PipeSound
@onready var jump_sound = $JumpSound @onready var jump_sound = $JumpSound
@onready var shrink_sound = $shrinkSound @onready var shrink_sound = $shrinkSound
@onready var die_player = $diePlayer
@onready var music = %Music
const SPEED = 130.0 const SPEED = 130.0
@@ -174,7 +176,14 @@ func shrink():
pipedetector_ground.position.y -= 8 pipedetector_ground.position.y -= 8
shrink_sound.play() shrink_sound.play()
else: else:
print("dead") player_die()
func player_die():
die_player.play("die")
music.stop()
func reload_scene():
get_tree().reload_current_scene()
func increase_coins(): func increase_coins():
coins += 1 coins += 1