Vastly improve the main project theme (#183)

Author: valkyrienyanko

Framework/Fonts/Kirifont/KiriFont.otf

@@ -0,0 +1,11 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://fonts/kirifont/KiriFont.otf" type="DynamicFontData" id=1]
+
+[resource]
+
+size = 32
+extra_spacing_top = -5
+extra_spacing_bottom = -20
+font_data = ExtResource( 1 )
+

Framework/Fonts/Kirifont/KiriFont.ttf

@@ -0,0 +1,97 @@
+Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
+with Reserved Font Name <Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
+with Reserved Font Name <additional Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

Framework/Fonts/Kirifont/Kirifont.tres

@@ -1,50 +1,8 @@
-[gd_scene load_steps=14 format=3 uid="uid://d4a5xfmaulku1"]
+[gd_scene load_steps=3 format=3 uid="uid://d4a5xfmaulku1"]
 
 [ext_resource type="Script" uid="uid://ckf2hfrig7e7o" path="res://Framework/Scenes/MenuUI/MainMenu/MainMenu.cs" id="1_cqe0w"]
 [ext_resource type="Script" uid="uid://bi551lrt82awu" path="res://Framework/Scenes/MenuUI/MainMenu/MainMenuNav.cs" id="5_sc4as"]
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_xl3hr"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r34gr"]
-bg_color = Color(0, 0, 0, 0.470588)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_bkoao"]
-bg_color = Color(0, 0, 0, 0.219608)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y51uf"]
-content_margin_top = 10.0
-content_margin_bottom = 10.0
-bg_color = Color(0, 0, 0, 0.219608)
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dnx8c"]
-
-[sub_resource type="Theme" id="Theme_xn77g"]
-Button/styles/focus = SubResource("StyleBoxFlat_r34gr")
-Button/styles/hover = SubResource("StyleBoxFlat_bkoao")
-Button/styles/normal = SubResource("StyleBoxFlat_y51uf")
-Button/styles/pressed = SubResource("StyleBoxEmpty_dnx8c")
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_madu2"]
-bg_color = Color(0, 0, 0, 0.470588)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2rw86"]
-bg_color = Color(0, 0, 0, 0.219608)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ctxq7"]
-content_margin_left = 10.0
-content_margin_top = 10.0
-content_margin_right = 10.0
-content_margin_bottom = 10.0
-bg_color = Color(0, 0, 0, 0.219608)
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_vbaxj"]
-
-[sub_resource type="Theme" id="Theme_2jf5t"]
-Button/styles/focus = SubResource("StyleBoxFlat_madu2")
-Button/styles/hover = SubResource("StyleBoxFlat_2rw86")
-Button/styles/normal = SubResource("StyleBoxFlat_ctxq7")
-Button/styles/pressed = SubResource("StyleBoxEmpty_vbaxj")
-
 [node name="Main Menu" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -61,69 +19,68 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxEmpty_xl3hr")
-
-[node name="CenterContainer" type="CenterContainer" parent="PanelContainer"]
-layout_mode = 2
 
-[node name="Nav" type="VBoxContainer" parent="PanelContainer/CenterContainer"]
+[node name="Nav" type="VBoxContainer" parent="PanelContainer"]
 layout_mode = 2
-theme = SubResource("Theme_xn77g")
+size_flags_horizontal = 4
+size_flags_vertical = 4
+alignment = 1
 script = ExtResource("5_sc4as")
 
-[node name="Play" type="Button" parent="PanelContainer/CenterContainer/Nav"]
-custom_minimum_size = Vector2(150, 0)
+[node name="Play" type="Button" parent="PanelContainer/Nav"]
+custom_minimum_size = Vector2(175, 60)
 layout_mode = 2
 text = "PLAY"
 
-[node name="Mods" type="Button" parent="PanelContainer/CenterContainer/Nav"]
-custom_minimum_size = Vector2(150, 0)
+[node name="Mods" type="Button" parent="PanelContainer/Nav"]
+custom_minimum_size = Vector2(175, 60)
 layout_mode = 2
 text = "MODS"
 
-[node name="Options" type="Button" parent="PanelContainer/CenterContainer/Nav"]
-custom_minimum_size = Vector2(150, 0)
+[node name="Options" type="Button" parent="PanelContainer/Nav"]
+custom_minimum_size = Vector2(175, 60)
 layout_mode = 2
 text = "OPTIONS"
 
-[node name="Credits" type="Button" parent="PanelContainer/CenterContainer/Nav"]
+[node name="Credits" type="Button" parent="PanelContainer/Nav"]
+custom_minimum_size = Vector2(175, 60)
 layout_mode = 2
 text = "CREDITS"
 
-[node name="Quit" type="Button" parent="PanelContainer/CenterContainer/Nav"]
-custom_minimum_size = Vector2(150, 0)
+[node name="Quit" type="Button" parent="PanelContainer/Nav"]
+custom_minimum_size = Vector2(175, 60)
 layout_mode = 2
 text = "QUIT"
 
 [node name="Margin" type="MarginContainer" parent="PanelContainer"]
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 8
-theme_override_constants/margin_left = 10
-theme_override_constants/margin_top = 10
-theme_override_constants/margin_right = 10
+theme_override_constants/margin_left = 20
 theme_override_constants/margin_bottom = 10
 
 [node name="Socials" type="HBoxContainer" parent="PanelContainer/Margin"]
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 8
-theme = SubResource("Theme_2jf5t")
+theme_override_constants/separation = 15
 
 [node name="Discord" type="Button" parent="PanelContainer/Margin/Socials"]
+custom_minimum_size = Vector2(100, 40)
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
 text = "Discord"
 
 [node name="Github" type="Button" parent="PanelContainer/Margin/Socials"]
+custom_minimum_size = Vector2(100, 40)
 layout_mode = 2
 text = "GitHub"
 
-[connection signal="pressed" from="PanelContainer/CenterContainer/Nav/Play" to="PanelContainer/CenterContainer/Nav" method="_OnPlayPressed"]
-[connection signal="pressed" from="PanelContainer/CenterContainer/Nav/Mods" to="PanelContainer/CenterContainer/Nav" method="_OnModsPressed"]
-[connection signal="pressed" from="PanelContainer/CenterContainer/Nav/Options" to="PanelContainer/CenterContainer/Nav" method="_OnOptionsPressed"]
-[connection signal="pressed" from="PanelContainer/CenterContainer/Nav/Credits" to="PanelContainer/CenterContainer/Nav" method="_OnCreditsPressed"]
-[connection signal="pressed" from="PanelContainer/CenterContainer/Nav/Quit" to="PanelContainer/CenterContainer/Nav" method="_OnQuitPressed"]
-[connection signal="pressed" from="PanelContainer/Margin/Socials/Discord" to="PanelContainer/CenterContainer/Nav" method="_OnDiscordPressed"]
-[connection signal="pressed" from="PanelContainer/Margin/Socials/Github" to="PanelContainer/CenterContainer/Nav" method="_OnGitHubPressed"]
+[connection signal="pressed" from="PanelContainer/Nav/Play" to="PanelContainer/Nav" method="_OnPlayPressed"]
+[connection signal="pressed" from="PanelContainer/Nav/Mods" to="PanelContainer/Nav" method="_OnModsPressed"]
+[connection signal="pressed" from="PanelContainer/Nav/Options" to="PanelContainer/Nav" method="_OnOptionsPressed"]
+[connection signal="pressed" from="PanelContainer/Nav/Credits" to="PanelContainer/Nav" method="_OnCreditsPressed"]
+[connection signal="pressed" from="PanelContainer/Nav/Quit" to="PanelContainer/Nav" method="_OnQuitPressed"]
+[connection signal="pressed" from="PanelContainer/Margin/Socials/Discord" to="PanelContainer/Nav" method="_OnDiscordPressed"]
+[connection signal="pressed" from="PanelContainer/Margin/Socials/Github" to="PanelContainer/Nav" method="_OnGitHubPressed"]

Framework/Fonts/Kirifont/OFL.txt

@@ -12,59 +12,4 @@ private void Init()
     {
 
     }
-
-    public override void _Ready()
-    {
-        ThemeUtils.Adjust(this);
-    }
-}
-
-public class ThemeUtils
-{
-    private static readonly StringName Button = "Button";
-
-    public static void Adjust(Node root)
-    {
-        root.TraverseNodes(OnTraverseNode);
-    }
-
-    private static void OnTraverseNode(Node node)
-    {
-        if (node is not Control control)
-            return;
-
-        Theme theme = control.Theme;
-
-        if (theme == null)
-            return;
-
-        StyleBoxFlat normalStyleBox = GetNormalStyleBox(theme);
-
-        StyleBoxFlat hoverStyleBox = normalStyleBox.Duplicate() as StyleBoxFlat;
-        hoverStyleBox.BgColor = normalStyleBox.BgColor + GrayColor(10);
-
-        StyleBoxFlat pressedStyleBox = hoverStyleBox.Duplicate() as StyleBoxFlat;
-        pressedStyleBox.BgColor = hoverStyleBox.BgColor + GrayColor(10);
-
-        StyleBoxFlat focusStyleBox = normalStyleBox;
-
-        theme.SetStylebox("hover", Button, hoverStyleBox);
-        theme.SetStylebox("pressed", Button, pressedStyleBox);
-        theme.SetStylebox("focus", Button, focusStyleBox);
-    }
-
-    private static Color GrayColor(byte saturation)
-    {
-        return Color.Color8(saturation, saturation, saturation);
-    }
-
-    private static StyleBoxFlat GetNormalStyleBox(Theme theme)
-    {
-        if (theme.GetStylebox("normal", Button) is StyleBoxFlat styleBox)
-        {
-            return styleBox;
-        }
-
-        return null;
-    }
 }