Skip to content
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

Sync non-exclusive prisoner interaction mode, change syncing exclusive mode #450

Merged
merged 1 commit into from
May 24, 2024
Merged

Sync non-exclusive prisoner interaction mode, change syncing exclusive mode #450

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: 4 additions & 0 deletions Source/Client/Syncing/Dict/SyncDictRimWorld.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ public static class SyncDictRimWorld
(ByteWriter data, Pawn_NeedsTracker joinerTracker) => WriteSync(data, joinerTracker?.pawn),
(ByteReader data) => ReadSync<Pawn>(data)?.needs
},
{
(ByteWriter data, Pawn_GuestTracker guestTracker) => WriteSync(data, guestTracker?.pawn),
(ByteReader data) => ReadSync<Pawn>(data)?.guest
},
#endregion

#region Policies
Expand Down
3 changes: 0 additions & 3 deletions Source/Client/Syncing/Game/SyncFields.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public static class SyncFields
public static ISyncField SyncHostilityResponse;
public static ISyncField SyncFollowDrafted;
public static ISyncField SyncFollowFieldwork;
public static ISyncField SyncInteractionMode;
public static ISyncField SyncSlaveInteractionMode;
public static ISyncField SyncIdeoForConversion;
public static ISyncField SyncBeCarried;
Expand Down Expand Up @@ -90,7 +89,6 @@ public static void Init()
SyncHostilityResponse = Sync.Field(typeof(Pawn), nameof(Pawn.playerSettings), nameof(Pawn_PlayerSettings.hostilityResponse));
SyncFollowDrafted = Sync.Field(typeof(Pawn), nameof(Pawn.playerSettings), nameof(Pawn_PlayerSettings.followDrafted));
SyncFollowFieldwork = Sync.Field(typeof(Pawn), nameof(Pawn.playerSettings), nameof(Pawn_PlayerSettings.followFieldwork));
SyncInteractionMode = Sync.Field(typeof(Pawn), nameof(Pawn.guest), nameof(Pawn_GuestTracker.interactionMode));
SyncSlaveInteractionMode = Sync.Field(typeof(Pawn), nameof(Pawn.guest), nameof(Pawn_GuestTracker.slaveInteractionMode));
SyncIdeoForConversion = Sync.Field(typeof(Pawn), nameof(Pawn.guest), nameof(Pawn_GuestTracker.ideoForConversion));
SyncBeCarried = Sync.Field(typeof(Pawn), nameof(Pawn.health), nameof(Pawn_HealthTracker.beCarriedByCaravanIfSick));
Expand Down Expand Up @@ -258,7 +256,6 @@ static void ITab_Pawn_Visitor_Patch(ITab __instance)
{
Pawn pawn = __instance.SelPawn;
SyncMedCare.Watch(pawn);
SyncInteractionMode.Watch(pawn);
SyncSlaveInteractionMode.Watch(pawn);
SyncIdeoForConversion.Watch(pawn);
}
Expand Down
2 changes: 2 additions & 0 deletions Source/Client/Syncing/Game/SyncMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public static void Init()
SyncMethod.Register(typeof(Pawn_JobTracker), nameof(Pawn_JobTracker.TryTakeOrderedJob)).SetContext(SyncContext.QueueOrder_Down).ExposeParameter(0);
SyncMethod.Register(typeof(Pawn_JobTracker), nameof(Pawn_JobTracker.TryTakeOrderedJobPrioritizedWork)).SetContext(SyncContext.QueueOrder_Down).ExposeParameter(0);
SyncMethod.Register(typeof(Pawn_TrainingTracker), nameof(Pawn_TrainingTracker.SetWantedRecursive));
SyncMethod.Register(typeof(Pawn_GuestTracker), nameof(Pawn_GuestTracker.SetExclusiveInteraction)).CancelIfAnyArgNull();
SyncMethod.Register(typeof(Pawn_GuestTracker), nameof(Pawn_GuestTracker.ToggleNonExclusiveInteraction)).CancelIfAnyArgNull();
SyncMethod.Register(typeof(Zone), nameof(Zone.Delete));
SyncMethod.Register(typeof(BillStack), nameof(BillStack.AddBill)).ExposeParameter(0); // Only used for pasting
SyncMethod.Register(typeof(BillStack), nameof(BillStack.Delete)).CancelIfAnyArgNull();
Expand Down
Loading