mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-04-15 20:42:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #192 from Raicuparta/nebula/small-fixes

Browse Source 
Fix probe snapshot + cleanup
This commit is contained in:
Mister_Nebula 2020-08-21 20:45:37 +01:00 committed by GitHub
commit 660c85eb03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QSB/Animation/AnimationSync.cs
View File

@ -1,9 +1,9 @@
using System; using OWML.ModHelper.Events;
using System.Linq;
using OWML.ModHelper.Events;
using QSB.Events; using QSB.Events;
using QSB.Messaging; using QSB.Messaging;
using QSB.Utility; using QSB.Utility;
using System;
using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
@ -129,7 +129,7 @@ namespace QSB.Animation
private void OnSuitUp() => SendTrigger(AnimTrigger.SuitUp); private void OnSuitUp() => SendTrigger(AnimTrigger.SuitUp);
private void OnSuitDown() => SendTrigger(AnimTrigger.SuitDown); private void OnSuitDown() => SendTrigger(AnimTrigger.SuitDown);
private void SendTrigger(AnimTrigger trigger, float value = 0) public void SendTrigger(AnimTrigger trigger, float value = 0)
{ {
var message = new AnimTriggerMessage var message = new AnimTriggerMessage
{ {

4
QSB/DeathSync/DeathPatches.cs
View File

@ -1,5 +1,5 @@
using System.Linq; using QSB.Events;
using QSB.Events; using System.Linq;
namespace QSB.DeathSync namespace QSB.DeathSync
{ {

6
QSB/DeathSync/PreventShipDestruction.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using Harmony;
using System.Reflection.Emit;
using Harmony;
using OWML.ModHelper.Events; using OWML.ModHelper.Events;
using System.Collections.Generic;
using System.Reflection.Emit;
using UnityEngine; using UnityEngine;
namespace QSB.DeathSync namespace QSB.DeathSync

4
QSB/DeathSync/RespawnOnDeath.cs
View File

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

4
QSB/ElevatorSync/ElevatorManager.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using QSB.WorldSync;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using QSB.WorldSync;
using UnityEngine; using UnityEngine;
namespace QSB.ElevatorSync namespace QSB.ElevatorSync

7
QSB/PlayerInfo.cs
View File

@ -1,8 +1,8 @@
using System; using QSB.Tools;
using System.Linq;
using QSB.Tools;
using QSB.TransformSync; using QSB.TransformSync;
using QSB.Utility; using QSB.Utility;
using System;
using System.Linq;
using UnityEngine; using UnityEngine;
namespace QSB namespace QSB
@ -10,7 +10,6 @@ namespace QSB
public class PlayerInfo public class PlayerInfo
{ {
public uint NetId { get; } public uint NetId { get; }
public GameObject Body { get; set; }
public GameObject Camera { get; set; } public GameObject Camera { get; set; }
public GameObject ProbeBody { get; set; } public GameObject ProbeBody { get; set; }
public QSBProbe Probe { get; set; } public QSBProbe Probe { get; set; }

10
QSB/PlayerRegistry.cs
View File

@ -1,11 +1,11 @@
using System.Collections.Generic; using QSB.Animation;
using System.Linq;
using QSB.TransformSync;
using QSB.Animation;
using QSB.Messaging; using QSB.Messaging;
using System; using QSB.TransformSync;
using QSB.Utility; using QSB.Utility;
using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
namespace QSB namespace QSB
{ {

4
QSB/QSBNetworkLobby.cs
View File

@ -1,6 +1,6 @@
using System; using OWML.ModHelper.Events;
using System;
using System.Linq; using System.Linq;
using OWML.ModHelper.Events;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;

6
QSB/QSBNetworkManager.cs
View File

@ -1,12 +1,12 @@
using System; using QSB.Animation;
using System.Linq;
using QSB.Animation;
using QSB.DeathSync; using QSB.DeathSync;
using QSB.Events; using QSB.Events;
using QSB.GeyserSync; using QSB.GeyserSync;
using QSB.TimeSync; using QSB.TimeSync;
using QSB.TransformSync; using QSB.TransformSync;
using QSB.Utility; using QSB.Utility;
using System;
using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;

4
QSB/Tools/PlayerToolsManager.cs
View File

@ -1,5 +1,5 @@
using System.Linq; using OWML.ModHelper.Events;
using OWML.ModHelper.Events; using System.Linq;
using UnityEngine; using UnityEngine;
namespace QSB.Tools namespace QSB.Tools

2
QSB/TransformSync/PlayerCameraSync.cs
View File

@ -19,8 +19,6 @@ namespace QSB.TransformSync
{ {
var body = Locator.GetPlayerCamera().gameObject.transform; var body = Locator.GetPlayerCamera().gameObject.transform;
PlayerToolsManager.Init(body);
Player.Camera = body.gameObject; Player.Camera = body.gameObject;
Player.IsReady = true; Player.IsReady = true;

12
QSB/TransformSync/PlayerProbeSync.cs
View File

@ -9,7 +9,7 @@ namespace QSB.TransformSync
protected override uint PlayerIdOffset => 3; protected override uint PlayerIdOffset => 3;
public Transform bodyTransform; private Transform _disabledSocket;
public override void OnStartLocalPlayer() public override void OnStartLocalPlayer()
{ {
@ -25,8 +25,7 @@ namespace QSB.TransformSync
{ {
var body = GetProbe(); var body = GetProbe();
bodyTransform = body; _disabledSocket = Player.Camera.transform;
Player.ProbeBody = body.gameObject; Player.ProbeBody = body.gameObject;
return body; return body;
@ -44,8 +43,7 @@ namespace QSB.TransformSync
PlayerToolsManager.CreateProbe(body, Player); PlayerToolsManager.CreateProbe(body, Player);
bodyTransform = body; _disabledSocket = Player.ProbeLauncher.ToolGameObject.transform;
Player.ProbeBody = body.gameObject; Player.ProbeBody = body.gameObject;
return body; return body;
@ -60,7 +58,7 @@ namespace QSB.TransformSync
} }
if (hasAuthority) if (hasAuthority)
{ {
transform.position = ReferenceSector.Transform.InverseTransformPoint(Player.ProbeLauncher.ToolGameObject.transform.position); transform.position = ReferenceSector.Transform.InverseTransformPoint(_disabledSocket.position);
return; return;
} }
if (SyncedTransform.position == Vector3.zero || if (SyncedTransform.position == Vector3.zero ||
@ -68,7 +66,7 @@ namespace QSB.TransformSync
{ {
return; return;
} }
SyncedTransform.localPosition = ReferenceSector.Transform.InverseTransformPoint(Player.ProbeLauncher.ToolGameObject.transform.position); SyncedTransform.localPosition = ReferenceSector.Transform.InverseTransformPoint(_disabledSocket.position);
} }
public override bool IsReady => Locator.GetProbe() != null && PlayerRegistry.PlayerExists(PlayerId) && Player.IsReady; public override bool IsReady => Locator.GetProbe() != null && PlayerRegistry.PlayerExists(PlayerId) && Player.IsReady;

4
QSB/TransformSync/PlayerTransformSync.cs
View File

@ -30,8 +30,6 @@ namespace QSB.TransformSync
GetComponent<AnimationSync>().InitLocal(body); GetComponent<AnimationSync>().InitLocal(body);
Player.Body = body.gameObject;
return body; return body;
} }
@ -44,8 +42,6 @@ namespace QSB.TransformSync
var marker = body.gameObject.AddComponent<PlayerHUDMarker>(); var marker = body.gameObject.AddComponent<PlayerHUDMarker>();
marker.Init(Player); marker.Init(Player);
Player.Body = body.gameObject;
return body; return body;
} }

4
QSB/TransformSync/QSBSectorManager.cs
View File

@ -1,5 +1,5 @@
using System.Linq; using QSB.WorldSync;
using QSB.WorldSync; using System.Linq;
using UnityEngine; using UnityEngine;
namespace QSB.TransformSync namespace QSB.TransformSync

4
QSB/TransformSync/SectorSync.cs
View File

@ -1,5 +1,5 @@
using UnityEngine; using QSB.Events;
using QSB.Events; using UnityEngine;
namespace QSB.TransformSync namespace QSB.TransformSync
{ {

4
QSB/Utility/DebugLog.cs
View File

@ -1,7 +1,7 @@
using System; using OWML.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OWML.Common;
namespace QSB.Utility namespace QSB.Utility
{ {