From 7b1b638514f4f8f7fac46302ca694f838c5bce1b Mon Sep 17 00:00:00 2001 From: "romain.quinio" Date: Sat, 27 Jan 2018 19:13:39 +0100 Subject: [PATCH] Add new government frames, prepare release 2.5.0 --- CHANGELOG.txt | 3 ++- PortraitBuilder/Engine/PortraitRenderer.cs | 2 +- PortraitBuilder/Properties/AssemblyInfo.cs | 4 ++-- PortraitBuilder/UI/PortraitBuilderForm.Designer.cs | 5 ++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 679f1ef..f9f8e03 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,8 +1,9 @@ By Romulien: -Version 2.x - 2018-? +Version 2.5.0 - 2018-01-27 - Add labels for new vanilla 2.8 properties (p14 makeup, p15 makeup2, p16 jewelry and p17 immortality) +- Add new 2.8 government frames - Allow selection of characteristics to update when clicking randomize button - Read mod directory from userdir.txt file in Steam CK2 folder, if any - Prevent crash when mod directory doesn't exist diff --git a/PortraitBuilder/Engine/PortraitRenderer.cs b/PortraitBuilder/Engine/PortraitRenderer.cs index 9673ffc..f37814c 100644 --- a/PortraitBuilder/Engine/PortraitRenderer.cs +++ b/PortraitBuilder/Engine/PortraitRenderer.cs @@ -19,7 +19,7 @@ public class PortraitRenderer { private static readonly ILog logger = LogManager.GetLogger(typeof(PortraitRenderer).Name); - private static String[] governmentSpriteSuffix = new String[] { "", "_iqta", "_theocracy", "_republic" , "_merchantrepublic", "_tribal", "_nomadic"}; + private static String[] governmentSpriteSuffix = new String[] { "", "_iqta", "_theocracy", "_republic", "_merchantrepublic", "_tribal", "_nomadic", "_theocraticfeudal", "_chineseimperial", "_confucian" }; /// /// Draws a character portrait. diff --git a/PortraitBuilder/Properties/AssemblyInfo.cs b/PortraitBuilder/Properties/AssemblyInfo.cs index 6b809b5..8d03abf 100644 --- a/PortraitBuilder/Properties/AssemblyInfo.cs +++ b/PortraitBuilder/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.0")] -[assembly: AssemblyFileVersion("2.4.0")] +[assembly: AssemblyVersion("2.5.0")] +[assembly: AssemblyFileVersion("2.5.0")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs b/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs index db20d5e..6ebd083 100644 --- a/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs +++ b/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs @@ -106,7 +106,10 @@ private void InitializeComponent() { "Republic", "Merchant Republic", "Tribal", - "Nomadic"}); + "Nomadic", + "Monastic Feudal", + "Chinese Imperial", + "Confucian Bureaucracy"}); this.cbGovernment.Location = new System.Drawing.Point(45, 19); this.cbGovernment.Name = "cbGovernment"; this.cbGovernment.Size = new System.Drawing.Size(136, 21);