Merge branch 'master' into feature/rajas-of-asia-support

ParadoxGameConverters · Oct 18, 2024 · 9a53c45 · 9a53c45
2 parents 7690daa + 845dc9d
commit 9a53c45
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -40,8 +40,9 @@ jobs:
       run: |
         dotnet build -c:Release
     - name: "Download I:R save from MEGA"
+      shell: pwsh
       run: |
-        & "C:/Program Files/megatools/megatools.exe" dl --path "save.rome" ${{ matrix.save_url }}
+        & "C:/Users/Administrator/AppData/Local/MEGAcmd/mega-get.bat" ${{ matrix.save_url }} save.rome
     - name: "Create configuration.txt"
       working-directory: Release/ImperatorToCK3
       run: |

diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3/CK3/Titles/LandedTitles.cs b/ImperatorToCK3/CK3/Titles/LandedTitles.cs
@@ -1477,7 +1477,7 @@ public void ImportImperatorGovernmentOffices(ICollection<OfficeJob> irOfficeJobs
 				["court_physician_court_position"] = ["office_physician", "office_republic_physician", "office_apothecary"],
 				["court_tutor_court_position"] = ["office_royal_tutor"],
 				["chronicler_court_position"] = ["office_philosopher"], // From I:R wiki: "supervises libraries and the gathering and protection of knowledge"
-				["court_cave_hermit_position"] = ["office_wise_person"]
+				["cave_hermit_court_position"] = ["office_wise_person"]
 			};
 
 			string[] ignoredOfficeTypes = ["office_plebeian_aedile"];

diff --git a/ImperatorToCK3/CK3/Titles/Title.cs b/ImperatorToCK3/CK3/Titles/Title.cs
@@ -1341,8 +1341,8 @@ private void AppointCourtierPositionsFromImperator(Dictionary<string, string[]>
 					continue;
 				}
 
-				// For court_cave_hermit_position, lifestyle_mystic trait is required.
-				if (ck3Position == "court_cave_hermit_position" && !ck3Official.BaseTraits.Contains("lifestyle_mystic")) {
+				// For cave_hermit_court_position, lifestyle_mystic trait is required.
+				if (ck3Position == "cave_hermit_court_position" && !ck3Official.BaseTraits.Contains("lifestyle_mystic")) {
 					continue;
 				}
 

diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj
@@ -38,11 +38,11 @@
         <PackageReference Include="DotLiquid" Version="2.2.692" />
         <PackageReference Include="FSharp.Core" Version="8.0.401" /> <!-- Needed for CWTools -->
         <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.0.0"/>
-        <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+        <PackageReference Include="Meziantou.Analyzer" Version="2.0.172">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="PGCG.commonItems" Version="14.1.1" />
+        <PackageReference Include="PGCG.commonItems" Version="14.1.3" />
         <PackageReference Include="PGCG.commonItems.SourceGenerators" Version="1.0.7"/>
         <PackageReference Include="Polly" Version="8.4.2" />
         <PackageReference Include="Roslynator.Analyzers" Version="4.12.8">

diff --git a/InnoDependencyInstaller b/InnoDependencyInstaller
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100-rc.2.24474.11",
     "allowPrerelease": true,
     "rollForward": "disable"
   }