Merge pull request #897 from ajhalme/world-sizes-ui

Add dynamic world size selectors in New Game

Author: stavrosfa

C7/Lua/game_modes/base-ruleset.json

@@ -8890,5 +8890,58 @@
       "corruptionPercentage": 100,
       "militaryLaw": 1
     }
+  ],
+  "worldSizes" : [
+    {
+      "name": "Tiny",
+      "length": 80,
+      "height": 60,
+      "width": 60,
+      "optimalNumberOfCities": 14,
+      "techRate": 160,
+      "distanceBetweenCivs": 11,
+      "numberOfCivs": 4
+    },
+    {
+      "name": "Small",
+      "length": 80,
+      "height": 80,
+      "width": 80,
+      "optimalNumberOfCities": 17,
+      "techRate": 200,
+      "distanceBetweenCivs": 11,
+      "numberOfCivs": 6
+    },
+    {
+      "name": "Standard",
+      "length": 80,
+      "height": 100,
+      "width": 100,
+      "optimalNumberOfCities": 20,
+      "techRate": 240,
+      "distanceBetweenCivs": 12,      
+      "numberOfCivs": 8,
+      "isDefault" : true
+    },
+    {
+      "name": "Large",
+      "length": 80,
+      "height": 130,
+      "width": 130,
+      "optimalNumberOfCities": 28,
+      "techRate": 320,
+      "distanceBetweenCivs": 18,
+      "numberOfCivs": 12
+    },
+    {
+      "name": "Huge",
+      "length": 80,
+      "height": 160,
+      "width": 160,
+      "optimalNumberOfCities": 36,
+      "techRate": 400,
+      "distanceBetweenCivs": 24,
+      "numberOfCivs": 16
+    }
   ]
 }

C7/Textures/PlayerTextureUtil.cs.uid

@@ -0,0 +1 @@
+uid://dfc5qvfimbmfk

C7/UIElements/NewGame/PlayerSetup.cs

