Skip to content

1.5 Update Fixes #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Phenrei wants to merge 1 commit into
base: 1.4
Choose a base branch
from
Open

1.5 Update Fixes #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/Extensions/Job_Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down Expand Up @@ -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 ||
Expand Down
14 changes: 12 additions & 2 deletions Source/HarmonyPatches/DefGenerator_GenerateImpliedDefs_PreResolve.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
6 changes: 3 additions & 3 deletions Source/WorkTab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<ProjectReference Include="..\..\..\TOOLS\FluffyUI\FluffyUI\FluffyUI.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3517-beta" />
<PackageReference Include="Lib.Harmony" Version="2.1.1" ExcludeAssets="runtime" />
<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.3.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4034-beta" />
<PackageReference Include="Lib.Harmony" Version="2.3.1.1" ExcludeAssets="runtime" />
<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.5.0" />
</ItemGroup>
</Project>