diff --git a/cmi2/saveFile.cfg b/cmi2/saveFile.cfg index dc36f0e6b8cac63fe2ebeaeaac652203a710460d..b40348adbb57bce9bfde73e5b04de5bfe941c6f2 100644 --- a/cmi2/saveFile.cfg +++ b/cmi2/saveFile.cfg @@ -1,6 +1,6 @@ [audio] -son=78.0 +son=19.0 musique=42.0 [controles] diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn index bac60cff8e50b800854ff6a0d5474e8c88e8383c..a0410354ca93b52e443426b2a1d1e35d6283f9a6 100644 --- a/cmi2/scenes/Settings.tscn +++ b/cmi2/scenes/Settings.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://scenes/settings.gd" type="Script" id=1] [ext_resource path="res://themes/mainTitleTheme.tres" type="Theme" id=2] [ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3] [ext_resource path="res://themes/settings_sliders.tres" type="Theme" id=4] [ext_resource path="res://assets/anim/sceneFadeIn.tres" type="Animation" id=5] +[ext_resource path="res://themes/buttonAsideTheme.tres" type="Theme" id=6] +[ext_resource path="res://assets/fonts/montserrat/Montserrat-SemiBold.otf" type="DynamicFontData" id=7] [sub_resource type="StreamTexture" id=1] flags = 4 @@ -19,8 +21,8 @@ flags = 4 load_path = "res://.import/backbuttonhover.png-4209a77808e79ad7977c995e604658a6.stex" [sub_resource type="DynamicFont" id=4] -size = 30 -font_data = ExtResource( 3 ) +size = 25 +font_data = ExtResource( 7 ) [sub_resource type="DynamicFont" id=5] size = 22 @@ -34,6 +36,20 @@ load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex" flags = 4 load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex" +[sub_resource type="Gradient" id=8] +colors = PoolColorArray( 0.519372, 0.035553, 0.568848, 1, 0.994629, 0.345789, 0.786797, 1 ) + +[sub_resource type="GradientTexture" id=9] +gradient = SubResource( 8 ) + +[sub_resource type="StyleBoxTexture" id=10] +texture = SubResource( 9 ) +region_rect = Rect2( 0, 0, 2048, 1 ) +margin_left = 10.0 +margin_right = 10.0 +margin_top = 5.0 +margin_bottom = 5.0 + [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -106,7 +122,7 @@ margin_bottom = 491.0 size_flags_vertical = 3 [node name="AsideMenu" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"] -margin_right = 181.0 +margin_right = 221.0 margin_bottom = 491.0 size_flags_vertical = 3 custom_constants/margin_right = 20 @@ -117,50 +133,54 @@ custom_constants/margin_bottom = 20 [node name="VBoxContainer" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu"] margin_left = 20.0 margin_top = 20.0 -margin_right = 161.0 +margin_right = 201.0 margin_bottom = 471.0 size_flags_vertical = 3 [node name="listButton" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"] -margin_right = 141.0 -margin_bottom = 405.0 +margin_right = 181.0 +margin_bottom = 395.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Audio" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"] -margin_right = 141.0 -margin_bottom = 42.0 +margin_right = 181.0 +margin_bottom = 52.0 +theme = ExtResource( 6 ) custom_fonts/font = SubResource( 4 ) -text = "Audio" +text = "AUDIO" [node name="Jeu" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"] -margin_top = 46.0 -margin_right = 141.0 -margin_bottom = 88.0 +margin_top = 56.0 +margin_right = 181.0 +margin_bottom = 108.0 +theme = ExtResource( 6 ) custom_fonts/font = SubResource( 4 ) -text = "Jeu" +text = "JEU" [node name="Controle" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"] -margin_top = 92.0 -margin_right = 141.0 -margin_bottom = 134.0 +margin_top = 112.0 +margin_right = 181.0 +margin_bottom = 164.0 +theme = ExtResource( 6 ) custom_fonts/font = SubResource( 4 ) -text = "Contrôles" +text = "CONTRÔLES" [node name="resetButton" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"] -margin_top = 409.0 -margin_right = 141.0 +margin_top = 399.0 +margin_right = 181.0 margin_bottom = 451.0 [node name="button" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/resetButton"] -margin_right = 141.0 -margin_bottom = 42.0 +margin_right = 181.0 +margin_bottom = 52.0 size_flags_horizontal = 3 +theme = ExtResource( 6 ) custom_fonts/font = SubResource( 4 ) -text = "Reset" +text = "RESET" [node name="AsideDetails" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"] -margin_left = 185.0 +margin_left = 225.0 margin_right = 984.0 margin_bottom = 491.0 size_flags_horizontal = 3 @@ -172,24 +192,24 @@ custom_constants/margin_bottom = 20 [node name="content" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails"] margin_left = 20.0 margin_top = 20.0 -margin_right = 779.0 +margin_right = 739.0 margin_bottom = 471.0 [node name="scrollContainer" type="ScrollContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"] -margin_right = 759.0 -margin_bottom = 405.0 +margin_right = 719.0 +margin_bottom = 395.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer"] -margin_right = 759.0 -margin_bottom = 405.0 +margin_right = 719.0 +margin_bottom = 395.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="listMenu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer"] -margin_right = 759.0 -margin_bottom = 405.0 +margin_right = 719.0 +margin_bottom = 395.0 size_flags_horizontal = 3 [node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"] @@ -410,63 +430,59 @@ custom_fonts/font = SubResource( 5 ) text = "B" [node name="jeu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"] -margin_right = 759.0 -margin_bottom = 405.0 +margin_right = 719.0 +margin_bottom = 395.0 size_flags_vertical = 3 custom_constants/separation = 10 [node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"] -margin_right = 759.0 -margin_bottom = 27.0 +margin_right = 719.0 +margin_bottom = 37.0 +custom_styles/normal = SubResource( 10 ) custom_fonts/font = SubResource( 5 ) text = "Réglages du jeu" +uppercase = true [node name="anim" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"] -margin_top = 37.0 -margin_right = 759.0 -margin_bottom = 64.0 +margin_top = 47.0 +margin_right = 719.0 +margin_bottom = 74.0 custom_fonts/font = SubResource( 5 ) text = "Désactiver les animations" [node name="animToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"] -margin_top = 74.0 +margin_top = 84.0 margin_right = 76.0 -margin_bottom = 114.0 +margin_bottom = 124.0 size_flags_horizontal = 2 custom_constants/check_vadjust = 0 [node name="pleinecran" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"] -margin_top = 124.0 -margin_right = 759.0 -margin_bottom = 151.0 +margin_top = 134.0 +margin_right = 719.0 +margin_bottom = 161.0 custom_fonts/font = SubResource( 5 ) text = "Mode plein écran" [node name="ecranToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"] -margin_top = 161.0 +margin_top = 171.0 margin_right = 76.0 -margin_bottom = 201.0 +margin_bottom = 211.0 size_flags_horizontal = 2 [node name="BottomButtons" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"] -margin_top = 409.0 -margin_right = 759.0 +margin_top = 399.0 +margin_right = 719.0 margin_bottom = 451.0 alignment = 2 [node name="apply" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons"] -margin_left = 523.0 -margin_right = 667.0 -margin_bottom = 42.0 -custom_fonts/font = SubResource( 4 ) -text = "Appliquer" - -[node name="exit" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons"] -margin_left = 671.0 -margin_right = 759.0 -margin_bottom = 42.0 +margin_left = 545.0 +margin_right = 719.0 +margin_bottom = 52.0 +theme = ExtResource( 6 ) custom_fonts/font = SubResource( 4 ) -text = "Sortir" +text = "APPLIQUER" [node name="AnimationPlayer" type="AnimationPlayer" parent="SettingsFullWindow"] autoplay = "fade in"