Merge pull request #752 from C7-Game/twrner/player-selection

Allow selecting the civ to play as and the opponents!

Author: TomWerner

C7/GlobalSingleton.cs

@@ -1,5 +1,6 @@
 using Godot;
 using QueryCiv3;
+using C7Engine;
 
 /****
 	Need to pass values from one scene to another, particularly when loading
@@ -25,4 +26,9 @@ public partial class GlobalSingleton : Node {
 	public void ResetLoadGamePath() {
 		LoadGamePath = DefaultGamePath;
 	}
+
+	// The characteristics of the world to generate. This exists in the singleton
+	// to allow the world setup screen to pass the information to the player
+	// setup screen, which is what actually kicks off the world generation.
+	public WorldCharacteristics WorldCharacteristics;
 }

C7/Text/TextureConfigs/civ3.lua

@@ -340,6 +340,7 @@ textures.palace = {
 }
 
 textures.world_setup = require "civ3.world_setup"
+textures.player_setup = require "civ3.player_setup"
 
 textures.diplomacy = {
   deal = "Art/Diplomacy/counter.pcx",

C7/Text/TextureConfigs/civ3/player_setup.lua

@@ -0,0 +1,7 @@
+local PLAYER_SETUP = "Art/PlayerSetup/"
+
+local player_setup = {
+  background = PLAYER_SETUP .. "playerSetup.pcx",
+}
+
+return player_setup

C7/Text/c7-static-map-save.json

@@ -75152,6 +75152,7 @@
       "leader": "Temujin",
       "colorIndex": 3,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_temujin advisor.pcx",
       "cityNames": [
         "Karakorum",
         "Ta-Tu",
@@ -75199,6 +75200,7 @@
       "leader": "Isabella",
       "colorIndex": 5,
       "leaderGender": "female",
+      "leaderArtFile": "art\\advisors\\x_isabell advisor.pcx",
       "cityNames": [
         "Madrid",
         "Barcelona",
@@ -75247,6 +75249,7 @@
       "leader": "Ragnar Lodbrok",
       "colorIndex": 8,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_ragnar advisor.pcx",
       "cityNames": [
         "Trondheim",
         "Bergen",
@@ -75297,6 +75300,7 @@
       "leader": "Osman",
       "colorIndex": 2,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_osman advisor.pcx",
       "cityNames": [
         "Istanbul",
         "Edrine",
@@ -75343,6 +75347,7 @@
       "leader": "Brennus",
       "colorIndex": 4,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_brennus advisor.pcx",
       "cityNames": [
         "Entremont",
         "Alesia",
@@ -75390,6 +75395,7 @@
       "leader": "Abu Bakr",
       "colorIndex": 7,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_abu bakr advisor.pcx",
       "cityNames": [
         "Mecca",
         "Medina",
@@ -75435,6 +75441,7 @@
       "leader": "Hannibal",
       "colorIndex": 9,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_Hannibal advisor.pcx",
       "cityNames": [
         "Carthage",
         "Utica",
@@ -75482,6 +75489,7 @@
       "leader": "Wang Kon",
       "colorIndex": 6,
       "leaderGender": "male",
+      "leaderArtFile": "art\\advisors\\x_Wang Kon advisor.pcx",
       "cityNames": [
         "Seoul",
         "P\u0027yongyang",
@@ -75876,7 +75884,10 @@
     "foodNeededToGrowForLevel1Cities": 20,
     "foodNeededToGrowForLevel2Cities": 40,
     "foodNeededToGrowForLevel3Cities": 60,
-    "buildingDiscountForCivTraits": 0.5
+    "buildingDiscountForCivTraits": 0.5,
+    "startUnitType1": "Settler",
+    "startUnitType2": "Worker",
+    "scoutUnitType": "Scout"
   },
   "techs": [
     {

C7/UIElements/MainMenu/Civ3MenuButton.cs

@@ -125,7 +125,9 @@ private void SetUpLayout() {
 		if (textPosition == TextPosition.TextAboveIcon || textPosition == TextPosition.TextBelowIcon) {
 			boxContainer = new VBoxContainer();
 		} else {
-			boxContainer = new HBoxContainer();
+			boxContainer = new HBoxContainer() {
+				Alignment = (textPosition == TextPosition.TextLeftOfIcon) ? BoxContainer.AlignmentMode.End : BoxContainer.AlignmentMode.Begin,
+			};
 		}
 		boxContainer.SetAnchorsPreset(LayoutPreset.FullRect);
 		boxContainer.MouseFilter = MouseFilterEnum.Pass;