Merge branch 'main' of github.com:OpenVic2Project/OpenVic2 into goods

4 files changed, 121 insertions, 5 deletions

diff --git a/game/theme/assets/OpenVicFINALREALTRANS.png b/game/theme/assets/OpenVicFINALREALTRANS.png
new file mode 100644
index 0000000..446814f
--- /dev/null
+++ b/game/theme/assets/OpenVicFINALREALTRANS.png
diff --git a/game/theme/assets/OpenVicFINALREALTRANS.png.import b/game/theme/assets/OpenVicFINALREALTRANS.png.import
new file mode 100644
index 0000000..6963753
--- /dev/null
+++ b/game/theme/assets/OpenVicFINALREALTRANS.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dxys0wg0f0ic5"
+path="res://.godot/imported/OpenVicFINALREALTRANS.png-be4facd2c0164660117ada12fd221f10.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://theme/assets/OpenVicFINALREALTRANS.png"
+dest_files=["res://.godot/imported/OpenVicFINALREALTRANS.png-be4facd2c0164660117ada12fd221f10.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
diff --git a/game/theme/game_session_menu.tres b/game/theme/game_session_menu.tres
new file mode 100644
index 0000000..42775c3
--- /dev/null
+++ b/game/theme/game_session_menu.tres
@@ -0,0 +1,84 @@
+[gd_resource type="Theme" load_steps=11 format=3 uid="uid://dndova5cw036e"]
+
+[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="1_7med2"]
+[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="2_oj3dv"]
+[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="3_j823n"]
+[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="4_lno5s"]
+
+[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jvvyi"]
+content_margin_left = 20.0
+content_margin_top = 10.0
+content_margin_right = 20.0
+content_margin_bottom = 14.0
+texture = ExtResource("4_lno5s")
+modulate_color = Color(0.817521, 0.817521, 0.817521, 0.784314)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6ab1x"]
+draw_center = false
+border_width_left = 10
+border_width_top = 15
+border_width_right = 10
+border_width_bottom = 15
+border_color = Color(0, 0, 0, 0.584314)
+border_blend = true
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+corner_detail = 20
+
+[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jslj0"]
+content_margin_left = 20.0
+content_margin_top = 10.0
+content_margin_right = 20.0
+content_margin_bottom = 14.0
+texture = ExtResource("4_lno5s")
+modulate_color = Color(0.588235, 0.588235, 0.588235, 1)
+
+[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l2rw3"]
+content_margin_left = 20.0
+content_margin_top = 10.0
+content_margin_right = 20.0
+content_margin_bottom = 14.0
+texture = ExtResource("4_lno5s")
+modulate_color = Color(0.85098, 0.85098, 0.85098, 1)
+
+[sub_resource type="StyleBox" id="StyleBox_ptkcj"]
+resource_local_to_scene = false
+resource_name = ""
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+script = ExtResource("2_oj3dv")
+style_box = SubResource("StyleBoxTexture_l2rw3")
+sound = ExtResource("3_j823n")
+
+[sub_resource type="StyleBoxLine" id="StyleBoxLine_kaw4i"]
+color = Color(0.454902, 0.45098, 0.435294, 1)
+thickness = 2
+
+[resource]
+SessionButton/base_type = &"Button"
+SessionButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1)
+SessionButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961)
+SessionButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1)
+SessionButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1)
+SessionButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1)
+SessionButton/colors/font_outline_color = Color(1, 1, 1, 1)
+SessionButton/colors/font_pressed_color = Color(1, 1, 1, 1)
+SessionButton/colors/icon_disabled_color = Color(1, 1, 1, 0.4)
+SessionButton/colors/icon_focus_color = Color(0.94902, 0.94902, 0.94902, 1)
+SessionButton/colors/icon_hover_color = Color(0.94902, 0.94902, 0.94902, 1)
+SessionButton/colors/icon_hover_pressed_color = Color(1, 1, 1, 1)
+SessionButton/colors/icon_normal_color = Color(1, 1, 1, 1)
+SessionButton/colors/icon_pressed_color = Color(1, 1, 1, 1)
+SessionButton/styles/disabled = SubResource("StyleBoxTexture_jvvyi")
+SessionButton/styles/focus = SubResource("StyleBoxFlat_6ab1x")
+SessionButton/styles/hover = SubResource("StyleBoxTexture_jslj0")
+SessionButton/styles/normal = ExtResource("1_7med2")
+SessionButton/styles/pressed = SubResource("StyleBox_ptkcj")
+SessionPanel/base_type = &"Panel"
+SessionPanel/styles/panel = null
+SessionSeparator/base_type = &"HSeparator"
+SessionSeparator/styles/separator = SubResource("StyleBoxLine_kaw4i")
diff --git a/game/theme/main_menu.tres b/game/theme/main_menu.tres
index 24c5552..0518cd8 100644
--- a/game/theme/main_menu.tres
+++ b/game/theme/main_menu.tres
@@ -171,9 +171,9 @@ CommitLabel/styles/normal = SubResource("StyleBoxEmpty_kmfi1")
 CommitLabel/styles/pressed = SubResource("StyleBoxEmpty_1qcrh")
 TitleButton/base_type = &"Button"
 TitleButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1)
-TitleButton/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5)
-TitleButton/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1)
-TitleButton/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1)
+TitleButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961)
+TitleButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1)
+TitleButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1)
 TitleButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1)
 TitleButton/colors/font_outline_color = Color(1, 1, 1, 1)
 TitleButton/colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -189,8 +189,6 @@ TitleButton/styles/focus = SubResource("StyleBoxFlat_2txce")
 TitleButton/styles/hover = SubResource("StyleBoxTexture_3efxh")
 TitleButton/styles/normal = ExtResource("6_dx0aj")
 TitleButton/styles/pressed = SubResource("StyleBox_uuspe")
-TitleLabel/base_type = &"Label"
-TitleLabel/font_sizes/font_size = 90
 VersionLabel/base_type = &"Button"
 VersionLabel/colors/font_hover_color = Color(0.360784, 0.360784, 0.360784, 1)
 VersionLabel/colors/font_hover_pressed_color = Color(0.215686, 0.215686, 0.215686, 1)