UI update

JumpRoyale/scenes/Jumper.tres → JumpRoyale/Resources/Jumper.tres

@@ -17,4 +17,4 @@ RichTextLabel/constants/shadow_outline_size = 0
 RichTextLabel/constants/table_h_separation = 0
 RichTextLabel/constants/table_v_separation = 0
 RichTextLabel/constants/text_highlight_h_padding = 0
-RichTextLabel/constants/text_highlight_v_padding = 0
+RichTextLabel/constants/text_highlight_v_padding = 0

JumpRoyale/Resources/LobbyLabelSettings.tres

@@ -0,0 +1,7 @@
+[gd_resource type="LabelSettings" format=3 uid="uid://b4hkbiiau0wu3"]
+
+[resource]
+font_size = 25
+shadow_size = 2
+shadow_color = Color(0, 0, 0, 0.196078)
+shadow_offset = Vector2(2, 2)

JumpRoyale/Resources/RichTextLabelTheme.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Theme" format=3 uid="uid://keary5vfopmg"]
+
+[resource]
+RichTextLabel/colors/font_shadow_color = Color(0, 0, 0, 0.196078)
+RichTextLabel/constants/shadow_offset_x = 2
+RichTextLabel/constants/shadow_offset_y = 2
+RichTextLabel/constants/shadow_outline_size = 2
+RichTextLabel/font_sizes/normal_font_size = 25

JumpRoyale/Resources/UIBackground.tres

