1.5.1 - The Christmas Update

See CHANGELOG.md for details
KyleTheScientist · Dec 9, 2023 · 3de171a · 3de171a
1 parent f849073
commit 3de171a
Show file tree

Hide file tree

Showing 17 changed files with 320 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG.md
 
+## 1.5.1 (2023-December-9) - The Christmas Update
+
+### Features
+- Added the **Fireflies** mod which allows you to summon a firefly that will track a player in the lobby.
+- Added the **Join Bark Code** button which will let you join a private code for Bark users.
+- You can now summon Bark using the **B** button on your keyboard.
+- Added some Christmas lights to the menu
+
+### Fixed 
+- Fixed potions and teleport for the new update
+
+
 ## 1.5.0 (2023-November-11) - The Settings Update
 
 ### Features

diff --git a/GUI/MenuController.cs b/GUI/MenuController.cs
@@ -17,6 +17,7 @@
 using UnityEngine.XR;
 using Bark.Modules.Misc;
 using Photon.Pun;
+using UnityEngine.InputSystem;
 
 namespace Bark.GUI
 {
@@ -36,6 +37,7 @@ public Vector3
         public static InputTracker SummonTracker;
         public static ConfigEntry<string> SummonInput;
         public static ConfigEntry<string> SummonInputHand;
+        bool docked;
 
         protected override void Awake()
         {
@@ -82,6 +84,9 @@ protected override void Awake()
                     gameObject.AddComponent<Telekinesis>(),
                     gameObject.AddComponent<Fireflies>(),
                     gameObject.AddComponent<XRay>(),
+
+                    //// Misc
+                    gameObject.AddComponent<Lobby>(),
                 };
 
                 Halo halo = gameObject.AddComponent<Halo>();
@@ -134,6 +139,20 @@ void Summon()
 
         void FixedUpdate()
         {
+            if (Keyboard.current.bKey.wasPressedThisFrame)
+            {
+                if (!docked)
+                    Summon();
+                else
+                {
+                    _rigidbody.isKinematic = false;
+                    _rigidbody.useGravity = true;
+                    transform.SetParent(null);
+                    AddBlockerToAllButtons(ButtonController.Blocker.MENU_FALLING);
+                    docked = false;
+                }
+            }
+
             // The potions tutorial needs to be updated frequently to keep the current size
             // up-to-date, even when the mod is disabled
             if (BarkModule.LastEnabled && BarkModule.LastEnabled == Potions.Instance)
@@ -154,6 +173,7 @@ void ResetPosition()
             {
                 button.RemoveBlocker(ButtonController.Blocker.MENU_FALLING);
             }
+            docked = true;
         }
 
         void BuildMenu()
@@ -174,7 +194,7 @@ void BuildMenu()
                 SetupInteraction();
                 SetupModPages();
                 SetupSettingsPage();
-                
+
                 transform.SetParent(Player.Instance.bodyCollider.transform);
                 ResetPosition();
                 Logging.Debug("Build successful.");
@@ -191,7 +211,7 @@ private void SetupSettingsPage()
             btnController.OnPressed += (obj, pressed) =>
             {
                 settingsPage.SetActive(pressed);
-                if(pressed)
+                if (pressed)
                     settingsPage.GetComponent<SettingsPage>().UpdateText();
                 modPage.SetActive(!pressed);
             };
@@ -336,7 +356,7 @@ public void NextPage(ButtonController button, bool isPressed)
             {
                 modPages[i].gameObject.SetActive(i == pageIndex);
             }
-            modPage = modPages[pageIndex].gameObject; 
+            modPage = modPages[pageIndex].gameObject;
         }
 
         public void SetupInteraction()
@@ -346,6 +366,7 @@ public void SetupInteraction()
             this.OnSelectExit += (_, __) =>
             {
                 AddBlockerToAllButtons(ButtonController.Blocker.MENU_FALLING);
+                docked = false;
             };
             this.OnSelectEnter += (_, __) =>
             {

diff --git a/Interaction/BarkGrabbable.cs b/Interaction/BarkGrabbable.cs
@@ -66,7 +66,7 @@ public override void OnDeselect(BarkInteractor interactor)
                     rb.useGravity = true;
 
                     // Apply the force to the rigidbody
-                    rb.velocity = (velEstimator.linearVelocity + Player.Instance.currentVelocity) * throwForceMultiplier;
+                    rb.velocity = (Player.Instance.currentVelocity) + velEstimator.linearVelocity * throwForceMultiplier;
                     rb.velocity *= 1 / Player.Instance.scale;
                     rb.angularVelocity = velEstimator.angularVelocity;
                 }

diff --git a/Modules/Misc/Lobby.cs b/Modules/Misc/Lobby.cs
@@ -0,0 +1,30 @@
+using Bark.GUI;
+using GorillaNetworking;
+
+namespace Bark.Modules.Misc
+{
+    public class Lobby : BarkModule
+    {
+
+        public static readonly string DisplayName = "Join Bark Code";
+
+        protected override void OnEnable()
+        {
+            if (!MenuController.Instance.Built) return;
+            base.OnEnable();
+            Plugin.Instance.JoinLobby("BARK_MOD", "MODDED_MODDED_CASUALCASUAL");
+            this.enabled = false;
+        }
+        public override string GetDisplayName()
+        {
+            return DisplayName;
+        }
+
+        public override string Tutorial()
+        {
+            return "Joins the official Bark Mod code";
+        }
+
+        protected override void Cleanup() { }   
+    }
+}
diff --git a/Modules/Movement/Nailgun.cs b/Modules/Movement/Nailgun.cs
@@ -88,17 +88,6 @@ GameObject MakeNail()
             return null;
         }
 
-        void MakeSlideHelper(Transform parent)
-        {
-            GameObject slideHelper = new GameObject("SlideHelper");
-            slideHelper.transform.SetParent(parent, false);
-            slideHelper.AddComponent<GorillaSurfaceOverride>().overrideIndex = 89;
-            var climbable = slideHelper.AddComponent<GorillaClimbable>();
-            climbable.snapX = false;
-            climbable.snapY = false;
-            climbable.snapZ = false;
-        }
-
         Vector3? GetEndpoint(Vector3 origin, Vector3 forward)
         {
             Ray ray = new Ray(origin, forward);

diff --git a/Modules/Movement/Platforms.cs b/Modules/Movement/Platforms.cs
@@ -366,13 +366,15 @@ void OnGripPressed(NetworkedPlayer player, bool isLeft)
                 platformLeft.SetActive(true);
                 platformLeft.transform.position = leftHand.TransformPoint(new Vector3(-12, 18, -10) / 200f);
                 platformLeft.transform.rotation = leftHand.transform.rotation * Quaternion.Euler(215, 0, -15);
+                platformLeft.transform.localScale = Vector3.one * networkedPlayer.rig.scaleFactor;
             }
             else
             {
                 var rightHand = networkedPlayer.rig.rightHandTransform;
                 platformRight.SetActive(true);
                 platformRight.transform.localPosition = rightHand.TransformPoint(new Vector3(12, 18, 10) / 200f);
                 platformRight.transform.localRotation = rightHand.transform.rotation * Quaternion.Euler(-45, -25, -190);
+                platformLeft.transform.localScale = Vector3.one * networkedPlayer.rig.scaleFactor;
             }
         }