From d53a4801a33fbff92df78912ce12235c3ec83b4c Mon Sep 17 00:00:00 2001 From: Fisch Date: Wed, 26 Mar 2025 23:17:45 +0100 Subject: [PATCH] add bobbycars as playerlist entries in menu --- scenes/game.tscn | 56 ++++++++-------- scenes/menu.tscn | 148 +++++++++++++++++++++++++++++++++++++++-- scripts/menudisplay.gd | 5 ++ 3 files changed, 174 insertions(+), 35 deletions(-) diff --git a/scenes/game.tscn b/scenes/game.tscn index 1b01617..d6c8cfe 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -5,8 +5,32 @@ [ext_resource type="AudioStream" uid="uid://cdricwi06nttp" path="res://sounds/beep/countdown_beep_high.mp3" id="3_fdp2i"] [ext_resource type="AudioStream" uid="uid://v3eqa857k2xo" path="res://sounds/beep/countdown_beep.mp3" id="3_fv4j3"] -[sub_resource type="Animation" id="Animation_52fxl"] -resource_name = "normal" +[sub_resource type="Animation" id="Animation_fgk0n"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("hud/carpreset_animations/label_fast:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(1, 1, 1, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("hud/carpreset_animations/label_fast:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(353, 269)] +} [sub_resource type="Animation" id="Animation_2q66f"] resource_name = "fast" @@ -36,32 +60,8 @@ tracks/1/keys = { "values": [Vector2(-500, 100), Vector2(375, 100), Vector2(375, 100), Vector2(900, 100)] } -[sub_resource type="Animation" id="Animation_fgk0n"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("hud/carpreset_animations/label_fast:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("hud/carpreset_animations/label_fast:position") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(353, 269)] -} +[sub_resource type="Animation" id="Animation_52fxl"] +resource_name = "normal" [sub_resource type="AnimationLibrary" id="AnimationLibrary_dbd4v"] _data = { diff --git a/scenes/menu.tscn b/scenes/menu.tscn index 194f6f3..d32b282 100644 --- a/scenes/menu.tscn +++ b/scenes/menu.tscn @@ -1,13 +1,16 @@ -[gd_scene load_steps=19 format=3 uid="uid://b1uhymisifcho"] +[gd_scene load_steps=22 format=3 uid="uid://b1uhymisifcho"] [ext_resource type="Script" path="res://scripts/menu.gd" id="1_fushn"] [ext_resource type="Script" path="res://scripts/menudisplay.gd" id="2_jc4pv"] [ext_resource type="Script" path="res://scripts/map_selection.gd" id="3_c0mhk"] [ext_resource type="Texture2D" uid="uid://my0glsan1h2e" path="res://scenes/map_preview/map_00.png" id="3_p822h"] [ext_resource type="Texture2D" uid="uid://bk32usoetq3b" path="res://scenes/map_preview/map_01.png" id="4_ac8w4"] +[ext_resource type="Texture2D" uid="uid://dojj5iqges76q" path="res://sprites/bobbycar_body.png" id="5_4c5nu"] [ext_resource type="Texture2D" uid="uid://ole07xte1dxp" path="res://scenes/map_preview/map_02.png" id="5_pnyq7"] +[ext_resource type="Texture2D" uid="uid://c5rlo1fhm3bl4" path="res://sprites/bobbycar_features.png" id="6_wj8p2"] [ext_resource type="Texture2D" uid="uid://btol62ajcio85" path="res://scenes/map_preview/map_03.png" id="7_5f67q"] [ext_resource type="Script" path="res://scripts/rounds_selection.gd" id="7_cr4tq"] +[ext_resource type="Texture2D" uid="uid://dkg8e3stos5rw" path="res://sprites/bobbycar_steeringwheel.png" id="7_duvwv"] [ext_resource type="Texture2D" uid="uid://dku8jinmijays" path="res://scenes/map_preview/map_04.png" id="8_46b6b"] [ext_resource type="Texture2D" uid="uid://mp5f6jviyl44" path="res://scenes/map_preview/map_05.png" id="10_cou7n"] [ext_resource type="Texture2D" uid="uid://bst8p5s1sgurm" path="res://sprites/menu_bg.png" id="10_equk1"] @@ -81,10 +84,17 @@ texture = ExtResource("10_equk1") offset = Vector2(0.92, 14.62) [node name="countdown" type="Label" parent="MenuDisplay"] -offset_left = 175.0 -offset_top = 71.0 -offset_right = 232.0 -offset_bottom = 208.0 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = 536.0 +offset_top = 240.0 +offset_right = 593.0 +offset_bottom = 377.0 +grow_horizontal = 2 +grow_vertical = 2 theme_override_font_sizes/font_size = 100 text = "5" @@ -95,21 +105,22 @@ offset_right = 517.0 offset_bottom = 637.245 [node name="VBoxContainer_Playerlist" type="VBoxContainer" parent="MenuDisplay/MarginContainer"] +visible = false layout_mode = 2 theme = SubResource("Theme_eo4i1") [node name="Label" type="Label" parent="MenuDisplay/MarginContainer/VBoxContainer_Playerlist"] +visible = false layout_mode = 2 size_flags_horizontal = 0 theme_override_font_sizes/font_size = 40 -text = "Hold Key" uppercase = true [node name="Label2" type="Label" parent="MenuDisplay/MarginContainer/VBoxContainer_Playerlist"] +visible = false layout_mode = 2 size_flags_horizontal = 0 theme_override_font_sizes/font_size = 40 -text = "to join" uppercase = true [node name="Label3" type="Label" parent="MenuDisplay/MarginContainer/VBoxContainer_Playerlist"] @@ -188,6 +199,120 @@ scale_amount_min = 2.0 scale_amount_max = 10.0 scale_amount_curve = SubResource("Curve_kioen") +[node name="VBoxContainer_Spritelist" type="VBoxContainer" parent="MenuDisplay/MarginContainer"] +layout_mode = 2 +theme = SubResource("Theme_eo4i1") + +[node name="Sprite2D_Bobbycar1" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 30) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar1"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar1"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar2" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 89) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar2"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar2"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar3" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 148) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar3"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar3"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar4" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 207) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar4"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar4"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar5" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 266) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar5"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar5"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar6" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 325) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar6"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar6"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar7" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 384) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar7"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar7"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar8" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 443) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar8"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar8"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar9" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 502) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar9"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar9"] +texture = ExtResource("7_duvwv") + +[node name="Sprite2D_Bobbycar10" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist"] +visible = false +position = Vector2(-42, 561) +texture = ExtResource("5_4c5nu") + +[node name="Sprite2D_features" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar10"] +texture = ExtResource("6_wj8p2") + +[node name="Sprite2D_steeringwheel" type="Sprite2D" parent="MenuDisplay/MarginContainer/VBoxContainer_Spritelist/Sprite2D_Bobbycar10"] +texture = ExtResource("7_duvwv") + [node name="btn_fullscreen" type="CheckButton" parent="MenuDisplay"] offset_left = 845.0 offset_top = 539.0 @@ -287,6 +412,15 @@ offset_bottom = 635.0 theme_override_font_sizes/font_size = 24 text = "Mapchange in " +[node name="JoinInfo" type="Label" parent="MenuDisplay"] +offset_left = 211.0 +offset_top = 11.0 +offset_right = 486.0 +offset_bottom = 53.0 +theme_override_constants/outline_size = 15 +theme_override_font_sizes/font_size = 30 +text = "Hold Button to join" + [node name="Timer" type="Timer" parent="."] wait_time = 5.0 diff --git a/scripts/menudisplay.gd b/scripts/menudisplay.gd index 197f3bc..71e9a80 100644 --- a/scripts/menudisplay.gd +++ b/scripts/menudisplay.gd @@ -20,12 +20,15 @@ func updateCountdown(t): func update_playerlist(players:Array[Gamestate.Player],flashplayer_keycode=-1,effect="blink"): var Playerlabels=$MarginContainer/VBoxContainer_Playerlist.get_children() + var i=0 for label in Playerlabels: + var PlayerSprite=$MarginContainer/VBoxContainer_Spritelist.get_child(i) #get corresponding car sprite if i void: