Merge pull request #210 from misternebula/dev

Orb tracking

Author: misternebula

AssetBundles/debug.manifest

@@ -3,7 +3,7 @@ CRC: 2815158869
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: b0dab33ce9502b8c920c956269fa585e
+    Hash: 5677b7876f2afae05c0920067ef29e8a
   TypeTreeHash:
     serializedVersion: 2
     Hash: 4d6a73cb377370ba69c96eb5da1b5028

AssetBundles/network

@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 561788810
+CRC: 3416116897
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 2ed408e0c9f6147e341c9606eb7228c3
+    Hash: f304be71f6b3202b0c75695ffc81dd4e
   TypeTreeHash:
     serializedVersion: 2
     Hash: 47ee499ae8022a6b96ca6a5fd541f154
@@ -27,6 +27,7 @@ Assets:
 - Assets/NetworkPlayer.prefab
 - Assets/NetworkCameraRoot.prefab
 - Assets/NetworkProbe.prefab
+- Assets/NetworkOrb.prefab
 - Assets/NetworkManager.prefab
 - Assets/NetworkShip.prefab
 Dependencies: []

AssetBundles/network.manifest

@@ -7,15 +7,9 @@ public class AnimTriggerEvent : QSBEvent<AnimTriggerMessage>
     {
         public override EventType Type => EventType.AnimTrigger;
 
-        public override void SetupListener()
-        {
-            GlobalMessenger<short, float>.AddListener(EventNames.QSBAnimTrigger, Handler);
-        }
+        public override void SetupListener() => GlobalMessenger<short, float>.AddListener(EventNames.QSBAnimTrigger, Handler);
 
-        public override void CloseListener()
-        {
-            GlobalMessenger<short, float>.RemoveListener(EventNames.QSBAnimTrigger, Handler);
-        }
+        public override void CloseListener() => GlobalMessenger<short, float>.RemoveListener(EventNames.QSBAnimTrigger, Handler);
 
         private void Handler(short triggerId, float value) => SendEvent(CreateMessage(triggerId, value));
 

QSB/Animation/AnimTriggerEvent.cs

@@ -9,8 +9,6 @@ namespace QSB.Animation
 {
     public class AnimationSync : PlayerSyncObject
     {
-        protected override uint PlayerIdOffset => 0;
-
         private Animator _anim;
         private Animator _bodyAnim;
         private NetworkAnimator _netAnim;

QSB/Animation/AnimationSync.cs

@@ -15,7 +15,7 @@ public static class Necronomicon
             } },
             { DeathType.Impact, new[]
             {
-                "{0} forgot what retro thrusters were",
+                "{0} forgot to use retro-rockets",
                 "{0} bonked into the ground too hard",
                 "{0} went splat"
             } },
@@ -25,23 +25,25 @@ public static class Necronomicon
                 "{0} forgot how to breathe",
                 "{0} forgot to check their oxygen meter",
                 "{0} lacked oxygen",
-                "{0} attempted to photosynthesise"
+                "{0} didn't need air anyway"
             } },
             { DeathType.Energy, new[]
             {
                 "{0} was cooked",
                 "{0} failed the Hotshot achievement",
-                "{0} forgot to install AC unit"
+                "{0} forgot to install an AC unit",
+                "{0} got too hot"
             } },
             { DeathType.Supernova, new[]
             {
                 "{0} ran out of time",
-                "{0} vaporized",
+                "{0} got vaporized",
                 "{0} lost track of time",
                 "{0} got front row seats to the supernova",
                 "{0} heard the End of Times music",
                 "{0} watched the sun go kaboom",
-                "{0} became cosmic marshmallow"
+                "{0} became cosmic marshmallow",
+                "{0} photosynthesized too much"
             } },
             { DeathType.Digestion, new[]
             {

QSB/DeathSync/Necronomicon.cs

@@ -8,15 +8,9 @@ public class PlayerDeathEvent : QSBEvent<PlayerDeathMessage>
     {
         public override EventType Type => EventType.PlayerDeath;
 
-        public override void SetupListener()
-        {
-            GlobalMessenger<DeathType>.AddListener(EventNames.QSBPlayerDeath, Handler);
-        }
+        public override void SetupListener() => GlobalMessenger<DeathType>.AddListener(EventNames.QSBPlayerDeath, Handler);
 
-        public override void CloseListener()
-        {
-            GlobalMessenger<DeathType>.RemoveListener(EventNames.QSBPlayerDeath, Handler);
-        }
+        public override void CloseListener() => GlobalMessenger<DeathType>.RemoveListener(EventNames.QSBPlayerDeath, Handler);
 
         private void Handler(DeathType type) => SendEvent(CreateMessage(type));
 

QSB/DeathSync/PlayerDeathEvent.cs

@@ -1,8 +1,8 @@
-using OWML.ModHelper.Events;
+using OWML.Common;
+using OWML.ModHelper.Events;
 using QSB.Events;
-using System.Linq;
-using OWML.Common;
 using QSB.Utility;
+using System.Linq;
 using UnityEngine;
 
 namespace QSB.DeathSync

QSB/DeathSync/RespawnOnDeath.cs

@@ -1,6 +1,5 @@
 using QSB.Events;
 using QSB.Messaging;
-using QSB.Utility;
 using QSB.WorldSync;
 
 namespace QSB.ElevatorSync
@@ -9,15 +8,9 @@ public class ElevatorEvent : QSBEvent<ElevatorMessage>
     {
         public override EventType Type => EventType.Elevator;
 
-        public override void SetupListener()
-        {
-            GlobalMessenger<int, ElevatorDirection>.AddListener(EventNames.QSBStartLift, Handler);
-        }
+        public override void SetupListener() => GlobalMessenger<int, ElevatorDirection>.AddListener(EventNames.QSBStartLift, Handler);
 
-        public override void CloseListener()
-        {
-            GlobalMessenger<int, ElevatorDirection>.RemoveListener(EventNames.QSBStartLift, Handler);
-        }
+        public override void CloseListener() => GlobalMessenger<int, ElevatorDirection>.RemoveListener(EventNames.QSBStartLift, Handler);
 
         private void Handler(int id, ElevatorDirection direction) => SendEvent(CreateMessage(id, direction));
 
@@ -29,7 +22,6 @@ public override void CloseListener()
 
         public override void OnReceiveRemote(ElevatorMessage message)
         {
-            DebugLog.DebugWrite($"Get ElevatorMessage {message.Direction} for {message.ObjectId}");
             var elevator = WorldRegistry.GetObject<QSBElevator>(message.ObjectId);
             elevator?.RemoteCall(message.Direction);
         }

QSB/ElevatorSync/ElevatorEvent.cs

@@ -2,6 +2,7 @@
 using QSB.DeathSync;
 using QSB.ElevatorSync;
 using QSB.GeyserSync;
+using QSB.OrbSync;
 using QSB.TimeSync;
 using QSB.Tools;
 using QSB.TransformSync;
@@ -37,7 +38,9 @@ public static void Init()
                 new ElevatorEvent(),
                 new GeyserEvent(),
                 new ServerTimeEvent(),
-                new AnimTriggerEvent()
+                new AnimTriggerEvent(),
+                new OrbSlotEvent(),
+                new OrbUserEvent()
             };
 
             _eventList.ForEach(ev => ev.SetupListener());