@@ -0,0 +1,12 @@
+[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://ccjbiokdyflra"]
+
+[ext_resource type="Texture2D" uid="uid://bsvr8kau48we" path="res://assets/sprites/UI.png" id="1_2j1mw"]
+
+[resource]
+texture = ExtResource("1_2j1mw")
+texture_margin_left = 16.0
+texture_margin_top = 16.0
+texture_margin_right = 16.0
+texture_margin_bottom = 16.0
+region_rect = Rect2(16, 0, 48, 48)
+modulate_color = Color(1, 1, 1, 0.784314)

JumpRoyale/assets/sprites/Instructions.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bhpc2dtu8rgmh"
+path="res://.godot/imported/Instructions.png-a29b034a2e229ddd8df04c6edee61df5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sprites/Instructions.png"
+dest_files=["res://.godot/imported/Instructions.png-a29b034a2e229ddd8df04c6edee61df5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

JumpRoyale/assets/sprites/UI.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bsvr8kau48we"
+path="res://.godot/imported/UI.png-e2d90aaeb743ee71811c0e6b068775de.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sprites/UI.png"
+dest_files=["res://.godot/imported/UI.png-e2d90aaeb743ee71811c0e6b068775de.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

JumpRoyale/project.godot

@@ -34,6 +34,11 @@ project/assembly_name="Jump Royale"
 
 enabled=PackedStringArray()
 
+[gui]
+
+theme/default_font_hinting=0
+theme/default_font_multichannel_signed_distance_field=true
+
 [input]
 
 ui_left={

JumpRoyale/scenes/Arena.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://src/Arena.cs" id="1_5vcv2"]
 [ext_resource type="PackedScene" uid="uid://bhke5myraos1m" path="res://scenes/Jumper.tscn" id="2_6nvro"]
-[ext_resource type="TileSet" uid="uid://dxyjk1rm2jjjv" path="res://scenes/TileSet.tres" id="3_cg3j3"]
+[ext_resource type="TileSet" uid="uid://dxyjk1rm2jjjv" path="res://Resources/TileSet.tres" id="3_cg3j3"]
 [ext_resource type="PackedScene" uid="uid://bvl6vnp0t3iy6" path="res://scenes/LobbyOverlay.tscn" id="4_2j1ab"]
 [ext_resource type="PackedScene" uid="uid://c5b384kxo0vyl" path="res://scenes/GameOverlay.tscn" id="5_5yfyu"]
 [ext_resource type="PackedScene" uid="uid://cibfccggfqmwh" path="res://scenes/EndScreenOverlay.tscn" id="6_eibxd"]
@@ -23,14 +23,20 @@ position_smoothing_speed = 0.02
 
 [node name="LobbyOverlay" parent="CanvasLayer" instance=ExtResource("4_2j1ab")]
 z_index = 1
-anchors_preset = 0
-anchor_right = 0.0
-offset_left = 549.0
-offset_right = 1464.0
-grow_horizontal = 1
-size_flags_horizontal = 8
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -253.0
+offset_top = -390.0
+offset_right = 253.0
+offset_bottom = -130.0
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="GameOverlay" parent="CanvasLayer" instance=ExtResource("5_5yfyu")]
+visible = false
 z_index = 1
 offset_left = -447.0
 offset_top = 15.0
@@ -39,10 +45,10 @@ offset_bottom = 515.0
 
 [node name="EndScreenOverlay" parent="CanvasLayer" instance=ExtResource("6_eibxd")]
 visible = false
-offset_left = -1877.0
-offset_top = 29.0
-offset_right = -70.0
-offset_bottom = 432.0
+offset_left = 48.0
+offset_top = 48.0
+offset_right = 191.0
+offset_bottom = 103.0
 
 [node name="TimerOverlay" parent="CanvasLayer" instance=ExtResource("7_f58o7")]
 anchors_preset = 0

JumpRoyale/scenes/EndScreenOverlay.tscn

@@ -1,13 +1,21 @@
-[gd_scene format=3 uid="uid://cibfccggfqmwh"]
+[gd_scene load_steps=3 format=3 uid="uid://cibfccggfqmwh"]
 
-[node name="EndScreenOverlay" type="VFlowContainer"]
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -249.0
-offset_bottom = 440.0
-grow_horizontal = 0
+[ext_resource type="StyleBox" uid="uid://ccjbiokdyflra" path="res://Resources/UIBackground.tres" id="1_fpa8u"]
 
-[node name="Output" type="Label" parent="."]
+[sub_resource type="LabelSettings" id="LabelSettings_ifyhp"]
+shadow_color = Color(0, 0, 0, 0.392157)
+
+[node name="EndScreenOverlay" type="PanelContainer"]
+offset_right = 111.0
+offset_bottom = 23.0
+theme_override_styles/panel = ExtResource("1_fpa8u")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="EndScreenOutput" type="Label" parent="VBoxContainer"]
+unique_name_in_owner = true
+texture_filter = 2
 layout_mode = 2
 text = "Scroll speed: 5"
+label_settings = SubResource("LabelSettings_ifyhp")

JumpRoyale/scenes/GameOverlay.tscn

@@ -12,20 +12,24 @@ grow_horizontal = 0
 script = ExtResource("1_612sj")
 
 [node name="NumPlayers" type="Label" parent="."]
+texture_filter = 2
 layout_mode = 2
 text = "Number of players goes here
 "
 
 [node name="JumpInstructions" type="Label" parent="."]
+texture_filter = 2
 layout_mode = 2
 text = "Jump with \"j <angle>\""
 
 [node name="HeightOutput" type="Label" parent="."]
+texture_filter = 2
 layout_mode = 2
 text = "Height output
 "
 autowrap_mode = 2
 
 [node name="CameraScrollSpeed" type="Label" parent="."]
+texture_filter = 2
 layout_mode = 2
 text = "Scroll speed: 5"

JumpRoyale/scenes/Jumper.tscn

@@ -15,7 +15,7 @@
 [ext_resource type="Texture2D" uid="uid://dn80vo65nle0y" path="res://assets/sprites/characters/Male/Character 1/Clothes 1/Character1M_1_jump_1.png" id="10_ac3fu"]
 [ext_resource type="Texture2D" uid="uid://cr7baxkpawx43" path="res://assets/sprites/characters/Male/Character 1/Clothes 1/Character1M_1_land_0.png" id="11_3fxgy"]
 [ext_resource type="Texture2D" uid="uid://de5vceaa85fe0" path="res://assets/sprites/characters/Male/Character 1/Clothes 1/Character1M_1_land_1.png" id="12_bwbvy"]
-[ext_resource type="Theme" uid="uid://cqnuj3pidkvob" path="res://scenes/Jumper.tres" id="16_fsbtc"]
+[ext_resource type="Theme" uid="uid://cqnuj3pidkvob" path="res://Resources/Jumper.tres" id="16_fsbtc"]
 
 [sub_resource type="Curve" id="Curve_43alo"]
 _data = [Vector2(0, 0.010989), 0.0, 0.0, 0, 0, Vector2(0.0708661, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]

JumpRoyale/scenes/LobbyOverlay.tscn

@@ -1,50 +1,42 @@
-[gd_scene load_steps=6 format=3 uid="uid://bvl6vnp0t3iy6"]
+[gd_scene load_steps=5 format=3 uid="uid://bvl6vnp0t3iy6"]
 
 [ext_resource type="Script" path="res://src/LobbyOverlay.cs" id="1_15rvs"]
-
-[sub_resource type="LabelSettings" id="LabelSettings_n02u3"]
-font_size = 40
-
-[sub_resource type="LabelSettings" id="LabelSettings_aso2h"]
-font_size = 40
-
-[sub_resource type="LabelSettings" id="LabelSettings_k2448"]
-font_size = 40
-
-[sub_resource type="LabelSettings" id="LabelSettings_wud63"]
-font_size = 40
-
-[node name="LobbyOverlay" type="VFlowContainer"]
-anchors_preset = 10
-anchor_right = 1.0
-offset_left = 20.0
-offset_top = 109.0
-offset_right = -20.0
-offset_bottom = 809.89
-grow_horizontal = 2
-theme_override_constants/v_separation = 26
+[ext_resource type="StyleBox" uid="uid://ccjbiokdyflra" path="res://Resources/UIBackground.tres" id="1_banke"]
+[ext_resource type="Theme" uid="uid://keary5vfopmg" path="res://Resources/RichTextLabelTheme.tres" id="3_8c3v8"]
+[ext_resource type="LabelSettings" uid="uid://b4hkbiiau0wu3" path="res://Resources/LobbyLabelSettings.tres" id="3_wrh45"]
+
+[node name="LobbyOverlay" type="PanelContainer"]
+offset_right = 406.0
+offset_bottom = 184.0
+theme_override_styles/panel = ExtResource("1_banke")
 script = ExtResource("1_15rvs")
 
-[node name="JoinInstructions" type="Label" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
-text = "Type \"join\" to play!"
-label_settings = SubResource("LabelSettings_n02u3")
 
-[node name="JumpInstructions" type="Label" parent="."]
+[node name="Instructions" type="RichTextLabel" parent="VBoxContainer"]
+texture_filter = 2
 layout_mode = 2
-text = "Jumping:
-    - j ANGLE: jump at a specific angle (-90 is left, 90 is right)
-    - j 15: jump slightly right
-    - L 15: jump slightly left 
-    - u: jump straight up"
-label_settings = SubResource("LabelSettings_aso2h")
-
-[node name="LobbyTimer" type="Label" parent="."]
+theme = ExtResource("3_8c3v8")
+bbcode_enabled = true
+text = "Type [color=cyan]join[/color] to play!
+Jump with [color=cyan]j[/color] [[color=yellow]-90[/color] to [color=yellow]90[/color]]
+  ([color=gray]see example jumpers below[/color])
+
+Type [color=cyan]!jr[/color] for more instructions
+ "
+fit_content = true
+
+[node name="LobbyTimer" type="Label" parent="VBoxContainer"]
+unique_name_in_owner = true
+texture_filter = 2
 layout_mode = 2
 text = "Game will start soon!"
-label_settings = SubResource("LabelSettings_k2448")
+label_settings = ExtResource("3_wrh45")
 
-[node name="NumPlayers" type="Label" parent="."]
+[node name="NumPlayers" type="Label" parent="VBoxContainer"]
+unique_name_in_owner = true
+texture_filter = 2
 layout_mode = 2
 text = "Players: 0"
-label_settings = SubResource("LabelSettings_wud63")
+label_settings = ExtResource("3_wrh45")