adjust uis to scholar font

This commit is contained in:
Haze Weathers 2023-05-12 12:53:26 -04:00
parent 15d82ec724
commit 6da085b6a6
5 changed files with 121 additions and 122 deletions

View file

@ -40,74 +40,69 @@ tile_data = PoolIntArray( 327685, 0, 0, 327686, 536870912, 1, 327687, 0, 1, 3276
margin_left = 72.0
margin_top = 48.0
margin_right = 184.0
margin_bottom = 68.0
margin_bottom = 58.0
theme = ExtResource( 1 )
text = "test text
"
text = "test text"
align = 1
[node name="HighScoreText" type="Label" parent="."]
margin_left = 56.0
margin_top = 62.0
margin_top = 61.0
margin_right = 200.0
margin_bottom = 94.0
margin_bottom = 71.0
theme = ExtResource( 1 )
text = "High SCORE:
"
text = "High SCORE:"
align = 1
[node name="HighScoreAny" type="Label" parent="."]
margin_left = 21.0
margin_top = 74.0
margin_top = 72.0
margin_right = 165.0
margin_bottom = 111.0
margin_bottom = 108.0
theme = ExtResource( 1 )
text = "any%
0000
0:00:00
"
0:00:00"
align = 1
[node name="HighScore100" type="Label" parent="."]
margin_left = 84.0
margin_top = 74.0
margin_top = 72.0
margin_right = 228.0
margin_bottom = 111.0
margin_bottom = 108.0
theme = ExtResource( 1 )
text = "100%
0000
0:00:00
"
0:00:00"
align = 1
[node name="ShardTitle" type="Label" parent="."]
margin_left = 43.0
margin_top = 130.0
margin_top = 134.0
margin_right = 213.0
margin_bottom = 173.0
margin_bottom = 144.0
theme = ExtResource( 1 )
text = "Collect all coins
"
text = "Collect all coins"
align = 1
[node name="EasyModeText" type="Label" parent="."]
margin_top = 3.0
margin_right = 256.0
margin_bottom = 14.0
margin_bottom = 13.0
theme = ExtResource( 1 )
text = "easy is off press c to change this"
align = 1
[node name="LivesModeText" type="Label" parent="."]
margin_left = 2.0
margin_top = 176.0
margin_top = 180.0
margin_right = 258.0
margin_bottom = 190.0
theme = ExtResource( 1 )
text = "lives are off press z to change this"
[node name="ShardGraphics" type="Node2D" parent="."]
position = Vector2( 0, 7 )
position = Vector2( 0, 10 )
[node name="Shard11" type="Sprite" parent="ShardGraphics"]
modulate = Color( 0, 0, 0, 1 )
@ -208,7 +203,7 @@ visible = false
position = Vector2( 111, 91 )
[node name="ShardArrow" type="Sprite" parent="."]
position = Vector2( 76, 113 )
position = Vector2( 76, 116 )
texture = ExtResource( 4 )
[node name="LevelArrowUp" type="Sprite" parent="."]

View file

@ -42,18 +42,17 @@ texture = ExtResource( 3 )
[node name="GoldCounter" type="Label" parent="."]
margin_left = 12.0
margin_top = -1.0
margin_right = 52.0
margin_bottom = 19.0
margin_top = 1.0
margin_right = 26.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "00
"
text = "00"
[node name="ShardCounter" type="Label" parent="."]
margin_left = 41.0
margin_top = -1.0
margin_right = 81.0
margin_bottom = 19.0
margin_top = 1.0
margin_right = 48.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "0"
@ -115,17 +114,17 @@ texture = ExtResource( 4 )
[node name="ScoreText" type="Label" parent="."]
margin_left = 137.0
margin_top = -1.0
margin_top = 1.0
margin_right = 221.0
margin_bottom = 19.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "SCORE:"
[node name="ScoreCounter" type="Label" parent="."]
margin_left = 179.0
margin_top = -1.0
margin_right = 263.0
margin_bottom = 19.0
margin_top = 1.0
margin_right = 214.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "00000"
@ -141,35 +140,35 @@ text = "High:000000"
[node name="LivesCounter" type="Label" parent="."]
modulate = Color( 0.478431, 1, 0.47451, 1 )
margin_left = 240.0
margin_top = -1.0
margin_right = 324.0
margin_bottom = 19.0
margin_top = 1.0
margin_right = 247.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "2"
[node name="ArrowCounter" type="Label" parent="."]
margin_left = 61.0
margin_top = -1.0
margin_right = 145.0
margin_bottom = 19.0
margin_top = 1.0
margin_right = 68.0
margin_bottom = 11.0
theme = ExtResource( 10 )
text = "0"
[node name="TimeCounter" type="Label" parent="."]
modulate = Color( 0.478431, 1, 0.47451, 1 )
margin_left = 1.0
margin_top = 179.0
margin_right = 56.0
margin_bottom = 199.0
margin_top = 181.0
margin_right = 50.0
margin_bottom = 191.0
theme = ExtResource( 10 )
text = "0:00:00"
[node name="Music" type="Label" parent="."]
material = ExtResource( 8 )
margin_left = 150.0
margin_top = 178.0
margin_top = 180.0
margin_right = 348.0
margin_bottom = 192.0
margin_bottom = 190.0
theme = ExtResource( 9 )
text = "@rumble"
align = 2

View file

@ -40,7 +40,7 @@ margin_bottom = 176.0
margin_left = 16.0
margin_top = 24.0
margin_right = 240.0
margin_bottom = 40.0
margin_bottom = 34.0
theme = ExtResource( 2 )
text = "-OPTIONS-"
align = 1
@ -55,28 +55,27 @@ theme = ExtResource( 2 )
[node name="Game" type="VBoxContainer" parent="Tabs"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 7.0
margin_top = 10.0
focus_neighbour_bottom = NodePath("Rumble")
custom_constants/separation = 0
[node name="Spacer" type="Control" parent="Tabs/Game"]
margin_right = 224.0
margin_bottom = 8.0
rect_min_size = Vector2( 0, 8 )
margin_bottom = 5.0
rect_min_size = Vector2( 0, 5 )
[node name="Rumble" type="HBoxContainer" parent="Tabs/Game"]
unique_name_in_owner = true
margin_top = 8.0
margin_top = 9.0
margin_right = 224.0
margin_bottom = 28.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 32.0
rect_min_size = Vector2( 0, 12 )
focus_neighbour_top = NodePath("../../..")
script = ExtResource( 4 )
group = SubResource( 1 )
[node name="Label" type="Label" parent="Tabs/Game/Rumble"]
margin_right = 53.0
margin_bottom = 20.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Rumble:
@ -85,7 +84,7 @@ text = "Rumble:
[node name="None" type="Button" parent="Tabs/Game/Rumble"]
margin_left = 69.0
margin_right = 97.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -98,7 +97,7 @@ text = "None"
[node name="Normal" type="Button" parent="Tabs/Game/Rumble"]
margin_left = 119.0
margin_right = 161.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -109,7 +108,7 @@ text = "Normal"
[node name="BPM" type="Button" parent="Tabs/Game/Rumble"]
margin_left = 187.0
margin_right = 208.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_right = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -125,8 +124,8 @@ visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 7.0
margin_bottom = -17.0
focus_neighbour_bottom = NodePath("Fullscreen")
custom_constants/separation = 0
[node name="Spacer" type="Control" parent="Tabs/Video"]
margin_right = 224.0
@ -135,10 +134,10 @@ rect_min_size = Vector2( 0, 8 )
[node name="Fullscreen" type="HBoxContainer" parent="Tabs/Video"]
unique_name_in_owner = true
margin_top = 8.0
margin_top = 12.0
margin_right = 224.0
margin_bottom = 28.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 24.0
rect_min_size = Vector2( 0, 12 )
focus_neighbour_top = NodePath("../../..")
focus_neighbour_bottom = NodePath("../WindowSize")
script = ExtResource( 4 )
@ -146,7 +145,7 @@ group = SubResource( 7 )
[node name="Label" type="Label" parent="Tabs/Video/Fullscreen"]
margin_right = 140.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Start in fullscreen:"
@ -154,7 +153,7 @@ text = "Start in fullscreen:"
[node name="Off" type="Button" parent="Tabs/Video/Fullscreen"]
margin_left = 152.0
margin_right = 173.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath(".")
focus_neighbour_right = NodePath("../On")
size_flags_horizontal = 6
@ -168,7 +167,7 @@ text = "Off"
[node name="On" type="Button" parent="Tabs/Video/Fullscreen"]
margin_left = 198.0
margin_right = 212.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath("../Off")
focus_neighbour_right = NodePath(".")
size_flags_horizontal = 6
@ -182,8 +181,8 @@ text = "on"
unique_name_in_owner = true
margin_top = 28.0
margin_right = 224.0
margin_bottom = 48.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 40.0
rect_min_size = Vector2( 0, 12 )
focus_neighbour_top = NodePath("../Fullscreen")
focus_neighbour_bottom = NodePath("../ScalingMode")
script = ExtResource( 4 )
@ -191,7 +190,7 @@ group = SubResource( 3 )
[node name="Label" type="Label" parent="Tabs/Video/WindowSize"]
margin_right = 84.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Window Size:"
@ -199,7 +198,7 @@ text = "Window Size:"
[node name="1x" type="Button" parent="Tabs/Video/WindowSize"]
margin_left = 93.0
margin_right = 107.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -212,7 +211,7 @@ text = "1x"
[node name="2x" type="Button" parent="Tabs/Video/WindowSize"]
margin_left = 121.0
margin_right = 135.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -223,7 +222,7 @@ text = "2x"
[node name="3x" type="Button" parent="Tabs/Video/WindowSize"]
margin_left = 149.0
margin_right = 163.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -234,7 +233,7 @@ text = "3x"
[node name="4x" type="Button" parent="Tabs/Video/WindowSize"]
margin_left = 177.0
margin_right = 191.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath("../3x")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -246,7 +245,7 @@ text = "4x"
[node name="5x" type="Button" parent="Tabs/Video/WindowSize"]
margin_left = 205.0
margin_right = 219.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_right = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -257,10 +256,10 @@ text = "5x"
[node name="ScalingMode" type="HBoxContainer" parent="Tabs/Video"]
unique_name_in_owner = true
margin_top = 48.0
margin_top = 44.0
margin_right = 224.0
margin_bottom = 68.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 56.0
rect_min_size = Vector2( 0, 12 )
focus_neighbour_top = NodePath("../WindowSize")
focus_neighbour_bottom = NodePath("../TransitionSpeed")
script = ExtResource( 4 )
@ -268,7 +267,7 @@ group = SubResource( 4 )
[node name="Label" type="Label" parent="Tabs/Video/ScalingMode"]
margin_right = 56.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Scaling:"
@ -276,7 +275,7 @@ text = "Scaling:"
[node name="Integer" type="Button" parent="Tabs/Video/ScalingMode"]
margin_left = 61.0
margin_right = 110.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -289,7 +288,7 @@ text = "integer"
[node name="Aspect" type="Button" parent="Tabs/Video/ScalingMode"]
margin_left = 121.0
margin_right = 163.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -300,7 +299,7 @@ text = "aspect"
[node name="Stretch" type="Button" parent="Tabs/Video/ScalingMode"]
margin_left = 173.0
margin_right = 222.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_right = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -312,17 +311,17 @@ align = 0
[node name="TransitionSpeed" type="HBoxContainer" parent="Tabs/Video"]
unique_name_in_owner = true
margin_top = 68.0
margin_top = 60.0
margin_right = 224.0
margin_bottom = 88.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 72.0
rect_min_size = Vector2( 0, 12 )
focus_neighbour_top = NodePath("../ScalingMode")
script = ExtResource( 4 )
group = SubResource( 5 )
[node name="Label" type="Label" parent="Tabs/Video/TransitionSpeed"]
margin_right = 77.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Fade speed:"
@ -330,7 +329,7 @@ text = "Fade speed:"
[node name="None" type="Button" parent="Tabs/Video/TransitionSpeed"]
margin_left = 81.0
margin_right = 109.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_left = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -342,7 +341,7 @@ text = "None"
[node name="Slow" type="Button" parent="Tabs/Video/TransitionSpeed"]
margin_left = 115.0
margin_right = 143.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -353,7 +352,7 @@ text = "slow"
[node name="Medium" type="Button" parent="Tabs/Video/TransitionSpeed"]
margin_left = 148.0
margin_right = 190.0
margin_bottom = 7.0
margin_bottom = 10.0
size_flags_horizontal = 6
size_flags_vertical = 0
toggle_mode = true
@ -365,7 +364,7 @@ text = "Medium"
[node name="Fast" type="Button" parent="Tabs/Video/TransitionSpeed"]
margin_left = 195.0
margin_right = 223.0
margin_bottom = 7.0
margin_bottom = 10.0
focus_neighbour_right = NodePath(".")
size_flags_horizontal = 6
size_flags_vertical = 0
@ -379,8 +378,8 @@ visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 7.0
margin_bottom = -37.0
focus_neighbour_bottom = NodePath("MasterVolume/MasterSlider")
custom_constants/separation = 0
[node name="Spacer" type="Control" parent="Tabs/Audio"]
margin_right = 224.0
@ -388,17 +387,18 @@ margin_bottom = 8.0
rect_min_size = Vector2( 0, 8 )
[node name="MasterVolume" type="HBoxContainer" parent="Tabs/Audio"]
margin_top = 8.0
margin_top = 12.0
margin_right = 224.0
margin_bottom = 28.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 24.0
rect_min_size = Vector2( 0, 12 )
[node name="Label" type="Label" parent="Tabs/Audio/MasterVolume"]
margin_right = 95.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "Master vol.:"
valign = 1
[node name="MasterSlider" type="HSlider" parent="Tabs/Audio/MasterVolume"]
unique_name_in_owner = true
@ -420,23 +420,25 @@ __meta__ = {
[node name="Volume" type="Label" parent="Tabs/Audio/MasterVolume"]
margin_left = 203.0
margin_right = 224.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 9
size_flags_vertical = 1
text = "100"
valign = 1
[node name="MusicVolume" type="HBoxContainer" parent="Tabs/Audio"]
margin_top = 28.0
margin_right = 224.0
margin_bottom = 48.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 40.0
rect_min_size = Vector2( 0, 12 )
[node name="Label" type="Label" parent="Tabs/Audio/MusicVolume"]
margin_right = 95.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "music vol.:"
valign = 1
[node name="MusicSlider" type="HSlider" parent="Tabs/Audio/MusicVolume"]
unique_name_in_owner = true
@ -458,23 +460,25 @@ __meta__ = {
[node name="Volume" type="Label" parent="Tabs/Audio/MusicVolume"]
margin_left = 203.0
margin_right = 224.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 9
size_flags_vertical = 1
text = "100"
valign = 1
[node name="SoundVolume" type="HBoxContainer" parent="Tabs/Audio"]
margin_top = 48.0
margin_top = 44.0
margin_right = 224.0
margin_bottom = 68.0
rect_min_size = Vector2( 0, 20 )
margin_bottom = 56.0
rect_min_size = Vector2( 0, 12 )
[node name="Label" type="Label" parent="Tabs/Audio/SoundVolume"]
margin_right = 95.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 3
size_flags_vertical = 1
text = "SOund vol.:"
valign = 1
[node name="SoundSlider" type="HSlider" parent="Tabs/Audio/SoundVolume"]
unique_name_in_owner = true
@ -495,10 +499,11 @@ __meta__ = {
[node name="Volume" type="Label" parent="Tabs/Audio/SoundVolume"]
margin_left = 203.0
margin_right = 224.0
margin_bottom = 20.0
margin_bottom = 12.0
size_flags_horizontal = 9
size_flags_vertical = 1
text = "100"
valign = 1
[node name="HBoxContainer" type="VBoxContainer" parent="."]
margin_left = 16.0
@ -509,7 +514,7 @@ theme = ExtResource( 2 )
[node name="Controls" type="Label" parent="HBoxContainer"]
margin_right = 224.0
margin_bottom = 7.0
margin_bottom = 10.0
text = "Z: back, X: apply, C: defaults"
[node name="ConfirmDialog" type="PanelContainer" parent="."]

View file

@ -17,7 +17,7 @@ script = ExtResource( 4 )
margin_left = 64.0
margin_top = 25.0
margin_right = 192.0
margin_bottom = 79.0
margin_bottom = 82.0
texture = ExtResource( 8 )
patch_margin_left = 3
patch_margin_top = 3
@ -29,16 +29,16 @@ pause_mode = 2
margin_left = 67.0
margin_top = 28.0
margin_right = 189.0
margin_bottom = 76.0
margin_bottom = 79.0
color = Color( 0.239216, 0.239216, 0.443137, 1 )
[node name="Paused" type="Label" parent="."]
pause_mode = 2
material = ExtResource( 6 )
margin_left = 64.0
margin_top = 12.0
margin_top = 14.0
margin_right = 192.0
margin_bottom = 26.0
margin_bottom = 24.0
theme = ExtResource( 5 )
text = "PAUSED!"
align = 1
@ -46,9 +46,9 @@ align = 1
[node name="Body" type="Label" parent="."]
pause_mode = 2
margin_left = 64.0
margin_top = 30.0
margin_top = 29.0
margin_right = 192.0
margin_bottom = 76.0
margin_bottom = 78.0
theme = ExtResource( 2 )
text = "RESUME
RESTART
@ -59,18 +59,18 @@ align = 1
[node name="Resume" type="TextureButton" parent="Body"]
pause_mode = 2
margin_left = 36.0
margin_top = 3.0
margin_top = 1.0
margin_right = 44.0
margin_bottom = 11.0
margin_bottom = 9.0
focus_neighbour_bottom = NodePath("../Restart")
texture_focused = ExtResource( 3 )
[node name="Restart" type="TextureButton" parent="Body"]
pause_mode = 2
margin_left = 32.0
margin_top = 13.0
margin_top = 14.0
margin_right = 40.0
margin_bottom = 21.0
margin_bottom = 22.0
focus_neighbour_top = NodePath("../Resume")
focus_neighbour_bottom = NodePath("../Settings")
texture_focused = ExtResource( 3 )
@ -78,9 +78,9 @@ texture_focused = ExtResource( 3 )
[node name="Settings" type="TextureButton" parent="Body"]
pause_mode = 2
margin_left = 29.0
margin_top = 23.0
margin_top = 27.0
margin_right = 37.0
margin_bottom = 31.0
margin_bottom = 35.0
focus_neighbour_top = NodePath("../Restart")
focus_neighbour_bottom = NodePath("../ExitLevel")
texture_focused = ExtResource( 3 )
@ -88,9 +88,9 @@ texture_focused = ExtResource( 3 )
[node name="ExitLevel" type="TextureButton" parent="Body"]
pause_mode = 2
margin_left = 22.0
margin_top = 33.0
margin_top = 40.0
margin_right = 30.0
margin_bottom = 41.0
margin_bottom = 48.0
focus_neighbour_top = NodePath("../Settings")
texture_focused = ExtResource( 3 )

View file

@ -1,6 +1,6 @@
[gd_resource type="Theme" load_steps=15 format=2]
[ext_resource path="res://ui/2ndpuberty_scholar_no_dropshadow.fnt" type="BitmapFont" id=1]
[ext_resource path="res://ui/2ndpuberty_scholar.fnt" type="BitmapFont" id=1]
[ext_resource path="res://graphics/hud/hslider_slider.png" type="Texture" id=2]
[ext_resource path="res://graphics/hud/hslider_grabber.png" type="Texture" id=3]
[ext_resource path="res://graphics/hud/hslider_grabber_focused.png" type="Texture" id=4]
@ -13,7 +13,7 @@ content_margin_bottom = 0.0
bg_color = Color( 0, 0, 0, 0 )
border_width_bottom = 1
border_color = Color( 1, 1, 1, 1 )
expand_margin_bottom = 6.0
expand_margin_bottom = 2.0
[sub_resource type="StyleBoxEmpty" id=8]