diff --git a/Source/Extensions/Job_Extensions.cs b/Source/Extensions/Job_Extensions.cs index 1d5ec12..3fdae96 100644 --- a/Source/Extensions/Job_Extensions.cs +++ b/Source/Extensions/Job_Extensions.cs @@ -157,7 +157,7 @@ public static string DefaultIconPath(this JobDef job) { } // social - if (job == JobDefOf.SocialRelax || + if (//job == JobDefOf.SocialRelax || // Missing in 1.5 job == JobDefOf.SpectateCeremony || job == JobDefOf.StandAndBeSociallyActive || job == JobDefOf.Insult || @@ -265,7 +265,7 @@ public static string DefaultIconPath(this JobDef job) { if (job == JobDefOf.Open || job == JobDefOf.EnterCryptosleepCasket || job == JobDefOf.UseNeurotrainer || - job == JobDefOf.UseArtifact || + //job == JobDefOf.UseArtifact || // Missing in 1.5 job == JobDefOf.Flick || job == JobDefOf.EnterTransporter || job == JobDefOf2.UseItem || diff --git a/Source/HarmonyPatches/DefGenerator_GenerateImpliedDefs_PreResolve.cs b/Source/HarmonyPatches/DefGenerator_GenerateImpliedDefs_PreResolve.cs index 89b93a4..f7e7dfb 100644 --- a/Source/HarmonyPatches/DefGenerator_GenerateImpliedDefs_PreResolve.cs +++ b/Source/HarmonyPatches/DefGenerator_GenerateImpliedDefs_PreResolve.cs @@ -18,8 +18,18 @@ private static void Postfix() { // replace label column int labelIndex = workTable.columns.IndexOf(PawnColumnDefOf.LabelShortWithIcon); - workTable.columns.RemoveAt(labelIndex); - workTable.columns.Insert(labelIndex, PawnColumnDefOf.WorkTabLabel); + // Fix for 1.5 returning invalid index + if (labelIndex != -1) + { + workTable.columns.RemoveAt(labelIndex); + workTable.columns.Insert(labelIndex, PawnColumnDefOf.WorkTabLabel); + } + else + { + //Logger.Debug($"Invalid work table index for {PawnColumnDefOf.LabelShortWithIcon.LabelCap}."); + workTable.columns.RemoveAt(0); + workTable.columns.Insert(0, PawnColumnDefOf.WorkTabLabel); + } // insert mood and job columns before first work column name int firstWorkindex = diff --git a/Source/WorkTab.csproj b/Source/WorkTab.csproj index 6bcf1dd..1b2323a 100644 --- a/Source/WorkTab.csproj +++ b/Source/WorkTab.csproj @@ -24,8 +24,8 @@ - - - + + + \ No newline at end of file