Merge pull request #838 from C7-Game/WildWeazel-patch-2

new title & icon graphics

Author: WildWeazel

C7/UIElements/MainMenu/MainMenu.cs

@@ -50,14 +50,19 @@ private void DisplayTitleScreen() {
 		if (ButtonContainer.NewGame == null) {
 			ButtonContainer.CreateButtons();
 		}
+		// TODO: enable buttons are features are implemented
 		ButtonContainer.NewGame.Pressed += GoToWorldSetup;
-		ButtonContainer.QuickStart.Pressed += GoToWorldSetup;
+		ButtonContainer.QuickStart.Pressed += StartGame;
 		ButtonContainer.Tutorial.Pressed += StartGame;
+		ButtonContainer.Tutorial.Visible = false;
 		ButtonContainer.LoadGame.Pressed += LoadGame;
 		ButtonContainer.LoadScenario.Pressed += LoadScenario;
 		ButtonContainer.HallOfFame.Pressed += HallOfFame;
+		ButtonContainer.HallOfFame.Visible = false;
 		ButtonContainer.Preferences.Pressed += Preferences;
+		ButtonContainer.Preferences.Visible = false;
 		ButtonContainer.AudioPreferences.Pressed += Preferences;
+		ButtonContainer.AudioPreferences.Visible = false;
 		ButtonContainer.Credits.Pressed += showCredits;
 		ButtonContainer.Exit.Pressed += _on_Exit_pressed;
 

C7/UIElements/MainMenu/main_menu.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=10 format=3 uid="uid://gnt0y3og7nk6"]
+[gd_scene load_steps=11 format=3 uid="uid://gnt0y3og7nk6"]
 
 [ext_resource type="Script" uid="uid://dgpuse88jc2hc" path="res://UIElements/MainMenu/MainMenu.cs" id="1_akneh"]
 [ext_resource type="Texture2D" uid="uid://s55xvcaini8h" path="res://title-screen.png" id="2_erxyj"]
 [ext_resource type="Script" uid="uid://ca14gkdccjfcg" path="res://UIElements/MainMenu/MenuButtonContainer.cs" id="3_t1nuq"]
 [ext_resource type="FontFile" uid="uid://b1xkj8g82jbx5" path="res://Fonts/NotoSans-BoldItalic.ttf" id="3_x68dx"]
+[ext_resource type="Texture2D" uid="uid://ovwv08a53d7k" path="res://title.png" id="4_brea7"]
 [ext_resource type="Script" uid="uid://dauceqein40wj" path="res://UIElements/MainMenu/MainMenuMusicPlayer.cs" id="4_tqr50"]
 [ext_resource type="PackedScene" uid="uid://bvncm1bgcii5e" path="res://UIElements/civ3_file_dialog.tscn" id="5_rw2g7"]
 
@@ -49,37 +50,43 @@ stretch_mode = 4
 
 [node name="RichTextLabel" type="RichTextLabel" parent="Control/Background"]
 layout_mode = 0
-offset_left = 20.0
-offset_top = 5.0
-offset_right = 660.0
-offset_bottom = 65.0
+offset_left = 226.0
+offset_top = 98.0
+offset_right = 828.0
+offset_bottom = 158.0
 theme_override_colors/default_color = Color(1, 0.25098, 0, 1)
 theme_override_fonts/normal_font = ExtResource("3_x68dx")
-theme_override_font_sizes/normal_font_size = 36
-text = "OpenCiv3 v0.3 Dutch Preview 1"
+theme_override_font_sizes/normal_font_size = 18
+text = "v0.3 Dutch Preview 1"
 deselect_on_focus_loss_enabled = false
 drag_and_drop_selection_enabled = false
 
+[node name="Title" type="Sprite2D" parent="Control/Background"]
+position = Vector2(249.669, 72)
+scale = Vector2(0.757862, 0.757862)
+texture = ExtResource("4_brea7")
+
 [node name="MainMenuContainer" type="VBoxContainer" parent="Control"]
 layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.3
 anchor_top = 0.1
 anchor_right = 0.5
 anchor_bottom = 0.2
-offset_left = -79.0
-offset_right = 79.0
-offset_bottom = 370.0
+offset_left = -85.6
+offset_top = 135.2
+offset_right = 72.4
+offset_bottom = 505.2
 grow_horizontal = 2
 theme_override_constants/separation = 15
 script = ExtResource("3_t1nuq")
 
 [node name="NoCiv3Options" type="VBoxContainer" parent="Control"]
 layout_mode = 0
 offset_left = 260.0
-offset_top = 100.0
+offset_top = 200.0
 offset_right = 580.0
-offset_bottom = 400.0
+offset_bottom = 500.0
 theme_override_constants/separation = 15
 
 [node name="NoCiv3Prompt" type="Label" parent="Control/NoCiv3Options"]

C7/UIElements/Popups/GameMenu.cs

@@ -16,13 +16,14 @@ public override void _Ready() {
 
 		AddHeader("Main Menu", 10);
 
+		// TODO: enable buttons as the features are implemented
 		AddButton("Map", 60, map);
-		AddButton("Load Game (Ctrl-L)", 85, load);
-		AddButton("New Game (Ctrl-Shift-Q)", 110, newGame);
-		AddButton("Preferences (Ctrl-P)", 135, preferences);
-		AddButton("Retire (Ctrl-Q)", 160, retire);
-		AddButton("Save Game (Ctrl-S)", 185, save);
-		AddButton("Quit Game (ESC)", 210, quit);
+		AddButton("Load Game", 85, load);
+		//AddButton("New Game (Ctrl-Shift-Q)", 110, newGame);
+		//AddButton("Preferences (Ctrl-P)", 135, preferences);
+		AddButton("Retire", 110, retire);
+		AddButton("Save Game", 135, save);
+		AddButton("Quit Game (ESC)", 160, quit);
 
 	}
 

C7/icon.png

@@ -13,7 +13,8 @@ config_version=5
 config/name="OpenCiv3"
 run/main_scene="res://UIElements/MainMenu/main_menu.tscn"
 config/features=PackedStringArray("4.4", "C#")
-boot_splash/image="res://icon.png"
+boot_splash/fullsize=false
+boot_splash/image="uid://ovwv08a53d7k"
 config/icon="res://icon.png"
 
 [autoload]

C7/project.godot

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ovwv08a53d7k"
+path="res://.godot/imported/title.png-50ae1153955eed1e1a910d67a0682202.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://title.png"
+dest_files=["res://.godot/imported/title.png-50ae1153955eed1e1a910d67a0682202.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

C7/title.png

@@ -10,7 +10,7 @@
 
 > [!NOTE]
 > OpenCiv3 is not affiliated with civfanatics.com,
-> Firaxis Games, Infogrames Interactive,
+> Firaxis Games, BreakAway Games, Hasbro Interactive, Infogrames Interactive,
 > Atari Interactive, or Take-Two Interactive Software.
 > All trademarks are property of their respective owners.