diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index 64dd06e..74d17fe 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -1,11 +1,7 @@ -[gd_scene load_steps=21 format=3 uid="uid://1ikkb4b8mw1w"] +[gd_scene load_steps=17 format=3 uid="uid://1ikkb4b8mw1w"] [ext_resource type="Script" uid="uid://b5nh5td5bdsfd" path="res://Scripts/MainMenu.gd" id="1_ocgay"] [ext_resource type="Texture2D" uid="uid://dbh0vh85wks2l" path="res://UI/logo.png" id="2_6d82g"] -[ext_resource type="Texture2D" uid="uid://6mf6wucl3y6k" path="res://UI/MenuBG/BalconyBG.png" id="2_j6v32"] -[ext_resource type="Texture2D" uid="uid://dr6ir8mgbjrs7" path="res://UI/MenuBG/CStageBG.png" id="3_vaoig"] -[ext_resource type="Texture2D" uid="uid://dyyyg85g3jwip" path="res://UI/MenuBG/ProtoRoadBG.png" id="4_dkd36"] -[ext_resource type="Texture2D" uid="uid://cdp1csnrbd46w" path="res://UI/MenuBG/1StageBG.png" id="6_ha2rd"] [ext_resource type="Script" uid="uid://c8dhm0nhxqlth" path="res://Scripts/GraphicsOptions.gd" id="8_wdeli"] [ext_resource type="Script" uid="uid://bmqi57p5yipll" path="res://Scripts/InterfaceOptions.gd" id="9_wyv1s"] @@ -48,59 +44,16 @@ auto_translate_mode = 1 initial_position = 2 dialog_text = "Please restart the game for any changes to apply." -[node name="Backgrounds" type="Control" parent="."] +[node name="BackgroundImage" type="TextureRect" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 - -[node name="BalconyBG" type="TextureRect" parent="Backgrounds"] -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("2_j6v32") expand_mode = 1 -[node name="CStageBG" type="TextureRect" parent="Backgrounds"] -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("3_vaoig") -expand_mode = 1 - -[node name="ProtoRoadBG" type="TextureRect" parent="Backgrounds"] -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("4_dkd36") -expand_mode = 1 - -[node name="1StageBG" type="TextureRect" parent="Backgrounds"] -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("6_ha2rd") -expand_mode = 1 - -[node name="TextureRect" type="TextureRect" parent="."] +[node name="Logo" type="TextureRect" parent="."] layout_mode = 0 offset_left = 64.0 offset_top = 64.0 diff --git a/Scripts/Configs/FreeRoamMaps.gd b/Scripts/Configs/FreeRoamMaps.gd index 19aefa2..76a6dc4 100644 --- a/Scripts/Configs/FreeRoamMaps.gd +++ b/Scripts/Configs/FreeRoamMaps.gd @@ -3,6 +3,7 @@ extends Node var Generic1Stage = { "name": "Generic 1-Stage", "scene": "res://Scenes/FreeRoam/Generic/Generic1Stage.tscn", + "description": "A generic showroom featuring the 1-Stage", "stage": Stages.Cyber1Stage, "curtains": { "Curtain": [ "1-Stage" ] @@ -12,6 +13,7 @@ var Generic1Stage = { var Generic12Stage = { "name": "Generic 1-Stage w 2-Stage Props", "scene": "res://Scenes/FreeRoam/Generic/Generic12Stage.tscn", + "description": "A generic showroom featuring the 1-Stage with 2-Stage props", "stage": Stages.Cyber12Stage, "curtains": { "Curtain": [ "1-Stage" ] @@ -21,6 +23,7 @@ var Generic12Stage = { var Generic2Stage = { "name": "Generic 2-Stage", "scene": "res://Scenes/FreeRoam/Generic/Generic2Stage.tscn", + "description": "A generic showroom featuring the 2-Stage", "stage": Stages.Cyber2Stage, "curtains": { "Curtains": [ "CEC", "Main" ] @@ -30,6 +33,7 @@ var Generic2Stage = { var GenericMiniUnit1Stage = { "name": "Generic Mini Unit 1-Stage", "scene": "res://Scenes/FreeRoam/Generic/GenericMiniUnit1Stage.tscn", + "description": "A generic showroom featuring the Mini Unit 1-Stage", "stage": Stages.MiniUnit1Stage, "curtains": [ ] } diff --git a/Scripts/GlobalVariables.gd b/Scripts/Configs/GlobalVariables.gd similarity index 84% rename from Scripts/GlobalVariables.gd rename to Scripts/Configs/GlobalVariables.gd index f932f2b..eb58016 100644 --- a/Scripts/GlobalVariables.gd +++ b/Scripts/Configs/GlobalVariables.gd @@ -15,6 +15,17 @@ var theme_index = [ "res://UI/Themes/HotDogStand.tres" ] +var background_index = [ + "res://UI/MenuBG/1StageBG.png", + "res://UI/MenuBG/BalconyBG.png", + "res://UI/MenuBG/CStageBG.png", + "res://UI/MenuBG/ProtoRoadBG.png", + "res://UI/MenuBG/2StageBG.png", + "res://UI/MenuBG/12StageBG.png", + "res://UI/MenuBG/Mini1StageBG.png", + "res://UI/MenuBG/Cyber3StageBG.png", +] + func _ready() -> void: msaa = get_viewport().msaa_3d ssaa = get_viewport().screen_space_aa diff --git a/Scripts/GlobalVariables.gd.uid b/Scripts/Configs/GlobalVariables.gd.uid similarity index 100% rename from Scripts/GlobalVariables.gd.uid rename to Scripts/Configs/GlobalVariables.gd.uid diff --git a/Scripts/MainMenu.gd b/Scripts/MainMenu.gd index 70176f1..c67b1b5 100644 --- a/Scripts/MainMenu.gd +++ b/Scripts/MainMenu.gd @@ -4,7 +4,8 @@ func _ready(): OS.request_permissions() randomize() $VersionLabel.text = "Pneumatic Plaything v%s" % ProjectSettings.get_setting("application/config/version") - $Backgrounds.get_child(randi() % $Backgrounds.get_child_count()).visible = true + var selectedBG = GlobalVariables.background_index[randi() % GlobalVariables.background_index.size()] + $BackgroundImage.set_texture(load(selectedBG)) $Buttons/EditorButton.grab_focus() GlobalVariables.loadConfig() diff --git a/UI/MenuBG/12StageBG.png b/UI/MenuBG/12StageBG.png new file mode 100644 index 0000000..231fabb Binary files /dev/null and b/UI/MenuBG/12StageBG.png differ diff --git a/UI/MenuBG/12StageBG.png.import b/UI/MenuBG/12StageBG.png.import new file mode 100644 index 0000000..c21de3b --- /dev/null +++ b/UI/MenuBG/12StageBG.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbh6ix3868a7v" +path="res://.godot/imported/12StageBG.png-b51ee8e37fe54bba68347f9fa2fa6ca5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MenuBG/12StageBG.png" +dest_files=["res://.godot/imported/12StageBG.png-b51ee8e37fe54bba68347f9fa2fa6ca5.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/UI/MenuBG/1StageBG.png b/UI/MenuBG/1StageBG.png index 6713204..f93a669 100644 Binary files a/UI/MenuBG/1StageBG.png and b/UI/MenuBG/1StageBG.png differ diff --git a/UI/MenuBG/2StageBG.png b/UI/MenuBG/2StageBG.png new file mode 100644 index 0000000..7d366f0 Binary files /dev/null and b/UI/MenuBG/2StageBG.png differ diff --git a/UI/MenuBG/2StageBG.png.import b/UI/MenuBG/2StageBG.png.import new file mode 100644 index 0000000..6c564e1 --- /dev/null +++ b/UI/MenuBG/2StageBG.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnm6hpjv0bd3d" +path="res://.godot/imported/2StageBG.png-a495b53b2f4b7368ffa6c2155e150dbe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MenuBG/2StageBG.png" +dest_files=["res://.godot/imported/2StageBG.png-a495b53b2f4b7368ffa6c2155e150dbe.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/UI/MenuBG/BalconyBG.png b/UI/MenuBG/BalconyBG.png index dbb9476..9409a97 100644 Binary files a/UI/MenuBG/BalconyBG.png and b/UI/MenuBG/BalconyBG.png differ diff --git a/UI/MenuBG/CStageBG.png b/UI/MenuBG/CStageBG.png index efb9912..ac1d820 100644 Binary files a/UI/MenuBG/CStageBG.png and b/UI/MenuBG/CStageBG.png differ diff --git a/UI/MenuBG/Cyber3StageBG.png b/UI/MenuBG/Cyber3StageBG.png new file mode 100644 index 0000000..4769c0e Binary files /dev/null and b/UI/MenuBG/Cyber3StageBG.png differ diff --git a/UI/MenuBG/Cyber3StageBG.png.import b/UI/MenuBG/Cyber3StageBG.png.import new file mode 100644 index 0000000..0367dd6 --- /dev/null +++ b/UI/MenuBG/Cyber3StageBG.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://n1ypuxihcier" +path="res://.godot/imported/Cyber3StageBG.png-5bd6026592f95e9141a02c5f74de1240.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MenuBG/Cyber3StageBG.png" +dest_files=["res://.godot/imported/Cyber3StageBG.png-5bd6026592f95e9141a02c5f74de1240.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/UI/MenuBG/Mini1StageBG.png b/UI/MenuBG/Mini1StageBG.png new file mode 100644 index 0000000..b39dc24 Binary files /dev/null and b/UI/MenuBG/Mini1StageBG.png differ diff --git a/UI/MenuBG/Mini1StageBG.png.import b/UI/MenuBG/Mini1StageBG.png.import new file mode 100644 index 0000000..eb46952 --- /dev/null +++ b/UI/MenuBG/Mini1StageBG.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c25ayrt5kd6gb" +path="res://.godot/imported/Mini1StageBG.png-c9d1463641b68657cfed808e21dbf2db.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MenuBG/Mini1StageBG.png" +dest_files=["res://.godot/imported/Mini1StageBG.png-c9d1463641b68657cfed808e21dbf2db.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/UI/MenuBG/ProtoRoadBG.png b/UI/MenuBG/ProtoRoadBG.png index 73bd688..850ffaa 100644 Binary files a/UI/MenuBG/ProtoRoadBG.png and b/UI/MenuBG/ProtoRoadBG.png differ diff --git a/project.godot b/project.godot index 8f0adea..574a06e 100644 --- a/project.godot +++ b/project.godot @@ -25,7 +25,7 @@ config/windows_native_icon="res://UI/icon.ico" Cosmetics="*res://Scripts/Configs/Cosmetics.gd" Stages="*res://Scripts/Configs/Stages.gd" FreeRoamMaps="*res://Scripts/Configs/FreeRoamMaps.gd" -GlobalVariables="*res://Scripts/GlobalVariables.gd" +GlobalVariables="*res://Scripts/Configs/GlobalVariables.gd" [display]