From c8555832f0fa74803621e2d85090b267bda42f58 Mon Sep 17 00:00:00 2001 From: perivesta <> Date: Sun, 9 Jul 2023 18:44:39 +0200 Subject: fixes --- Levels/Level1.tscn | 1 + Levels/Level2.tscn | 7 +++++-- Levels/Level3.tscn | 7 +++++-- Levels/Level4.tscn | 47 ++++++++++++++++++++++++++++++++--------------- Levels/Tut01.tscn | 2 +- Levels/Tut02.tscn | 2 +- Levels/Tut03.tscn | 2 +- Scripts/game.gd | 3 ++- 8 files changed, 48 insertions(+), 23 deletions(-) diff --git a/Levels/Level1.tscn b/Levels/Level1.tscn index 74ffae4..30c45e5 100644 --- a/Levels/Level1.tscn +++ b/Levels/Level1.tscn @@ -29,6 +29,7 @@ bronze_medal_time = 7.0 [node name="UI" parent="." instance=ExtResource("2_2bp3f")] [node name="Start" type="Node2D" parent="."] +z_index = 2 position = Vector2(360, 548) [node name="Start" type="TextureButton" parent="Start"] diff --git a/Levels/Level2.tscn b/Levels/Level2.tscn index fd2e379..8fed565 100644 --- a/Levels/Level2.tscn +++ b/Levels/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://c4ufprgnkgelp"] +[gd_scene load_steps=14 format=3 uid="uid://c4ufprgnkgelp"] [ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_hjw4x"] [ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_koori"] @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cxhterify3l" path="res://Assets/Images/goal.png" id="4_euu0i"] [ext_resource type="PackedScene" uid="uid://c1mvbh2fwqtkb" path="res://Nodes/car.tscn" id="5_5co3o"] [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_hv33l"] -[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="7_k0xyq"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="7_k0xyq"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="7_lgn1k"] [ext_resource type="PackedScene" uid="uid://wkfai2lvnp7n" path="res://Nodes/checkpoint.tscn" id="7_vm5ky"] [ext_resource type="Script" path="res://Scripts/Road.gd" id="8_ni64o"] @@ -28,6 +28,7 @@ silver_medal_time = 5.5 [node name="UI" parent="." instance=ExtResource("2_koori")] [node name="Start" type="Node2D" parent="."] +z_index = 2 position = Vector2(188, 343) [node name="Start" type="TextureButton" parent="Start"] @@ -38,6 +39,7 @@ offset_bottom = 8.0 texture_normal = ExtResource("3_v806n") [node name="FinishLine" type="Sprite2D" parent="."] +z_index = 2 position = Vector2(949, 322) texture = ExtResource("4_euu0i") @@ -47,6 +49,7 @@ texture = ExtResource("4_euu0i") shape = SubResource("CircleShape2D_6g88q") [node name="Car" parent="." instance=ExtResource("5_5co3o")] +z_index = 3 [node name="DrawNode" type="Node2D" parent="."] script = ExtResource("6_hv33l") diff --git a/Levels/Level3.tscn b/Levels/Level3.tscn index 73cdd37..fd5ba77 100644 --- a/Levels/Level3.tscn +++ b/Levels/Level3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://ctw32x620maaj"] +[gd_scene load_steps=14 format=3 uid="uid://ctw32x620maaj"] [ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_iao1p"] [ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_rgpyj"] @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://c1mvbh2fwqtkb" path="res://Nodes/car.tscn" id="5_ja277"] [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_c7w7m"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="7_2rtyp"] -[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="7_7isac"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="7_7isac"] [ext_resource type="PackedScene" uid="uid://wkfai2lvnp7n" path="res://Nodes/checkpoint.tscn" id="7_c20c2"] [ext_resource type="Script" path="res://Scripts/Road.gd" id="8_itqp7"] @@ -29,6 +29,7 @@ bronze_medal_time = 7.5 [node name="UI" parent="." instance=ExtResource("2_rgpyj")] [node name="Start" type="Node2D" parent="."] +z_index = 2 position = Vector2(573, 572) [node name="Start" type="TextureButton" parent="Start"] @@ -39,6 +40,7 @@ offset_bottom = 8.0 texture_normal = ExtResource("3_8cdg1") [node name="FinishLine" type="Sprite2D" parent="."] +z_index = 2 position = Vector2(572, 95) texture = ExtResource("4_15yjv") @@ -48,6 +50,7 @@ texture = ExtResource("4_15yjv") shape = SubResource("CircleShape2D_6g88q") [node name="Car" parent="." instance=ExtResource("5_ja277")] +z_index = 3 [node name="DrawNode" type="Node2D" parent="."] script = ExtResource("6_c7w7m") diff --git a/Levels/Level4.tscn b/Levels/Level4.tscn index 0977738..f7746a8 100644 --- a/Levels/Level4.tscn +++ b/Levels/Level4.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://sblw8ttno2ct"] +[gd_scene load_steps=14 format=3 uid="uid://sblw8ttno2ct"] [ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_0hoti"] [ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_6h1wh"] @@ -8,22 +8,25 @@ [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_rbt70"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="7_35s5k"] [ext_resource type="PackedScene" uid="uid://wkfai2lvnp7n" path="res://Nodes/checkpoint.tscn" id="7_yy012"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="9_ff8cx"] +[ext_resource type="Script" path="res://Scripts/Road.gd" id="10_w2ggh"] [sub_resource type="CircleShape2D" id="CircleShape2D_6g88q"] radius = 17.0 -[sub_resource type="Curve2D" id="Curve2D_0exre"] - [sub_resource type="LabelSettings" id="LabelSettings_q0xx8"] outline_size = 3 outline_color = Color(0, 0, 0, 1) +[sub_resource type="Curve2D" id="Curve2D_idkoi"] + [node name="Level_test2" type="Node2D"] script = ExtResource("1_0hoti") [node name="UI" parent="." instance=ExtResource("2_6h1wh")] [node name="Start" type="Node2D" parent="."] +z_index = 2 position = Vector2(572, 212) [node name="Start" type="TextureButton" parent="Start"] @@ -34,6 +37,7 @@ offset_bottom = 8.0 texture_normal = ExtResource("3_2kakl") [node name="FinishLine" type="Sprite2D" parent="."] +z_index = 2 position = Vector2(570, 117) texture = ExtResource("4_elpol") @@ -43,18 +47,7 @@ texture = ExtResource("4_elpol") shape = SubResource("CircleShape2D_6g88q") [node name="Car" parent="." instance=ExtResource("5_hyjpi")] - -[node name="DrawNode" type="Node2D" parent="."] -script = ExtResource("6_rbt70") - -[node name="TrackLine" type="Line2D" parent="DrawNode"] -default_color = Color(0.870588, 0.870588, 0.870588, 0.431373) - -[node name="TrackPath" type="Path2D" parent="DrawNode"] -curve = SubResource("Curve2D_0exre") - -[node name="TrackFollower" type="PathFollow2D" parent="DrawNode/TrackPath"] -loop = false +z_index = 3 [node name="Checkpoints" type="Node" parent="."] @@ -115,4 +108,28 @@ offset_bottom = 26.0 text = "Level 04" label_settings = SubResource("LabelSettings_q0xx8") +[node name="DrawNode" type="Node2D" parent="."] +script = ExtResource("6_rbt70") + +[node name="TrackPath" type="Path2D" parent="DrawNode"] +curve = SubResource("Curve2D_idkoi") + +[node name="TrackFollower" type="PathFollow2D" parent="DrawNode/TrackPath"] +loop = false + +[node name="55886" type="Timer" parent="DrawNode/TrackPath/TrackFollower"] +wait_time = 0.2 +one_shot = true + +[node name="TrackLine" type="Line2D" parent="DrawNode"] +texture_repeat = 2 +width = 70.0 +texture = ExtResource("9_ff8cx") +texture_mode = 1 +script = ExtResource("10_w2ggh") + +[node name="LeftBorder" type="Line2D" parent="DrawNode/TrackLine"] + +[node name="RightBorder" type="Line2D" parent="DrawNode/TrackLine"] + [connection signal="mouse_entered" from="FinishLine/Area2D" to="DrawNode" method="_end_drawing"] diff --git a/Levels/Tut01.tscn b/Levels/Tut01.tscn index ab2a1e1..8925d85 100644 --- a/Levels/Tut01.tscn +++ b/Levels/Tut01.tscn @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://c1mvbh2fwqtkb" path="res://Nodes/car.tscn" id="5_mi6tb"] [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_0pqvb"] [ext_resource type="Script" path="res://Scripts/Road.gd" id="7_d0og5"] -[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="7_w2gmt"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="7_w2gmt"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="8_wphs7"] [sub_resource type="CircleShape2D" id="CircleShape2D_6g88q"] diff --git a/Levels/Tut02.tscn b/Levels/Tut02.tscn index 6cfb2eb..14da9ab 100644 --- a/Levels/Tut02.tscn +++ b/Levels/Tut02.tscn @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cxhterify3l" path="res://Assets/Images/goal.png" id="4_yklwl"] [ext_resource type="PackedScene" uid="uid://c1mvbh2fwqtkb" path="res://Nodes/car.tscn" id="5_h0kjy"] [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_0m5bn"] -[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="7_iioy2"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="7_iioy2"] [ext_resource type="Script" path="res://Scripts/Road.gd" id="8_1xa7f"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="8_a1rvy"] diff --git a/Levels/Tut03.tscn b/Levels/Tut03.tscn index 8f45c64..15a6361 100644 --- a/Levels/Tut03.tscn +++ b/Levels/Tut03.tscn @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cxhterify3l" path="res://Assets/Images/goal.png" id="4_a601a"] [ext_resource type="PackedScene" uid="uid://c1mvbh2fwqtkb" path="res://Nodes/car.tscn" id="5_hgfxg"] [ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_uikm8"] -[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="7_wag28"] +[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="7_wag28"] [ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="8_1mcey"] [ext_resource type="PackedScene" uid="uid://wkfai2lvnp7n" path="res://Nodes/checkpoint.tscn" id="8_7nfp6"] [ext_resource type="Script" path="res://Scripts/Road.gd" id="8_st1kl"] diff --git a/Scripts/game.gd b/Scripts/game.gd index 3b87736..7e846e5 100644 --- a/Scripts/game.gd +++ b/Scripts/game.gd @@ -11,7 +11,8 @@ var scenes = [ preload("res://Levels/Tut03.tscn"), preload("res://Levels/Level1.tscn"), preload("res://Levels/Level2.tscn"), - preload("res://Levels/Level3.tscn") + preload("res://Levels/Level3.tscn"), + preload("res://Levels/Level4.tscn") ] # Called when the node enters the scene tree for the first time. -- cgit