@@ -36,9 +36,6 @@ public partial class PlayerSetup : Control {
 	Civilization selectedCivilization;
 	Difficulty selectedDifficulty;
 
-	// TODO: read this from the rules based on the world size
-	const int NUM_OPPONENTS = 7;
-
 	// Called when the node enters the scene tree for the first time.
 	public override void _Ready() {
 		GlobalSingleton global = GetNode<GlobalSingleton>("/root/GlobalSingleton");
@@ -75,7 +72,7 @@ public override void _Ready() {
 		DisplaySelectedLeader();
 
 		// Set up the options for opponents.
-		AddOpponentSelectors();
+		AddOpponentSelectors(global.WorldCharacteristics.worldSize.numberOfCivs);
 
 		// Set up the difficulty buttons
 		difficultyContainer.Columns = save.Difficulties.Count;
@@ -106,9 +103,10 @@ private void BackToMainMenu() {
 		GetTree().ChangeSceneToFile("res://UIElements/MainMenu/main_menu.tscn");
 	}
 
-	private void AddOpponentSelectors() {
-		// TODO: The number of opponents should come from the rule set.
-		for (int i = 0; i < NUM_OPPONENTS; ++i) {
+	private void AddOpponentSelectors(int numberOfCivs) {
+		int numOpponents = numberOfCivs - 1;
+
+		for (int i = 0; i < numOpponents; ++i) {
 			OptionButton optionButton = new();
 			StyleBoxFlat styleBox = new() {
 				BorderColor = Color.Color8(150, 150, 150, 220),
@@ -136,7 +134,7 @@ private void AddOpponentSelectors() {
 			opponentListContainer.AddChild(container);
 			container.AddChild(optionButton);
 
-			container.CustomMinimumSize = new Vector2(312.0f / opponentListContainer.Columns, 315.0f / NUM_OPPONENTS);
+			container.CustomMinimumSize = new Vector2(312.0f / opponentListContainer.Columns, 315.0f / numOpponents);
 			optionButton.CustomMinimumSize = new Vector2(290.0f / opponentListContainer.Columns, optionButton.CustomMinimumSize.Y);
 
 			foreach (Civilization civ in save.Civilizations) {

C7/UIElements/NewGame/WorldSetup.cs

@@ -2,12 +2,13 @@
 using System;
 using C7Engine;
 using C7Engine.Lua;
+using C7GameData;
 using C7GameData.Save;
 using Serilog;
 
 [Tool]
 public partial class WorldSetup : Control {
-	private static ILogger log = LogManager.ForContext<WorldSetup>();
+	private ILogger log = LogManager.ForContext<WorldSetup>();
 
 	[Export] TextureRect background;
 
@@ -57,24 +58,25 @@ public partial class WorldSetup : Control {
 	[Export] TextureRect billion4Large;
 	[Export] TextureRect billion5Large;
 
-	[Export] CheckButton tinySize;
-	[Export] CheckButton smallSize;
-	[Export] CheckButton standardSize;
-	[Export] CheckButton largeSize;
-	[Export] CheckButton hugeSize;
-	[Export] CheckButton randomSize;
-
 	[Export] TextureButton confirm;
 	[Export] TextureButton cancel;
 
 	[Export] LineEdit seedInput;
 
+	[Export] VBoxContainer worldSizeButtonsContainer;
+
 	WorldCharacteristics.Landform landform = WorldCharacteristics.Landform.Pangaea;
 	WorldCharacteristics.OceanCoverage ocean = WorldCharacteristics.OceanCoverage.Percent_70;
 	WorldCharacteristics.Age age = WorldCharacteristics.Age.Billion_4;
 	WorldCharacteristics.Temperature temp = WorldCharacteristics.Temperature.Temperate;
 	WorldCharacteristics.Climate clim = WorldCharacteristics.Climate.Normal;
 
+	private WorldSize _worldSize = WorldSize.Generic();
+
+	private int GameSeed => int.Parse(seedInput.Text);
+
+	private SaveGame _saveGame;
+
 	// Called when the node enters the scene tree for the first time.
 	public override void _Ready() {
 		background.Texture = TextureLoader.Load("world_setup.background");
@@ -266,14 +268,54 @@ public override void _Ready() {
 		billion4Large.Visible = true;
 		billion4.ButtonPressed = true;
 
-		// TODO: handle different map sizes properly (including loading the
-		// optimal city number, etc)
-		tinySize.Visible = false;
-		smallSize.Visible = false;
-		standardSize.Visible = false;
-		largeSize.Visible = false;
-		hugeSize.Visible = false;
-		randomSize.Visible = false;
+		_saveGame = GameModeLoader.Load(GamePaths.GameModesDir, GamePaths.GameMode);
+
+		InitMapSizes();
+	}
+
+	private void InitMapSizes() {
+		var sizeRandom = new Random();
+
+		var worldSizeButtonGroup = new ButtonGroup() { ResourceName = "WorldSizeButtonGroup" };
+		var randomSizeButton = new Civ3MenuButton
+		{
+			Text = "Random",
+			textPosition = Civ3MenuButton.TextPosition.TextRightOfIcon,
+			FontSize = 0,
+			ButtonGroup = worldSizeButtonGroup,
+			ToggleMode = true
+		};
+
+		randomSizeButton.Pressed += () => {
+			var wss = _saveGame?.WorldSizes ?? [];
+			_worldSize = wss.Count > 0 ? wss[sizeRandom.Next(wss.Count)] : WorldSize.Generic();
+		};
+
+		try {
+			// Dynamically create a new button for each world size in the game 
+			foreach (var ws in _saveGame.WorldSizes) {
+				var worldSizeButton = new Civ3MenuButton
+				{
+					Text = ws.name,
+					textPosition = Civ3MenuButton.TextPosition.TextRightOfIcon,
+					FontSize = 0,
+					ButtonGroup = worldSizeButtonGroup,
+					ToggleMode = true,
+					ButtonPressed = ws.isDefault
+				};
+				worldSizeButton.Pressed += () => _worldSize = ws;
+				worldSizeButtonsContainer.AddChild(worldSizeButton);
+
+				// apply the default immediately (last isDefault=true wins)
+				if (ws.isDefault)
+					_worldSize = ws;
+			}
+
+			// Move random as last in the list and drop default map option and 
+			worldSizeButtonsContainer.AddChild(randomSizeButton);
+		} catch (Exception ex) {
+			log.Warning(ex, "Failed to load map sizes from game mode.");
+		}
 	}
 
 	private void ResetLandformGraphics() {
@@ -313,26 +355,18 @@ private void ResetAgeGraphics() {
 	private void CreateGame() {
 		GlobalSingleton Global = GetNode<GlobalSingleton>("/root/GlobalSingleton");
 		Global.ResetLoadGameFields();
-		SaveGame save = GameModeLoader.Load(GamePaths.GameModesDir, GamePaths.GameMode);
 
-		Global.WorldCharacteristics = new WorldCharacteristics(save) {
+		Global.WorldCharacteristics = new WorldCharacteristics(_saveGame) {
 			landform = landform,
 			oceanCoverage = ocean,
 			age = age,
 			climate = clim,
 			temperature = temp,
-			worldSize = new WorldSize() {
-				width = 100,
-				height = 100,
-				numberOfCivs = 8,
-				distanceBetweenCivs = 12,
-				techRate = 240,
-				optimalNumberOfCities = 20,
-			},
-			mapSeed = Int32.Parse(seedInput.Text),
+			worldSize = _worldSize,
+			mapSeed = GameSeed,
 		};
 
-		Global.SaveGame = save;
+		Global.SaveGame = _saveGame;
 
 		GetTree().ChangeSceneToFile("res://UIElements/NewGame/player_setup.tscn");
 	}

C7/UIElements/NewGame/player_setup.tscn

@@ -30,7 +30,7 @@ script = ExtResource("1")
 background = NodePath("Background")
 playerListContainer = NodePath("Background/CenterContainer/PlayerListContainer")
 civLabel = NodePath("Background/CivLabel")
-opponentListContainer = NodePath("Background/OpponentListContainer")
+opponentListContainer = NodePath("Background/OpponentListScroller/OpponentListContainer")
 difficultyContainer = NodePath("Background/DifficultyContainer")
 confirm = NodePath("Background/Confirm")
 cancel = NodePath("Background/Cancel")
@@ -83,13 +83,16 @@ theme_override_font_sizes/font_size = 15
 text = "DIFFICULTY"
 vertical_alignment = 1
 
-[node name="OpponentListContainer" type="GridContainer" parent="Background"]
+[node name="OpponentListScroller" type="ScrollContainer" parent="Background"]
 layout_mode = 0
-offset_left = 636.0
-offset_top = 123.0
-offset_right = 948.0
+offset_left = 630.0
+offset_top = 120.0
+offset_right = 951.0
 offset_bottom = 458.0
 
+[node name="OpponentListContainer" type="GridContainer" parent="Background/OpponentListScroller"]
+layout_mode = 2
+
 [node name="CenterContainer" type="CenterContainer" parent="Background"]
 layout_mode = 0
 offset_left = 72.0