bug fixes

TheOtherRoles/Buttons.cs

@@ -1294,7 +1294,8 @@ public static void createButtonsPostfix(HudManager __instance) {
                     return Jackal.currentTarget && CachedPlayer.LocalPlayer.PlayerControl.CanMove; },
                 () => { jackalKillButton.Timer = jackalKillButton.MaxTimer;},
                 __instance.KillButton.graphic.sprite,
-                CustomButton.ButtonPositions.upperRowRight,
+                //CustomButton.ButtonPositions.upperRowRight,
+                CustomButton.ButtonPositions.upperRowCenter,
                 __instance,
                 KeyCode.Q
             );
@@ -1340,7 +1341,8 @@ public static void createButtonsPostfix(HudManager __instance) {
                     return Sidekick.currentTarget && CachedPlayer.LocalPlayer.PlayerControl.CanMove; },
                 () => { sidekickKillButton.Timer = sidekickKillButton.MaxTimer;},
                 __instance.KillButton.graphic.sprite,
-                CustomButton.ButtonPositions.upperRowRight,
+                //CustomButton.ButtonPositions.upperRowRight,
+                CustomButton.ButtonPositions.upperRowCenter,
                 __instance,
                 KeyCode.Q
             );

TheOtherRoles/CustomOptionHolder.cs

