diff --git a/Synapse/Api/Scp914.cs b/Synapse/Api/Scp914.cs index 186d3192..09dcd10f 100644 --- a/Synapse/Api/Scp914.cs +++ b/Synapse/Api/Scp914.cs @@ -66,7 +66,7 @@ public Scp914Recipe(global::Scp914.Scp914Recipe recipe) rough = recipe.rough.Select(x => (int)x).ToList(); coarse = recipe.coarse.Select(x => (int)x).ToList(); oneToOne = recipe.oneToOne.Select(x => (int)x).ToList(); - fine = recipe.oneToOne.Select(x => (int)x).ToList(); + fine = recipe.fine.Select(x => (int)x).ToList(); veryFine = recipe.veryFine.Select(x => (int)x).ToList(); } diff --git a/Synapse/Patches/EventsPatches/MapPatches/914ActivatePatch.cs b/Synapse/Patches/EventsPatches/MapPatches/914ActivatePatch.cs index aa3ca7e3..a8839f9a 100644 --- a/Synapse/Patches/EventsPatches/MapPatches/914ActivatePatch.cs +++ b/Synapse/Patches/EventsPatches/MapPatches/914ActivatePatch.cs @@ -41,7 +41,7 @@ private static bool Prefix(Scp914.Scp914Machine __instance) if (!allow) return false; - var vanillaitems = items.Select(x => x.pickup); + var vanillaitems = items.Where(x => x.State == Api.Enum.ItemState.Map).Select(x => x.pickup); var vanillaplayers = players.Select(x => x.ClassManager); try diff --git a/Synapse/Patches/SynapsePatches/ShootPermissionPatch.cs b/Synapse/Patches/SynapsePatches/ShootPermissionPatch.cs index 53971477..4b975434 100644 --- a/Synapse/Patches/SynapsePatches/ShootPermissionPatch.cs +++ b/Synapse/Patches/SynapsePatches/ShootPermissionPatch.cs @@ -20,7 +20,11 @@ private static bool Prefix(WeaponManager __instance,out bool __result, Character { if (shooter.Team == Team.SCP && target.Team == Team.SCP) __result = false; - else if (Server.Get.FF) __result = shooter.Team != target.Team; + var ff = Server.Get.FF; + if (forceFriendlyFire) + ff = true; + + else if (!ff) __result = shooter.Team != target.Team; } else { diff --git a/Synapse/SynapseController.cs b/Synapse/SynapseController.cs index cc87f6fc..ef064e77 100644 --- a/Synapse/SynapseController.cs +++ b/Synapse/SynapseController.cs @@ -54,6 +54,6 @@ private void PatchMethods() public const int SynapseMajor = 2; public const int SynapseMinor = 2; - public const int SynapsePatch = 0; - public const string SynapseVersion = "2.2.0"; + public const int SynapsePatch = 1; + public const string SynapseVersion = "2.2.1"; }