added gumba mushroom and sound

This commit is contained in:
Jonas Braus
2024-07-29 18:54:40 +02:00
parent e06f422597
commit b339ef3c29
60 changed files with 1142 additions and 9 deletions
+107 -1
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=9 format=3 uid="uid://nm5keea43u56"]
[gd_scene load_steps=13 format=3 uid="uid://nm5keea43u56"]
[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="1_lffao"]
[ext_resource type="Script" path="res://scripts/coin.gd" id="1_qn7es"]
[ext_resource type="AudioStream" uid="uid://dkfpfaqxyvcew" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Coin.wav" id="3_ioelm"]
[sub_resource type="AtlasTexture" id="AtlasTexture_7xy4l"]
atlas = ExtResource("1_lffao")
@@ -42,6 +43,103 @@ animations = [{
[sub_resource type="CircleShape2D" id="CircleShape2D_vpcnk"]
radius = 7.0
[sub_resource type="Animation" id="Animation_ota62"]
resource_name = "pickup"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D: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("CollisionShape2D:disabled")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("PickupSound:playing")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
tracks/3/type = "method"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath(".")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(1),
"transitions": PackedFloat32Array(1),
"values": [{
"args": [],
"method": &"queue_free"
}]
}
[sub_resource type="Animation" id="Animation_km6nk"]
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D: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("CollisionShape2D:disabled")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = false
tracks/2/path = NodePath("PickupSound:playing")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_whr3u"]
_data = {
"RESET": SubResource("Animation_km6nk"),
"pickup": SubResource("Animation_ota62")
}
[node name="Coin" type="Area2D"]
collision_mask = 2
script = ExtResource("1_qn7es")
@@ -56,4 +154,12 @@ autoplay = "idle"
position = Vector2(8, -8)
shape = SubResource("CircleShape2D_vpcnk")
[node name="PickupSound" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("3_ioelm")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_whr3u")
}
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
+100
View File
@@ -0,0 +1,100 @@
[gd_scene load_steps=10 format=3 uid="uid://cwviqxncs4fom"]
[ext_resource type="Texture2D" uid="uid://ddl5f3lldrp2n" path="res://assets/enemies.png" id="1_fe7l6"]
[ext_resource type="Script" path="res://scripts/gumba.gd" id="1_o30u3"]
[ext_resource type="AudioStream" uid="uid://vq1g2x6id5jt" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Bump.wav" id="3_7yqeq"]
[sub_resource type="AtlasTexture" id="AtlasTexture_srbv5"]
atlas = ExtResource("1_fe7l6")
region = Rect2(0, 4, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_v5sjp"]
atlas = ExtResource("1_fe7l6")
region = Rect2(30, 4, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_iyg37"]
atlas = ExtResource("1_fe7l6")
region = Rect2(60, 4, 16, 16)
[sub_resource type="SpriteFrames" id="SpriteFrames_xnecu"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_srbv5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v5sjp")
}],
"loop": true,
"name": &"default",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_iyg37")
}],
"loop": true,
"name": &"die",
"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_l4q7u"]
radius = 8.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_oec64"]
size = Vector2(10, 0.5)
[node name="Gumba" type="RigidBody2D"]
collision_layer = 8
lock_rotation = true
script = ExtResource("1_o30u3")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(8, -8)
sprite_frames = SubResource("SpriteFrames_xnecu")
autoplay = "default"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(8, -8)
shape = SubResource("CircleShape2D_l4q7u")
[node name="RayCastLeft" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(-9, 0)
collision_mask = 17
[node name="RayCastLeft2" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(-9, 0)
collision_mask = 2
[node name="RayCastRight" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(9, 0)
collision_mask = 17
[node name="RayCastRight2" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(9, 0)
collision_mask = 2
[node name="Timer" type="Timer" parent="."]
wait_time = 0.5
one_shot = true
[node name="die" type="Area2D" parent="."]
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="die"]
position = Vector2(8, -16.25)
shape = SubResource("RectangleShape2D_oec64")
[node name="Timer2" type="Timer" parent="."]
one_shot = true
[node name="dieSound" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("3_7yqeq")
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
[connection signal="body_entered" from="die" to="." method="_on_die_body_entered"]
[connection signal="timeout" from="Timer2" to="." method="_on_timer_2_timeout"]
+48 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://dv50be68omp73"]
[gd_scene load_steps=13 format=3 uid="uid://dv50be68omp73"]
[ext_resource type="Texture2D" uid="uid://chrld8oybp4me" path="res://assets/bg-1-1.png" id="1_rxc3r"]
[ext_resource type="PackedScene" uid="uid://dk1aby88pygtr" path="res://scenes/player.tscn" id="2_ru48y"]
@@ -6,6 +6,9 @@
[ext_resource type="PackedScene" uid="uid://b6piduuvusiix" path="res://scenes/destroyblock.tscn" id="4_4f23w"]
[ext_resource type="PackedScene" uid="uid://be832pldgbeyk" path="res://scenes/pipe.tscn" id="5_31d8i"]
[ext_resource type="PackedScene" uid="uid://nm5keea43u56" path="res://scenes/coin.tscn" id="6_evydd"]
[ext_resource type="PackedScene" uid="uid://b4dp88urmm7g8" path="res://scenes/mushroom.tscn" id="7_rk0p2"]
[ext_resource type="PackedScene" uid="uid://cwviqxncs4fom" path="res://scenes/gumba.tscn" id="8_be76n"]
[ext_resource type="AudioStream" uid="uid://cdtrw675os7dh" path="res://assets/sounds/01. Ground Theme.mp3" id="9_xkthi"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_sdqov"]
texture = ExtResource("1_rxc3r")
@@ -19049,6 +19052,9 @@ texture = ExtResource("1_rxc3r")
physics_layer_0/collision_layer = 1
sources/1 = SubResource("TileSetAtlasSource_sdqov")
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ipe5j"]
size = Vector2(16, 16)
[node name="level1" type="Node2D"]
[node name="TileMap" type="TileMap" parent="."]
@@ -19067,24 +19073,28 @@ position = Vector2(1, -90)
[node name="itemblock" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(96, -48)
hit_object = ExtResource("6_evydd")
[node name="destroyblock" parent="interactable_blocks" instance=ExtResource("4_4f23w")]
position = Vector2(160, -48)
[node name="itemblock2" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(176, -48)
hit_object = ExtResource("7_rk0p2")
[node name="destroyblock2" parent="interactable_blocks" instance=ExtResource("4_4f23w")]
position = Vector2(192, -48)
[node name="itemblock3" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(208, -48)
hit_object = ExtResource("6_evydd")
[node name="destroyblock3" parent="interactable_blocks" instance=ExtResource("4_4f23w")]
position = Vector2(224, -48)
[node name="itemblock4" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(192, -112)
hit_object = ExtResource("6_evydd")
[node name="itemblock5" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(1168, -48)
@@ -19261,3 +19271,40 @@ position = Vector2(736, 128)
[node name="Coin19" parent="coins" instance=ExtResource("6_evydd")]
position = Vector2(752, 128)
[node name="Gumba" parent="." instance=ExtResource("8_be76n")]
position = Vector2(272, 0)
[node name="Gumba2" parent="." instance=ExtResource("8_be76n")]
position = Vector2(736, 0)
[node name="Gumba3" parent="." instance=ExtResource("8_be76n")]
position = Vector2(768, 0)
[node name="invisible_barriers" type="Node" parent="."]
[node name="StaticBody2D" type="StaticBody2D" parent="invisible_barriers"]
position = Vector2(1056, -16)
collision_layer = 16
[node name="CollisionShape2D" type="CollisionShape2D" parent="invisible_barriers/StaticBody2D"]
position = Vector2(-8, 8)
shape = SubResource("RectangleShape2D_ipe5j")
[node name="StaticBody2D2" type="StaticBody2D" parent="invisible_barriers"]
position = Vector2(1312, -16)
collision_layer = 16
[node name="CollisionShape2D" type="CollisionShape2D" parent="invisible_barriers/StaticBody2D2"]
position = Vector2(-8, 8)
shape = SubResource("RectangleShape2D_ipe5j")
[node name="Gumba4" parent="." instance=ExtResource("8_be76n")]
position = Vector2(1120, 0)
[node name="Gumba5" parent="." instance=ExtResource("8_be76n")]
position = Vector2(1152, 0)
[node name="Music" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("9_xkthi")
autoplay = true
+140
View File
@@ -0,0 +1,140 @@
[gd_scene load_steps=11 format=3 uid="uid://b4dp88urmm7g8"]
[ext_resource type="Script" path="res://scripts/mushroom.gd" id="1_5wbjm"]
[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="1_tsecc"]
[ext_resource type="AudioStream" uid="uid://dr8w21sjl0a7" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Powerup.wav" id="3_ad473"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i8bax"]
atlas = ExtResource("1_tsecc")
region = Rect2(184, 34, 16, 16)
[sub_resource type="SpriteFrames" id="SpriteFrames_s232e"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_i8bax")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_ubrn0"]
radius = 8.0
[sub_resource type="CircleShape2D" id="CircleShape2D_drsli"]
radius = 9.0
[sub_resource type="Animation" id="Animation_fqoi0"]
resource_name = "pickup"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("pickupSound: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("AnimatedSprite2D:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
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(1),
"transitions": PackedFloat32Array(1),
"values": [{
"args": [],
"method": &"queue_free"
}]
}
[sub_resource type="Animation" id="Animation_2r0ts"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("pickupSound:playing")
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("AnimatedSprite2D:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_gubc7"]
_data = {
"RESET": SubResource("Animation_2r0ts"),
"pickup": SubResource("Animation_fqoi0")
}
[node name="mushroom" type="RigidBody2D"]
collision_layer = 8
lock_rotation = true
script = ExtResource("1_5wbjm")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(8, -8)
sprite_frames = SubResource("SpriteFrames_s232e")
autoplay = "default"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(8, -8)
shape = SubResource("CircleShape2D_ubrn0")
[node name="RayCastLeft" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(-9, 0)
[node name="RayCastRight" type="RayCast2D" parent="."]
position = Vector2(8, -8)
target_position = Vector2(9, 0)
[node name="Area2D" type="Area2D" parent="."]
collision_layer = 8
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2(8, -8)
shape = SubResource("CircleShape2D_drsli")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_gubc7")
}
[node name="pickupSound" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("3_ad473")
[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"]
+52 -2
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://dk1aby88pygtr"]
[gd_scene load_steps=20 format=3 uid="uid://dk1aby88pygtr"]
[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"]
@@ -13,10 +13,18 @@ region = Rect2(182, 34, 16, 16)
atlas = ExtResource("1_w3chr")
region = Rect2(80, 34, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_wfnj7"]
atlas = ExtResource("1_w3chr")
region = Rect2(80, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_dmbgr"]
atlas = ExtResource("1_w3chr")
region = Rect2(165, 34, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_t247e"]
atlas = ExtResource("1_w3chr")
region = Rect2(165, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_jb1pe"]
atlas = ExtResource("1_w3chr")
region = Rect2(97, 34, 16, 16)
@@ -29,6 +37,18 @@ region = Rect2(114, 34, 16, 16)
atlas = ExtResource("1_w3chr")
region = Rect2(131, 34, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_jagc4"]
atlas = ExtResource("1_w3chr")
region = Rect2(97, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_x07x8"]
atlas = ExtResource("1_w3chr")
region = Rect2(114, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_6y472"]
atlas = ExtResource("1_w3chr")
region = Rect2(131, 1, 16, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_l5s58"]
animations = [{
"frames": [{
@@ -49,6 +69,14 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_wfnj7")
}],
"loop": true,
"name": &"idle_big",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_dmbgr")
}],
"loop": true,
@@ -57,6 +85,14 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_t247e")
}],
"loop": true,
"name": &"jump_big",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_jb1pe")
}, {
"duration": 1.0,
@@ -68,6 +104,20 @@ animations = [{
"loop": true,
"name": &"run",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_jagc4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_x07x8")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_6y472")
}],
"loop": true,
"name": &"run_big",
"speed": 10.0
}]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_4sl4a"]
@@ -104,7 +154,7 @@ color = Color(0, 0, 0, 1)
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(0, 2)
sprite_frames = SubResource("SpriteFrames_l5s58")
animation = &"jump"
animation = &"idle_big"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 2)