@@ -442,7 +442,7 @@ public class CustomOptionHolder {
         public static CustomOption enableCamoComms;
 
         public static CustomOption restrictDevices;
-        public static CustomOption restrictAdmin;
+        //public static CustomOption restrictAdmin;
         public static CustomOption restrictCameras;
         public static CustomOption restrictVents;
 
@@ -1046,7 +1046,7 @@ public static void Load() {
             enableCamoComms = CustomOption.Create(1105, Types.General, "Enable Camouflage Comms", false,  null, false);
             disableMedbayWalk = CustomOption.Create(8847, Types.General, "Disable MedBay Animations", false, null, false);
             restrictDevices = CustomOption.Create(1101, Types.General, "Restrict Map Information", new string[] {"Off", "Per Round", "Per Game"},  null, false);
-            restrictAdmin = CustomOption.Create(1102, Types.General, "Restrict Admin Table", 30f, 0f, 600f, 5f, restrictDevices);
+            //restrictAdmin = CustomOption.Create(1102, Types.General, "Restrict Admin Table", 30f, 0f, 600f, 5f, restrictDevices);
             restrictCameras = CustomOption.Create(1103, Types.General, "Restrict Cameras", 30f, 0f, 600f, 5f, restrictDevices);
             restrictVents = CustomOption.Create(1104, Types.General, "Restrict Vitals", 30f, 0f, 600f, 5f, restrictDevices);
             disableCamsRound1 = CustomOption.Create(8834, Types.General, "No Cameras First Round", false, null, false);

TheOtherRoles/Helpers.cs

@@ -653,7 +653,7 @@ public static bool hidePlayerName(PlayerControl source, PlayerControl target) {
             if (Patches.SurveillanceMinigamePatch.nightVisionIsActive) return true;
             else if (Ninja.isInvisble && Ninja.ninja == target) return true;
             else if (Jackal.isInvisable && Jackal.jackal == target) return true;
-            else if (TORMapOptions.hideOutOfSightNametags && PhysicsHelpers.AnythingBetween(localPlayer.GetTruePosition(), target.GetTruePosition(), Constants.ShadowMask, false)) return true;
+            else if (TORMapOptions.hideOutOfSightNametags && gameStarted && !source.Data.IsDead &&  PhysicsHelpers.AnythingBetween(localPlayer.GetTruePosition(), target.GetTruePosition(), Constants.ShadowMask, false)) return true;
 		/*
         {
 			float num = (isLightsActive() ? 2f : 1.25f);
@@ -757,6 +757,8 @@ public static void checkWatchFlash(PlayerControl target) {
 
         public static bool roleCanUseVents(this PlayerControl player) {
             bool roleCouldUse = false;
+            if (player.inVent) //test
+                return true;
             if (Engineer.engineer != null && Engineer.engineer == player)
                 roleCouldUse = true;
             else if (Werewolf.canUseVents && Werewolf.werewolf != null && Werewolf.werewolf == player)

TheOtherRoles/Main.cs

@@ -33,7 +33,7 @@ namespace TheOtherRoles
     public class TheOtherRolesPlugin : BasePlugin
     {
         public const string Id = "me.eisbison.theotherroles";
-        public const string VersionString = "1.3.01";
+        public const string VersionString = "1.3.2";
         public static uint betaDays = 0;  // amount of days for the build to be usable (0 for infinite!)
 
         public static Version Version = Version.Parse(VersionString);

TheOtherRoles/MapOptions.cs

@@ -27,8 +27,8 @@ static class TORMapOptions {
         public static bool ShowVentsOnMap = true;
         public static bool disableMedscanWalking = false;
         public static int restrictDevices = 0;
-        public static float restrictAdminTime = 600f;
-        public static float restrictAdminTimeMax = 600f;
+       // public static float restrictAdminTime = 600f;
+        //public static float restrictAdminTimeMax = 600f;
         public static float restrictCamerasTime = 600f;
         public static float restrictCamerasTimeMax = 600f;
         public static float restrictVitalsTime = 600f;
@@ -67,7 +67,7 @@ public static void clearAndReloadMapOptions() {
             impostorSeeRoles = CustomOptionHolder.impostorSeeRoles.getBool();
             transparentTasks = CustomOptionHolder.transparentTasks.getBool();
             restrictDevices = CustomOptionHolder.restrictDevices.getSelection();
-            restrictAdminTime = restrictAdminTimeMax = CustomOptionHolder.restrictAdmin.getFloat();
+            //restrictAdminTime = restrictAdminTimeMax = CustomOptionHolder.restrictAdmin.getFloat();
             restrictCamerasTime = restrictCamerasTimeMax = CustomOptionHolder.restrictCameras.getFloat();
             restrictVitalsTime = restrictVitalsTimeMax = CustomOptionHolder.restrictVents.getFloat();
             disableCamsRoundOne = CustomOptionHolder.disableCamsRound1.getBool();
@@ -92,14 +92,14 @@ public static void reloadPluginOptions() {
             //Patches.ShouldAlwaysHorseAround.isHorseMode = TheOtherRolesPlugin.EnableHorseMode.Value;
         }
     public static void resetDeviceTimes() {
-            restrictAdminTime = restrictAdminTimeMax;
+            //restrictAdminTime = restrictAdminTimeMax;
             restrictCamerasTime = restrictCamerasTimeMax;
             restrictVitalsTime = restrictVitalsTimeMax;
         }
 
-        public static bool canUseAdmin  { get { return restrictDevices == 0 || restrictAdminTime > 0f || CachedPlayer.LocalPlayer.PlayerControl == Hacker.hacker || CachedPlayer.LocalPlayer.Data.IsDead; }}
+       // public static bool canUseAdmin  { get { return restrictDevices == 0 || restrictAdminTime > 0f || CachedPlayer.LocalPlayer.PlayerControl == Hacker.hacker || CachedPlayer.LocalPlayer.Data.IsDead; }}
 
-        public static bool couldUseAdmin { get { return restrictDevices == 0 || restrictAdminTimeMax > 0f  || CachedPlayer.LocalPlayer.PlayerControl == Hacker.hacker || CachedPlayer.LocalPlayer.Data.IsDead; }}
+        //public static bool couldUseAdmin { get { return restrictDevices == 0 || restrictAdminTimeMax > 0f  || CachedPlayer.LocalPlayer.PlayerControl == Hacker.hacker || CachedPlayer.LocalPlayer.Data.IsDead; }}
 
         public static bool canUseCameras {get { return restrictDevices == 0 || restrictCamerasTime > 0f || CachedPlayer.LocalPlayer.PlayerControl == Hacker.hacker || CachedPlayer.LocalPlayer.Data.IsDead; }}
 

TheOtherRoles/Patches/AdminPatch.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+/*using HarmonyLib;
 using Hazel;
 using System;
 using System.Collections.Generic;
@@ -280,3 +280,4 @@ static void Postfix(CounterArea __instance)
         }
     }
 }
+*/

TheOtherRoles/Patches/MeetingPatch.cs

@@ -467,8 +467,8 @@ static void guesserOnClick(int buttonTarget, MeetingHud __instance) {
                 button.GetComponent<SpriteRenderer>().sprite = ShipStatus.Instance.CosmeticsCache.GetNameplate("nameplate_NoPlate").Image;
                 buttons.Add(button);
                 int row = i/5, col = i%5;
-                buttonParent.localPosition = new Vector3(-3.47f + 1.75f * col, 1.5f - 0.45f * row, -5);
-                buttonParent.localScale = new Vector3(0.55f, 0.55f, 1f);
+                buttonParent.localPosition = new Vector3(-3.47f + 1.55f * col, 1.5f - 0.35f * row, -5);
+                buttonParent.localScale = new Vector3(0.45f, 0.45f, 1f);
                 label.text = Helpers.cs(roleInfo.color, roleInfo.name);
                 label.alignment = TMPro.TextAlignmentOptions.Center;
                 label.transform.localPosition = new Vector3(0, 0, label.transform.localPosition.z);

TheOtherRoles/Patches/PlayerControlPatch.cs

@@ -69,7 +69,7 @@ static void setBasePlayerOutlines() {
                 bool isMorphedMorphling = target == Morphling.morphling && Morphling.morphTarget != null && Morphling.morphTimer > 0f;
                 bool hasVisibleShield = false;
                 Color color = Medic.shieldedColor;
-                if (Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && Medic.shielded != null && ((target == Medic.shielded && !isMorphedMorphling) || (isMorphedMorphling && Morphling.morphTarget == Medic.shielded))) {
+                if (!Helpers.isCamoComms() && Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && Medic.shielded != null && ((target == Medic.shielded && !isMorphedMorphling) || (isMorphedMorphling && Morphling.morphTarget == Medic.shielded))) {
                     hasVisibleShield = Medic.showShielded == 0 || Helpers.shouldShowGhostInfo() // Everyone or Ghost info
                         || (Medic.showShielded == 1 && (CachedPlayer.LocalPlayer.PlayerControl == Medic.shielded || CachedPlayer.LocalPlayer.PlayerControl == Medic.medic)) // Shielded + Medic
                         || (Medic.showShielded == 2 && CachedPlayer.LocalPlayer.PlayerControl == Medic.medic); // Medic only
@@ -82,7 +82,7 @@ static void setBasePlayerOutlines() {
                     color = BodyGuard.color;
                 }
 
-                if (Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && TORMapOptions.firstKillPlayer != null && TORMapOptions.shieldFirstKill && ((target == TORMapOptions.firstKillPlayer && !isMorphedMorphling) || (isMorphedMorphling && Morphling.morphTarget == TORMapOptions.firstKillPlayer))) {
+                if (!Helpers.isCamoComms() && Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && TORMapOptions.firstKillPlayer != null && TORMapOptions.shieldFirstKill && ((target == TORMapOptions.firstKillPlayer && !isMorphedMorphling) || (isMorphedMorphling && Morphling.morphTarget == TORMapOptions.firstKillPlayer))) {
                     hasVisibleShield = true;
                     color = Color.blue;
                 }
@@ -410,7 +410,13 @@ static void swooperUpdate()
 				RPCProcedure.setSwoop(Jackal.jackal.PlayerId, byte.MaxValue);
             }
             if (Jackal.jackal != null && Jackal.canSwoop){
-                Swooper.swooper = Jackal.jackal;
+                {
+				MessageWriter invisibleWriter = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.SetSwooper, Hazel.SendOption.Reliable, -1);
+				invisibleWriter.Write(Jackal.jackal.PlayerId);
+				invisibleWriter.Write(byte.MaxValue);
+				AmongUsClient.Instance.FinishRpcImmediately(invisibleWriter);
+				RPCProcedure.setSwooper(Jackal.jackal.PlayerId);
+            }
             }
         }
 
@@ -515,7 +521,7 @@ public static void playerSizeUpdate(PlayerControl p) {
             collider.offset = Mini.defaultColliderOffset * Vector2.down;
 
             // Set adapted player size to Mini and Morphling
-            if (Mini.mini == null || Camouflager.camouflageTimer > 0f || Helpers.MushroomSabotageActive() || Mini.mini == Morphling.morphling && Morphling.morphTimer > 0) return;
+            if (Mini.mini == null || Helpers.isCamoComms()  || Camouflager.camouflageTimer > 0f || Helpers.MushroomSabotageActive() || Mini.mini == Morphling.morphling && Morphling.morphTimer > 0) return;
 
             float growingProgress = Mini.growingProgress();
             float scale = growingProgress * 0.35f + 0.35f;
@@ -958,6 +964,7 @@ static void morphlingAndCamouflagerUpdate() {
             // Camouflage reset and set Morphling look if necessary
             if (oldCamouflageTimer > 0f && Camouflager.camouflageTimer <= 0f) {
                 Camouflager.resetCamouflage();
+                Helpers.camoReset();
                 if (Morphling.morphTimer > 0f && Morphling.morphling != null && Morphling.morphTarget != null) {
                     PlayerControl target = Morphling.morphTarget;
                     Morphling.morphling.setLook(target.Data.PlayerName, target.Data.DefaultOutfit.ColorId, target.Data.DefaultOutfit.HatId, target.Data.DefaultOutfit.VisorId, target.Data.DefaultOutfit.SkinId, target.Data.DefaultOutfit.PetId);
@@ -1374,7 +1381,7 @@ public static void Postfix(PlayerControl __instance) {
     class PlayerPhysicsWalkPlayerToPatch {
         private static Vector2 offset = Vector2.zero;
         public static void Prefix(PlayerPhysics __instance) {
-            bool correctOffset = Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && (__instance.myPlayer == Mini.mini ||  (Morphling.morphling != null && __instance.myPlayer == Morphling.morphling && Morphling.morphTarget == Mini.mini && Morphling.morphTimer > 0f));
+            bool correctOffset = !Helpers.isCamoComms() && Camouflager.camouflageTimer <= 0f && !Helpers.MushroomSabotageActive() && (__instance.myPlayer == Mini.mini ||  (Morphling.morphling != null && __instance.myPlayer == Morphling.morphling && Morphling.morphTarget == Mini.mini && Morphling.morphTimer > 0f));
             correctOffset = correctOffset && !(Mini.mini == Morphling.morphling && Morphling.morphTimer > 0f);
             if (correctOffset) {
                 float currentScaling = (Mini.growingProgress() + 1) * 0.5f;

TheOtherRoles/Patches/UpdatePatch.cs

@@ -263,7 +263,7 @@ static void timerUpdate() {
         }
 
         public static void miniUpdate() {
-            if (Mini.mini == null || Camouflager.camouflageTimer > 0f || Helpers.MushroomSabotageActive() || Mini.mini == Morphling.morphling && Morphling.morphTimer > 0f || Mini.mini == Ninja.ninja && Ninja.isInvisble || SurveillanceMinigamePatch.nightVisionIsActive || Mini.mini == Jackal.jackal && Jackal.isInvisable || Helpers.isCamoComms()) return;
+            if (Mini.mini == null || Camouflager.camouflageTimer > 0f || Helpers.MushroomSabotageActive() || Mini.mini == Morphling.morphling && Morphling.morphTimer > 0f || Mini.mini == Ninja.ninja && Ninja.isInvisble || SurveillanceMinigamePatch.nightVisionIsActive || Mini.mini == Jackal.jackal && Jackal.isInvisable || Helpers.isActiveCamoComms()) return;
 
             float growingProgress = Mini.growingProgress();
             float scale = growingProgress * 0.35f + 0.35f;

TheOtherRoles/Patches/UsablesPatch.cs

@@ -191,6 +191,9 @@ static void Postfix(VentButton __instance) {
                 __instance.graphic.sprite = isSpecialVent ?  Trickster.getTricksterVentButtonSprite() : defaultVentSprite;
                 __instance.buttonLabelText.enabled = !isSpecialVent;
             }
+            if (Tunneler.tunneler != null && Tunneler.tunneler == CachedPlayer.LocalPlayer.PlayerControl) {
+                __instance.graphic.transform.localPosition = new Vector3(0, 2, 0);
+        }
         }
     }
 

TheOtherRoles/RPC.cs

@@ -152,7 +152,7 @@ enum CustomRPC
         SwapperSwap,
         MorphlingMorph,
         CamouflagerCamouflage,
-        CamoComms,
+        //CamoComms,
         TrackerUsedTracker,
         VampireSetBitten,
         PlaceGarlic,
@@ -197,6 +197,7 @@ enum CustomRPC
         SetTiebreak,
         SetInvisibleGen,
         SetSwoop,
+        SetSwooper,
         SetInvisible,
         ThiefStealsRole,
         SetTrap,
@@ -1401,7 +1402,7 @@ public static void camouflagerCamouflage(byte setTimer) {
             foreach (PlayerControl player in CachedPlayer.AllPlayers)
                 player.setLook("", 6, "", "", "", "");
         }
-
+/*
         public static void camoComms() {
             if (!Helpers.isCamoComms()) return;
 
@@ -1411,6 +1412,7 @@ public static void camoComms() {
                 player.setLook("", 6, "", "", "", "");
 
         }
+        */
 
         public static void vampireSetBitten(byte targetId, byte performReset) {
             if (performReset != 0) {
@@ -1897,6 +1899,12 @@ public static void setSwoop(byte playerId, byte flag) {
             Jackal.isInvisable = true;
         }
 
+        public static void setSwooper(byte playerId) {        
+            PlayerControl target = Helpers.playerById(playerId);
+            if (target == null) return;
+            Swooper.swooper = Jackal.jackal;
+        }
+
 
         public static void setInvisibleGen(byte playerId, byte flag)
         {
@@ -2119,11 +2127,12 @@ public static void guesserShoot(byte killerId, byte dyingTargetId, byte guessedT
                     FastDestroyableSingleton<UnityTelemetry>.Instance.SendWho();
             }
         }
-
+/*
          public static void useAdminTime(float time)
         {
             TORMapOptions.restrictAdminTime -= time;
         }
+        */
 
         public static void useCameraTime(float time)
         {
@@ -2589,9 +2598,10 @@ static void Postfix([HarmonyArgument(0)]byte callId, [HarmonyArgument(1)]Message
                 case (byte)CustomRPC.EngineerUsedRepair:
                     RPCProcedure.engineerUsedRepair();
                     break;
+                    /*
                 case (byte)CustomRPC.UseAdminTime:
                     RPCProcedure.useAdminTime(reader.ReadSingle());
-                    break;
+                    break;*/
                 case (byte)CustomRPC.UseCameraTime:
                     RPCProcedure.useCameraTime(reader.ReadSingle());
                     break;
@@ -2657,10 +2667,10 @@ static void Postfix([HarmonyArgument(0)]byte callId, [HarmonyArgument(1)]Message
                 case (byte)CustomRPC.CamouflagerCamouflage:
                     byte setTimer = reader.ReadByte();
                     RPCProcedure.camouflagerCamouflage(setTimer);
-                break;
+                break;/*
                 case (byte)CustomRPC.CamoComms:
                     RPCProcedure.camoComms();
-                    break;
+                    break;*/
                 case (byte)CustomRPC.VampireSetBitten:
                     byte bittenId = reader.ReadByte();
                     byte reset = reader.ReadByte();
@@ -2791,6 +2801,10 @@ static void Postfix([HarmonyArgument(0)]byte callId, [HarmonyArgument(1)]Message
                     byte invisibleFlag2 = reader.ReadByte();
                     RPCProcedure.setSwoop(invisiblePlayer2, invisibleFlag2);
                     break;  
+                case (byte)CustomRPC.SetSwooper:
+                    byte jackalPlayer2 = reader.ReadByte();
+                    RPCProcedure.setSwooper(jackalPlayer2);
+                    break;  
                 case (byte)CustomRPC.SetInvisibleGen:
                     byte invisiblePlayer3 = reader.ReadByte();
                     byte invisibleFlag3 = reader.ReadByte();

TheOtherRoles/TheOtherRoles.cs

@@ -895,6 +895,7 @@ public static void resetCamouflage() {
                 if (p == Ninja.ninja && Ninja.isInvisble || p == Jackal.jackal && Jackal.isInvisable)
                     continue;
                 p.setDefaultLook();
+                Camouflager.camoComms = false;
             }
         }
 

TheOtherRoles/TheOtherRoles.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.3.01</Version>
+        <Version>1.3.2</Version>
         <Description>TheOtherUs</Description>
         <Authors>Spex</Authors>
 		<LangVersion>latest</LangVersion>