jonas/retromariogodot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added fireballs

Browse Source
This commit is contained in:
Jonas Braus
2024-07-29 23:30:26 +02:00
parent 3a6f8517c0
commit 85736f82e0
19 changed files with 365 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/destroyblock.tscn → scenes/blocks/destroyblock.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=12 format=3 uid="uid://b6piduuvusiix"]
[ext_resource type="Texture2D" uid="uid://chrld8oybp4me" path="res://assets/bg-1-1.png" id="1_4h0ce"]
[ext_resource type="Script" path="res://scripts/destroyblock.gd" id="1_a8383"]
[ext_resource type="Script" path="res://scripts/blocks/destroyblock.gd" id="1_a8383"]
[ext_resource type="AudioStream" uid="uid://dkb0efnhs6mrj" path="res://assets/sounds/NES - Super Mario Bros - Sound Effects/Super Mario Bros 1 and 2(JP)/Break.wav" id="3_bsm87"]
[sub_resource type="AtlasTexture" id="AtlasTexture_nbg0j"]
scenes/itemblock.tscn → scenes/blocks/itemblock.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=10 format=3 uid="uid://d25ukpt8ot8xv"]
[ext_resource type="Script" path="res://scripts/itemblock.gd" id="2_fn5hi"]
[ext_resource type="Script" path="res://scripts/blocks/itemblock.gd" id="2_fn5hi"]
[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="2_t1ko6"]
[sub_resource type="AtlasTexture" id="AtlasTexture_lo6hv"]
scenes/gumba.tscn → scenes/enemies/gumba.tscn
+2 -2
View File
@@ -1,7 +1,7 @@
[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="Script" path="res://scripts/enemies/gumba.gd" id="1_o30u3"]
[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="3_v1fjb"]
[sub_resource type="AtlasTexture" id="AtlasTexture_srbv5"]
@@ -45,7 +45,7 @@ radius = 8.0
size = Vector2(10, 0.5)
[node name="Gumba" type="RigidBody2D"]
collision_layer = 8
collision_layer = 128
lock_rotation = true
script = ExtResource("1_o30u3")
scenes/coin.tscn → scenes/items/coin.tscn
+3 -3
View File
@@ -1,7 +1,7 @@
[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="Script" path="res://scripts/items/coin.gd" id="1_shvw0"]
[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"]
@@ -37,7 +37,7 @@ animations = [{
}],
"loop": true,
"name": &"idle",
"speed": 5.0
"speed": 10.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_vpcnk"]
@@ -142,7 +142,7 @@ _data = {
[node name="Coin" type="Area2D"]
collision_mask = 2
script = ExtResource("1_qn7es")
script = ExtResource("1_shvw0")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(8, -8)
scenes/items/fire_flower.tscn
+142
View File
@@ -0,0 +1,142 @@
[gd_scene load_steps=13 format=3 uid="uid://bp71ntkh281k5"]
[ext_resource type="Texture2D" uid="uid://dth47lmb44qk8" path="res://assets/items.png" id="1_2qvvh"]
[ext_resource type="Script" path="res://scripts/items/fire_flower.gd" id="1_mpyyo"]
[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_vbdsa"]
[sub_resource type="AtlasTexture" id="AtlasTexture_jlv6x"]
atlas = ExtResource("1_2qvvh")
region = Rect2(4, 64, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_flc5q"]
atlas = ExtResource("1_2qvvh")
region = Rect2(34, 64, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ftlk4"]
atlas = ExtResource("1_2qvvh")
region = Rect2(64, 64, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_t6dyx"]
atlas = ExtResource("1_2qvvh")
region = Rect2(94, 64, 16, 16)
[sub_resource type="SpriteFrames" id="SpriteFrames_7uuxh"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_jlv6x")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_flc5q")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ftlk4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_t6dyx")
}],
"loop": true,
"name": &"default",
"speed": 10.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_r8tpx"]
radius = 9.0
[sub_resource type="Animation" id="Animation_3a161"]
length = 0.001
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("AudioStreamPlayer2D: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_4xypy"]
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.1),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AudioStreamPlayer2D:playing")
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 = "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="AnimationLibrary" id="AnimationLibrary_duoc6"]
_data = {
"RESET": SubResource("Animation_3a161"),
"pickup": SubResource("Animation_4xypy")
}
[node name="FireFlower" type="Area2D"]
collision_layer = 8
collision_mask = 2
script = ExtResource("1_mpyyo")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(8, -8)
sprite_frames = SubResource("SpriteFrames_7uuxh")
autoplay = "default"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(8, -8)
shape = SubResource("CircleShape2D_r8tpx")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_duoc6")
}
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("3_vbdsa")
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
scenes/items/fireball.tscn
+62
View File
@@ -0,0 +1,62 @@
[gd_scene load_steps=9 format=3 uid="uid://beaktq6mygp6c"]
[ext_resource type="Script" path="res://scripts/items/fireball.gd" id="1_c103u"]
[ext_resource type="Texture2D" uid="uid://ddl5f3lldrp2n" path="res://assets/enemies.png" id="1_sy4od"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_27hkc"]
bounce = 0.7
[sub_resource type="AtlasTexture" id="AtlasTexture_pjn1s"]
atlas = ExtResource("1_sy4od")
region = Rect2(364, 188, 8, 8)
[sub_resource type="SpriteFrames" id="SpriteFrames_unbxs"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_pjn1s")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_pwt6i"]
radius = 5.09902
[sub_resource type="CircleShape2D" id="CircleShape2D_87wnf"]
radius = 6.0
[sub_resource type="CircleShape2D" id="CircleShape2D_ly4gs"]
radius = 5.0
[node name="Fireball" type="RigidBody2D"]
collision_layer = 8
physics_material_override = SubResource("PhysicsMaterial_27hkc")
can_sleep = false
script = ExtResource("1_c103u")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_unbxs")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_pwt6i")
[node name="Timer" type="Timer" parent="."]
wait_time = 2.0
one_shot = true
[node name="CollCount" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="CollCount"]
shape = SubResource("CircleShape2D_87wnf")
[node name="EnemieDie" type="Area2D" parent="."]
collision_mask = 128
[node name="CollisionShape2D" type="CollisionShape2D" parent="EnemieDie"]
shape = SubResource("CircleShape2D_ly4gs")
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
[connection signal="body_entered" from="CollCount" to="." method="_on_area_2d_body_entered"]
[connection signal="body_entered" from="EnemieDie" to="." method="_on_enemie_die_body_entered"]
scenes/mushroom.tscn → scenes/items/mushroom.tscn
+2 -2
View File
@@ -1,6 +1,6 @@
[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="Script" path="res://scripts/items/mushroom.gd" id="1_qo5bm"]
[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"]
@@ -102,7 +102,7 @@ _data = {
[node name="mushroom" type="RigidBody2D"]
collision_layer = 8
lock_rotation = true
script = ExtResource("1_5wbjm")
script = ExtResource("1_qo5bm")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(8, -8)
scenes/level_1.tscn
+21 -20
View File
@@ -1,13 +1,14 @@
[gd_scene load_steps=15 format=3 uid="uid://dv50be68omp73"]
[gd_scene load_steps=16 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"]
[ext_resource type="PackedScene" uid="uid://d25ukpt8ot8xv" path="res://scenes/itemblock.tscn" id="3_fmbwm"]
[ext_resource type="PackedScene" uid="uid://b6piduuvusiix" path="res://scenes/destroyblock.tscn" id="4_4f23w"]
[ext_resource type="PackedScene" uid="uid://d25ukpt8ot8xv" path="res://scenes/blocks/itemblock.tscn" id="3_fmbwm"]
[ext_resource type="PackedScene" uid="uid://b6piduuvusiix" path="res://scenes/blocks/destroyblock.tscn" id="4_4f23w"]
[ext_resource type="PackedScene" uid="uid://bp71ntkh281k5" path="res://scenes/items/fire_flower.tscn" id="4_qmept"]
[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="PackedScene" uid="uid://nm5keea43u56" path="res://scenes/items/coin.tscn" id="6_evydd"]
[ext_resource type="PackedScene" uid="uid://b4dp88urmm7g8" path="res://scenes/items/mushroom.tscn" id="7_rk0p2"]
[ext_resource type="PackedScene" uid="uid://cwviqxncs4fom" path="res://scenes/enemies/gumba.tscn" id="8_be76n"]
[ext_resource type="AudioStream" uid="uid://cdtrw675os7dh" path="res://assets/sounds/01. Ground Theme.mp3" id="9_xkthi"]
[ext_resource type="FontFile" uid="uid://cpwx7datjer6s" path="res://assets/PixelOperator8.ttf" id="10_b277n"]
@@ -19101,7 +19102,7 @@ hit_object = ExtResource("6_evydd")
[node name="itemblock5" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(1168, -48)
hit_object = ExtResource("6_evydd")
hit_object = ExtResource("4_qmept")
[node name="destroyblock4" parent="interactable_blocks" instance=ExtResource("4_4f23w")]
position = Vector2(1152, -48)
@@ -19169,7 +19170,7 @@ hit_object = ExtResource("6_evydd")
[node name="itemblock10" parent="interactable_blocks" instance=ExtResource("3_fmbwm")]
position = Vector2(1664, -112)
hit_object = ExtResource("7_rk0p2")
hit_object = ExtResource("6_evydd")
[node name="destroyblock20" parent="interactable_blocks" instance=ExtResource("4_4f23w")]
position = Vector2(1792, -48)
@@ -19326,6 +19327,18 @@ position = Vector2(1120, 0)
[node name="Gumba5" parent="Enemies" instance=ExtResource("8_be76n")]
position = Vector2(1152, 0)
[node name="Gumba6" parent="Enemies" instance=ExtResource("8_be76n")]
position = Vector2(1472, 0)
[node name="Gumba7" parent="Enemies" instance=ExtResource("8_be76n")]
position = Vector2(1648, 0)
[node name="Gumba8" parent="Enemies" instance=ExtResource("8_be76n")]
position = Vector2(2672, 0)
[node name="Gumba9" parent="Enemies" instance=ExtResource("8_be76n")]
position = Vector2(2752, 0)
[node name="Pipes" type="Node" parent="."]
[node name="pipe" parent="Pipes" instance=ExtResource("5_31d8i")]
@@ -19363,15 +19376,3 @@ theme_override_fonts/font = ExtResource("10_b277n")
text = "Tap Right To Jump"
horizontal_alignment = 1
vertical_alignment = 1
[node name="Gumba" parent="." instance=ExtResource("8_be76n")]
position = Vector2(1472, 0)
[node name="Gumba2" parent="." instance=ExtResource("8_be76n")]
position = Vector2(1648, 0)
[node name="Gumba3" parent="." instance=ExtResource("8_be76n")]
position = Vector2(2672, 0)
[node name="Gumba4" parent="." instance=ExtResource("8_be76n")]
position = Vector2(2752, 0)
scenes/player.tscn
+54 -2
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=22 format=3 uid="uid://dk1aby88pygtr"]
[gd_scene load_steps=28 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"]
[ext_resource type="PackedScene" uid="uid://beaktq6mygp6c" path="res://scenes/items/fireball.tscn" id="2_owoxk"]
[ext_resource type="FontFile" uid="uid://cpwx7datjer6s" path="res://assets/PixelOperator8.ttf" id="3_mkgvb"]
[ext_resource type="Texture2D" uid="uid://d0xxlo60h1d7i" path="res://assets/coinlabel.png" id="4_o0q77"]
[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"]
@@ -19,6 +20,10 @@ region = Rect2(80, 34, 16, 16)
atlas = ExtResource("1_w3chr")
region = Rect2(80, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_kxd3p"]
atlas = ExtResource("1_w3chr")
region = Rect2(80, 129, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_dmbgr"]
atlas = ExtResource("1_w3chr")
region = Rect2(165, 34, 16, 16)
@@ -27,6 +32,10 @@ region = Rect2(165, 34, 16, 16)
atlas = ExtResource("1_w3chr")
region = Rect2(165, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_npe6k"]
atlas = ExtResource("1_w3chr")
region = Rect2(165, 129, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_jb1pe"]
atlas = ExtResource("1_w3chr")
region = Rect2(97, 34, 16, 16)
@@ -51,6 +60,18 @@ region = Rect2(114, 1, 16, 32)
atlas = ExtResource("1_w3chr")
region = Rect2(131, 1, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_iljl6"]
atlas = ExtResource("1_w3chr")
region = Rect2(97, 129, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_7pcnf"]
atlas = ExtResource("1_w3chr")
region = Rect2(114, 129, 16, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_jva7o"]
atlas = ExtResource("1_w3chr")
region = Rect2(131, 129, 16, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_l5s58"]
animations = [{
"frames": [{
@@ -79,6 +100,14 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_kxd3p")
}],
"loop": true,
"name": &"idle_flower",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_dmbgr")
}],
"loop": true,
@@ -95,6 +124,14 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_npe6k")
}],
"loop": true,
"name": &"jump_flower",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_jb1pe")
}, {
"duration": 1.0,
@@ -120,6 +157,20 @@ animations = [{
"loop": true,
"name": &"run_big",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_iljl6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7pcnf")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jva7o")
}],
"loop": true,
"name": &"run_flower",
"speed": 10.0
}]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_4sl4a"]
@@ -136,6 +187,7 @@ size = Vector2(1, 2)
position = Vector2(0, -10)
collision_layer = 2
script = ExtResource("1_lm7ix")
fireball_prefab = ExtResource("2_owoxk")
[node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(35, 0)
@@ -156,7 +208,7 @@ color = Color(0, 0, 0, 1)
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(0, 2)
sprite_frames = SubResource("SpriteFrames_l5s58")
animation = &"idle_big"
animation = &"run_flower"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 2)