mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-01 03:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix #527

Browse Source
This commit is contained in:
Mister_Nebula 2022-07-21 09:54:43 +01:00
parent 5a433859e6
commit 0782b5c945
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
QSB/Tools/ProbeTool/ProbeListener.cs
View File

@ -1,4 +1,5 @@
using QSB.Messaging;
using QSB.Player;
using QSB.Tools.ProbeTool.Messages;
using UnityEngine;
@ -35,19 +36,34 @@ internal class ProbeListener : MonoBehaviour
}
private static void OnLaunchProbe()
=> new PlayerProbeEventMessage(ProbeEvent.Launch).Send();
{
QSBPlayerManager.LocalPlayer.ProbeActive = true;
new PlayerProbeEventMessage(ProbeEvent.Launch).Send();
}
private static void OnAnchorProbe()
=> new PlayerProbeEventMessage(ProbeEvent.Anchor).Send();
{
QSBPlayerManager.LocalPlayer.ProbeActive = true;
new PlayerProbeEventMessage(ProbeEvent.Anchor).Send();
}
private static void OnUnanchorProbe()
=> new PlayerProbeEventMessage(ProbeEvent.Unanchor).Send();
{
QSBPlayerManager.LocalPlayer.ProbeActive = true;
new PlayerProbeEventMessage(ProbeEvent.Unanchor).Send();
}
private static void OnRetrieveProbe()
=> new PlayerProbeEventMessage(ProbeEvent.Retrieve).Send();
{
QSBPlayerManager.LocalPlayer.ProbeActive = false;
new PlayerProbeEventMessage(ProbeEvent.Retrieve).Send();
}
private static void OnProbeDestroyed()
=> new PlayerProbeEventMessage(ProbeEvent.Destroy).Send();
{
QSBPlayerManager.LocalPlayer.ProbeActive = false;
new PlayerProbeEventMessage(ProbeEvent.Destroy).Send();
}
private static void OnStartRetrieveProbe(float length)
=> new ProbeStartRetrieveMessage(length).Send();

32
QSB/Tools/ProbeTool/QSBProbe.cs
View File

@ -43,9 +43,25 @@ public class QSBProbe : MonoBehaviour, ILightSource
{
_lightSourceVol = this.GetRequiredComponentInChildren<LightSourceVolume>();
_lightSourceVol.LinkLightSource(this);
_lightSourceVol.SetVolumeActivation(false);
gameObject.SetActive(false);
if (_owner == null)
{
// i dont *think* this is possible, but honestly i dont fucking know anymore
DebugLog.DebugWrite($"Warning - QSBProbe ran Start() without an assigned owner!", OWML.Common.MessageType.Warning);
_lightSourceVol.SetVolumeActivation(false);
gameObject.SetActive(false);
}
if (_owner.ProbeActive)
{
_lightSourceVol.SetVolumeActivation(true);
gameObject.SetActive(true);
}
else
{
_lightSourceVol.SetVolumeActivation(false);
gameObject.SetActive(false);
}
}
protected void OnDestroy() => _warpEffect.OnWarpComplete -= OnWarpComplete;
@ -83,7 +99,7 @@ public class QSBProbe : MonoBehaviour, ILightSource
{
case ProbeEvent.Launch:
_anchored = false;
_owner.ProbeActive = true;
gameObject.SetActive(true);
_lightSourceVol.SetVolumeActivation(true);
transform.position = _owner.ProbeLauncherTool.transform.position;
@ -99,7 +115,7 @@ public class QSBProbe : MonoBehaviour, ILightSource
break;
case ProbeEvent.Anchor:
_anchored = true;
_owner.ProbeActive = true; // just in case it was missed
if (OnAnchorProbe == null)
{
DebugLog.ToConsole($"Warning - OnAnchorProbe is null!", OWML.Common.MessageType.Warning);
@ -110,10 +126,12 @@ public class QSBProbe : MonoBehaviour, ILightSource
break;
case ProbeEvent.Unanchor:
_anchored = false;
_owner.ProbeActive = true; // just in case it was missed
OnUnanchorProbe();
break;
case ProbeEvent.Retrieve:
_anchored = false;
_owner.ProbeActive = false;
if (OnRetrieveProbe == null)
{
DebugLog.ToConsole($"Warning - OnRetrieveProbe is null!", OWML.Common.MessageType.Warning);
@ -125,7 +143,7 @@ public class QSBProbe : MonoBehaviour, ILightSource
case ProbeEvent.Destroy:
_anchored = false;
Destroy(gameObject);
_owner.ProbeActive = false;
if (OnProbeDestroyed == null)
{
DebugLog.ToConsole($"Warning - OnProbeDestroyed is null!", OWML.Common.MessageType.Warning);
@ -164,6 +182,10 @@ public class QSBProbe : MonoBehaviour, ILightSource
OnStartRetrieveProbe(duration);
}
else
{
DebugLog.DebugWrite($"Warning - Tried to retrieve probe (owner: {_owner}) that was already retrieving?", OWML.Common.MessageType.Warning);
}
}
public bool CheckIlluminationAtPoint(Vector3 point, float buffer = 0f, float maxDistance = float.PositiveInfinity)