From 822783712fd458923d3590696334ccc37fcd29a1 Mon Sep 17 00:00:00 2001 From: INoro Date: Sun, 11 Dec 2022 06:55:54 +0100 Subject: [PATCH] Leo - basically nothing new --- Nodes/UI.tscn | 7 ++++- menu/stats_player_1.gd | 5 ---- menu/stats_player_1.tscn | 58 ++++++++++++++++---------------------- scripts/Modules/Storage.gd | 2 ++ 4 files changed, 33 insertions(+), 39 deletions(-) diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 1b2c4fb..711dd7d 100644 --- a/Nodes/UI.tscn +++ b/Nodes/UI.tscn @@ -23,6 +23,7 @@ size_flags_horizontal = 4 [node name="Panel" type="Panel" parent="."] custom_minimum_size = Vector2(15, 0) +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -31,6 +32,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="VSlider" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -48,6 +50,7 @@ editable = false scrollable = false [node name="VSlider2" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -65,18 +68,20 @@ editable = false scrollable = false [node name="Control" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 0 offset_left = -579.0 offset_right = 575.0 offset_bottom = 649.0 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] +layout_mode = 1 offset_right = 345.0 offset_bottom = -288.0 scale = Vector2(0.6, 0.6) [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] +layout_mode = 1 offset_left = -187.0 offset_right = 125.0 scale = Vector2(0.6, 0.6) diff --git a/menu/stats_player_1.gd b/menu/stats_player_1.gd index 652f713..6b4af02 100644 --- a/menu/stats_player_1.gd +++ b/menu/stats_player_1.gd @@ -1,8 +1,3 @@ extends Control var player_id = 1 - - - - - diff --git a/menu/stats_player_1.tscn b/menu/stats_player_1.tscn index bc4a532..1747434 100644 --- a/menu/stats_player_1.tscn +++ b/menu/stats_player_1.tscn @@ -16,18 +16,20 @@ grow_vertical = 2 script = ExtResource("1_7a1hg") [node name="Speedometer_player1" parent="." instance=ExtResource("1_8v7ps")] +layout_mode = 1 offset_right = 516.0 offset_bottom = 494.0 scale = Vector2(0.5, 0.5) -[node name="Rahmen2" type="TextureRect" parent="."] +[node name="Rahmen" type="TextureRect" parent="."] +layout_mode = 0 offset_right = 463.0 offset_bottom = 562.0 scale = Vector2(0.7, 0.7) texture = ExtResource("3_v32w1") [node name="RessourcenBox" type="HBoxContainer" parent="."] -visible = false +layout_mode = 1 anchors_preset = 2 anchor_top = 1.0 anchor_bottom = 1.0 @@ -40,52 +42,42 @@ scale = Vector2(0.05, 0.05) theme_override_constants/separation = 330 [node name="Kohle" type="VBoxContainer" parent="RessourcenBox"] -offset_right = 945.0 -offset_bottom = 977.0 +layout_mode = 2 theme_override_constants/separation = 10 [node name="TextureRect" type="TextureRect" parent="RessourcenBox/Kohle"] -offset_right = 945.0 -offset_bottom = 931.0 +layout_mode = 2 texture = ExtResource("3_tjc2l") -[node name="Label" type="Label" parent="RessourcenBox/Kohle"] -offset_top = 941.0 -offset_right = 945.0 -offset_bottom = 967.0 -text = "5 -" +[node name="Kohle" type="Label" parent="RessourcenBox/Kohle"] +layout_mode = 2 +theme_override_font_sizes/font_size = 150 +text = "hallo" +horizontal_alignment = 1 [node name="GunPowder" type="VBoxContainer" parent="RessourcenBox"] -offset_left = 1275.0 -offset_right = 2220.0 -offset_bottom = 977.0 +layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="RessourcenBox/GunPowder"] -offset_right = 945.0 -offset_bottom = 931.0 +layout_mode = 2 texture = ExtResource("4_jn38u") -[node name="Label" type="Label" parent="RessourcenBox/GunPowder"] -offset_top = 935.0 -offset_right = 945.0 -offset_bottom = 958.0 +[node name="Schießpulver" type="Label" parent="RessourcenBox/GunPowder"] +layout_mode = 2 +theme_override_font_sizes/font_size = 150 +text = "hallo" +horizontal_alignment = 1 [node name="Munition" type="VBoxContainer" parent="RessourcenBox"] -offset_left = 2550.0 -offset_right = 3495.0 -offset_bottom = 977.0 +layout_mode = 2 size_flags_stretch_ratio = 0.39 [node name="MunitionSprite" type="TextureRect" parent="RessourcenBox/Munition"] -offset_right = 945.0 -offset_bottom = 931.0 +layout_mode = 2 texture = ExtResource("5_b5gk5") -[node name="Label" type="Label" parent="RessourcenBox/Munition"] -offset_top = 935.0 -offset_right = 945.0 -offset_bottom = 977.0 -theme_override_font_sizes/font_size = 30 - -[connection signal="resized" from="." to="Speedometer_player1" method="_on_stats_player_1_resized"] +[node name="Munition" type="Label" parent="RessourcenBox/Munition"] +layout_mode = 2 +theme_override_font_sizes/font_size = 150 +text = "hallo" +horizontal_alignment = 1 diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index f543ddc..4b598af 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -19,6 +19,8 @@ func _ready(): $AudioStreamPlayer.stream = audioClip $Sprite3D2.visible = false + + func interact(player): if currentStashValue >= 1: currentStashValue -= 1