From 098854ec4a6b7b3f7bd44e74e1bbf2130c3c3bed Mon Sep 17 00:00:00 2001 From: darioGerussi Date: Sun, 22 May 2022 14:01:24 -0500 Subject: [PATCH] Completed initial UI version of multiplayer menu sections --- .../assets/ui_controlNode_dark_theme.tres | 18 +- .../Multiplayer/screens/NewRoom.tscn | 162 +++++++++++++++++- .../Multiplayer/screens/SpinBox.gd | 16 ++ 3 files changed, 189 insertions(+), 7 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/Multiplayer/screens/SpinBox.gd diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/assets/ui_controlNode_dark_theme.tres b/Phase2/Godot ===(Game Code)===/Multiplayer/assets/ui_controlNode_dark_theme.tres index b606d40..8896645 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/assets/ui_controlNode_dark_theme.tres +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/assets/ui_controlNode_dark_theme.tres @@ -1,8 +1,23 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=5 format=2] [ext_resource path="res://assets/sbf_black.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] +[sub_resource type="Image" id=1] +data = { +"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 103, 225, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 57, 224, 248, 224, 250, 226, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 24, 224, 228, 224, 255, 224, 255, 224, 231, 227, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 5, 223, 194, 224, 255, 224, 255, 224, 255, 224, 255, 224, 199, 219, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 153, 224, 255, 224, 255, 224, 255, 224, 255, 224, 255, 224, 255, 225, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 153, 224, 255, 224, 255, 224, 255, 224, 255, 224, 255, 224, 255, 225, 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 5, 223, 194, 224, 255, 224, 255, 224, 255, 224, 255, 224, 198, 219, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 24, 224, 228, 224, 255, 224, 255, 224, 231, 227, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, 56, 224, 248, 224, 250, 226, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 225, 102, 225, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), +"format": "LumAlpha8", +"height": 16, +"mipmaps": false, +"width": 16 +} + +[sub_resource type="ImageTexture" id=2] +flags = 4 +flags = 4 +image = SubResource( 1 ) +size = Vector2( 16, 16 ) + [resource] Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -25,4 +40,5 @@ Label/constants/shadow_offset_y = 1 Label/fonts/font = null Label/styles/normal = null Panel/styles/panel = ExtResource( 1 ) +SpinBox/icons/updown = SubResource( 2 ) VBoxContainer/constants/separation = 4 diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn index f9750e3..86887cf 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn @@ -191,6 +191,141 @@ margin_right = 790.0 margin_bottom = 290.0 rect_min_size = Vector2( 393, 290 ) +[node name="ModuleSelection" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_right = 393.0 +margin_bottom = 36.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/ModuleSelection"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Module Selection" + +[node name="OptionButton" type="OptionButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/ModuleSelection"] +margin_left = 154.0 +margin_right = 379.0 +margin_bottom = 36.0 +rect_min_size = Vector2( 225, 0 ) + +[node name="ChatLimit" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 40.0 +margin_right = 393.0 +margin_bottom = 76.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/ChatLimit"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Char. Chat Limit" + +[node name="CheckButton" type="CheckButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/ChatLimit"] +margin_left = 154.0 +margin_right = 220.0 +margin_bottom = 36.0 + +[node name="CharacterLimit" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 80.0 +margin_right = 393.0 +margin_bottom = 116.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/CharacterLimit"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Character Limit" + +[node name="OptionButton" type="OptionButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/CharacterLimit"] +margin_left = 154.0 +margin_right = 379.0 +margin_bottom = 36.0 +rect_min_size = Vector2( 225, 0 ) + +[node name="PlayersAllowed" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 120.0 +margin_right = 393.0 +margin_bottom = 156.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/PlayersAllowed"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Players Allowed" + +[node name="OptionButton" type="OptionButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/PlayersAllowed"] +margin_left = 154.0 +margin_right = 379.0 +margin_bottom = 36.0 +rect_min_size = Vector2( 225, 0 ) + +[node name="SaveGame" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 160.0 +margin_right = 393.0 +margin_bottom = 196.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/SaveGame"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Save Game" + +[node name="CheckButton" type="CheckButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/SaveGame"] +margin_left = 154.0 +margin_right = 220.0 +margin_bottom = 36.0 + +[node name="PlayerPause" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 200.0 +margin_right = 393.0 +margin_bottom = 236.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/PlayerPause"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Player Pause" + +[node name="CheckButton" type="CheckButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/PlayerPause"] +margin_left = 154.0 +margin_right = 220.0 +margin_bottom = 36.0 + +[node name="StartAndStop" type="HBoxContainer" parent="Background/PanelContainer/SettingsMenu/RightColumn"] +margin_top = 240.0 +margin_right = 393.0 +margin_bottom = 276.0 +rect_min_size = Vector2( 0, 36 ) + +[node name="Label" type="Label" parent="Background/PanelContainer/SettingsMenu/RightColumn/StartAndStop"] +margin_top = 5.0 +margin_right = 150.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 150, 0 ) +custom_fonts/font = ExtResource( 6 ) +text = "Start and Stop" + +[node name="CheckButton" type="CheckButton" parent="Background/PanelContainer/SettingsMenu/RightColumn/StartAndStop"] +margin_left = 154.0 +margin_right = 220.0 +margin_bottom = 36.0 + [node name="VBoxContainer" type="VBoxContainer" parent="Background"] margin_left = 393.0 margin_top = 501.0 @@ -198,12 +333,6 @@ margin_right = 631.0 margin_bottom = 552.0 rect_min_size = Vector2( 0, 51 ) -[node name="But_Multiplayer" parent="Background/VBoxContainer" instance=ExtResource( 4 )] -margin_right = 238.0 -margin_bottom = 51.0 -text = "Go Back" -next_scene_path = "res://Screens/Multiplayer.tscn" - [node name="Version" type="Label" parent="Background"] anchor_left = 1.0 anchor_top = 1.0 @@ -214,3 +343,24 @@ margin_top = -44.0 margin_right = -5.0 margin_bottom = -6.0 text = "Version: 0.0.0" + +[node name="HBoxContainer" type="HBoxContainer" parent="Background"] +margin_left = 273.0 +margin_top = 501.0 +margin_right = 753.0 +margin_bottom = 552.0 +rect_min_size = Vector2( 476, 51 ) + +[node name="But_Multiplayer" parent="Background/HBoxContainer" instance=ExtResource( 4 )] +margin_right = 238.0 +margin_bottom = 51.0 +rect_min_size = Vector2( 238, 51 ) +text = "Go Back" +next_scene_path = "res://Screens/Multiplayer.tscn" + +[node name="But_Multiplayer2" parent="Background/HBoxContainer" instance=ExtResource( 4 )] +margin_left = 242.0 +margin_right = 480.0 +margin_bottom = 51.0 +rect_min_size = Vector2( 238, 51 ) +text = "Create New Room" diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/SpinBox.gd b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/SpinBox.gd new file mode 100644 index 0000000..525146e --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/SpinBox.gd @@ -0,0 +1,16 @@ +extends SpinBox + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass