mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-21 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

event names (#152)

Browse Source
This commit is contained in:
AmazingAlek 2020-08-10 19:24:28 +02:00 committed by GitHub
parent d8306b8860
commit 359902399d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
QSB/Animation/AnimationSync.cs
View File

@ -1,5 +1,6 @@
using System;
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.Messaging;
using UnityEngine;
using UnityEngine.Networking;
@ -71,8 +72,8 @@ namespace QSB.Animation
_playerController.OnBecomeGrounded += OnBecomeGrounded;
_playerController.OnBecomeUngrounded += OnBecomeUngrounded;
GlobalMessenger.AddListener("SuitUp", OnSuitUp);
GlobalMessenger.AddListener("RemoveSuit", OnSuitDown);
GlobalMessenger.AddListener(EventNames.SuitUp, OnSuitUp);
GlobalMessenger.AddListener(EventNames.RemoveSuit, OnSuitDown);
}
public void InitRemote(Transform body)

31
QSB/Events/EventNames.cs Normal file
View File

@ -0,0 +1,31 @@
namespace QSB.Events
{
public static class EventNames
{
public static string TurnOnFlashlight = "TurnOnFlashlight";
public static string TurnOffFlashlight = "TurnOffFlashlight";
public static string LaunchProbe = "LaunchProbe";
public static string RetrieveProbe = "RetrieveProbe";
public static string ProbeLauncherEquipped = "ProbeLauncherEquipped";
public static string ProbeLauncherUnequipped = "ProbeLauncherUnequipped";
public static string EquipSignalscope = "EquipSignalscope";
public static string UnequipSignalscope = "UnequipSignalscope";
public static string SuitUp = "SuitUp";
public static string RemoveSuit = "RemoveSuit";
public static string EquipTranslator = "EquipTranslator";
public static string UnequipTranslator = "UnequipTranslator";
public static string ExitShip = "ExitShip";
public static string RestartTimeLoop = "RestartTimeLoop";
public static string WakeUp = "WakeUp";
public static string QSBPlayerDeath = "QSBPlayerDeath";
public static string QSBPlayerJoin = "QSBPlayerJoin";
public static string QSBPlayerLeave = "QSBPlayerLeave";
public static string QSBPlayerReady = "QSBPlayerReady";
public static string QSBSectorChange = "QSBSectorChange";
public static string QSBPlayerStatesRequest = "QSBPlayerStatesRequest";
public static string QSBServerTime = "QSBServerTime";
public static string QSBOnProbeAnchor = "QSBOnProbeAnchor";
public static string QSBOnProbeWarp = "QSBOnProbeWarp";
}
}

2
QSB/Events/PlayerDeathEvent.cs
View File

@ -9,7 +9,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<DeathType>.AddListener("QSBPlayerDeath", type => SendEvent(CreateMessage(type)));
GlobalMessenger<DeathType>.AddListener(EventNames.QSBPlayerDeath, type => SendEvent(CreateMessage(type)));
}
private PlayerDeathMessage CreateMessage(DeathType type) => new PlayerDeathMessage

4
QSB/Events/PlayerFlashlightEvent.cs
View File

@ -8,8 +8,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger.AddListener("TurnOnFlashlight", () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener("TurnOffFlashlight", () => SendEvent(CreateMessage(false)));
GlobalMessenger.AddListener(EventNames.TurnOnFlashlight, () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener(EventNames.TurnOffFlashlight, () => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

2
QSB/Events/PlayerJoinEvent.cs
View File

@ -10,7 +10,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<string>.AddListener("QSBPlayerJoin", name => SendEvent(CreateMessage(name)));
GlobalMessenger<string>.AddListener(EventNames.QSBPlayerJoin, name => SendEvent(CreateMessage(name)));
}
private PlayerJoinMessage CreateMessage(string name) => new PlayerJoinMessage

2
QSB/Events/PlayerLeaveEvent.cs
View File

@ -12,7 +12,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<uint, uint[]>.AddListener("QSBPlayerLeave", (id, objects) => SendEvent(CreateMessage(id, objects)));
GlobalMessenger<uint, uint[]>.AddListener(EventNames.QSBPlayerLeave, (id, objects) => SendEvent(CreateMessage(id, objects)));
}
private PlayerLeaveMessage CreateMessage(uint id, uint[] objects) => new PlayerLeaveMessage

4
QSB/Events/PlayerProbeEvent.cs
View File

@ -8,8 +8,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<SurveyorProbe>.AddListener("LaunchProbe", probe => SendEvent(CreateMessage(true)));
GlobalMessenger<SurveyorProbe>.AddListener("RetrieveProbe", probe => SendEvent(CreateMessage(false)));
GlobalMessenger<SurveyorProbe>.AddListener(EventNames.LaunchProbe, probe => SendEvent(CreateMessage(true)));
GlobalMessenger<SurveyorProbe>.AddListener(EventNames.RetrieveProbe, probe => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

4
QSB/Events/PlayerProbeLauncherEvent.cs
View File

@ -9,8 +9,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<ProbeLauncher>.AddListener("ProbeLauncherEquipped", var => SendEvent(CreateMessage(true)));
GlobalMessenger<ProbeLauncher>.AddListener("ProbeLauncherUnequipped", var => SendEvent(CreateMessage(false)));
GlobalMessenger<ProbeLauncher>.AddListener(EventNames.ProbeLauncherEquipped, var => SendEvent(CreateMessage(true)));
GlobalMessenger<ProbeLauncher>.AddListener(EventNames.ProbeLauncherUnequipped, var => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

2
QSB/Events/PlayerReadyEvent.cs
View File

@ -8,7 +8,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<bool>.AddListener("QSBPlayerReady", ready => SendEvent(CreateMessage(ready)));
GlobalMessenger<bool>.AddListener(EventNames.QSBPlayerReady, ready => SendEvent(CreateMessage(ready)));
}
private ToggleMessage CreateMessage(bool ready) => new ToggleMessage

2
QSB/Events/PlayerSectorEvent.cs
View File

@ -10,7 +10,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<uint, int, string>.AddListener("QSBSectorChange", (netId, id, name) => SendEvent(CreateMessage(netId, id, name)));
GlobalMessenger<uint, int, string>.AddListener(EventNames.QSBSectorChange, (netId, id, name) => SendEvent(CreateMessage(netId, id, name)));
}
private SectorMessage CreateMessage(uint netId, int id, string name) => new SectorMessage

4
QSB/Events/PlayerSignalscopeEvent.cs
View File

@ -9,8 +9,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<Signalscope>.AddListener("EquipSignalscope", var => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener("UnequipSignalscope", () => SendEvent(CreateMessage(false)));
GlobalMessenger<Signalscope>.AddListener(EventNames.EquipSignalscope, var => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener(EventNames.UnequipSignalscope, () => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

2
QSB/Events/PlayerStatesRequestEvent.cs
View File

@ -9,7 +9,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger.AddListener("QSBPlayerStatesRequest", () => SendEvent(CreateMessage()));
GlobalMessenger.AddListener(EventNames.QSBPlayerStatesRequest, () => SendEvent(CreateMessage()));
}
private PlayerMessage CreateMessage() => new PlayerMessage

4
QSB/Events/PlayerSuitEvent.cs
View File

@ -8,8 +8,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger.AddListener("SuitUp", () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener("RemoveSuit", () => SendEvent(CreateMessage(false)));
GlobalMessenger.AddListener(EventNames.SuitUp, () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener(EventNames.RemoveSuit, () => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

4
QSB/Events/PlayerTranslatorEvent.cs
View File

@ -9,8 +9,8 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger.AddListener("EquipTranslator", () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener("UnequipTranslator", () => SendEvent(CreateMessage(false)));
GlobalMessenger.AddListener(EventNames.EquipTranslator, () => SendEvent(CreateMessage(true)));
GlobalMessenger.AddListener(EventNames.UnequipTranslator, () => SendEvent(CreateMessage(false)));
}
private ToggleMessage CreateMessage(bool value) => new ToggleMessage

2
QSB/Events/ServerTimeEvent.cs
View File

@ -9,7 +9,7 @@ namespace QSB.Events
public override void SetupListener()
{
GlobalMessenger<float, int>.AddListener("QSBServerTime", (time, count) => SendEvent(CreateMessage(time, count)));
GlobalMessenger<float, int>.AddListener(EventNames.QSBServerTime, (time, count) => SendEvent(CreateMessage(time, count)));
}
private ServerTimeMessage CreateMessage(float time, int count) => new ServerTimeMessage

7
QSB/QSB.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using OWML.ModHelper;
using QSB.Events;
using QSB.Utility;
using UnityEngine;
using UnityEngine.Networking;
@ -28,14 +29,14 @@ namespace QSB
gameObject.AddComponent<DebugActions>();
gameObject.AddComponent<UnityHelper>();
GlobalMessenger.AddListener("RestartTimeLoop", OnLoopStart);
GlobalMessenger.AddListener("WakeUp", OnWakeUp);
GlobalMessenger.AddListener(EventNames.RestartTimeLoop, OnLoopStart);
GlobalMessenger.AddListener(EventNames.WakeUp, OnWakeUp);
}
private void OnWakeUp()
{
WokenUp = true;
GlobalMessenger.FireEvent("QSBPlayerStatesRequest");
GlobalMessenger.FireEvent(EventNames.QSBPlayerStatesRequest);
}
private void OnLoopStart()

1
QSB/QSB.csproj
View File

@ -115,6 +115,7 @@
<Compile Include="Animation\AnimatorMirror.cs" />
<Compile Include="Animation\AnimFloatParam.cs" />
<Compile Include="Animation\AnimTrigger.cs" />
<Compile Include="Events\EventNames.cs" />
<Compile Include="Events\PlayerDeathEvent.cs" />
<Compile Include="Events\PlayerFlashlightEvent.cs" />
<Compile Include="Events\PlayerJoinEvent.cs" />

4
QSB/QSBNetworkManager.cs
View File

@ -134,7 +134,7 @@ namespace QSB
UnityHelper.Instance.RunWhen(() => PlayerTransformSync.LocalInstance != null, EventList.Init);
UnityHelper.Instance.RunWhen(() => EventList.Ready,
() => GlobalMessenger<string>.FireEvent("QSBPlayerJoin", _playerName));
() => GlobalMessenger<string>.FireEvent(EventNames.QSBPlayerJoin, _playerName));
}
public override void OnStopClient() // Called on the client when closing connection
@ -156,7 +156,7 @@ namespace QSB
var playerId = connection.playerControllers[0].gameObject.GetComponent<PlayerTransformSync>().netId.Value;
var objectIds = connection.clientOwnedObjects.Select(x => x.Value).ToArray();
GlobalMessenger<uint, uint[]>.FireEvent("QSBPlayerLeave", playerId, objectIds);
GlobalMessenger<uint, uint[]>.FireEvent(EventNames.QSBPlayerLeave, playerId, objectIds);
base.OnServerDisconnect(connection);
}

5
QSB/TimeSync/RespawnOnDeath.cs
View File

@ -1,5 +1,6 @@
using System.Linq;
using OWML.ModHelper.Events;
using QSB.Events;
using UnityEngine;
namespace QSB.TimeSync
@ -100,7 +101,7 @@ namespace QSB.TimeSync
_cockpitController.Invoke("CompleteExitFlightConsole");
_hatchController.SetValue("_isPlayerInShip", false);
_hatchController.Invoke("OpenHatch");
GlobalMessenger.FireEvent("ExitShip");
GlobalMessenger.FireEvent(EventNames.ExitShip);
}
public void ResetPlayer()
@ -151,7 +152,7 @@ namespace QSB.TimeSync
public static void BroadcastDeath(DeathType deathType)
{
GlobalMessenger<DeathType>.FireEvent("QSBPlayerDeath", deathType);
GlobalMessenger<DeathType>.FireEvent(EventNames.QSBPlayerDeath, deathType);
}
}
}

9
QSB/TimeSync/WakeUpSync.cs
View File

@ -1,4 +1,5 @@
using QSB.Messaging;
using QSB.Events;
using QSB.Messaging;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.SceneManagement;
@ -46,7 +47,7 @@ namespace QSB.TimeSync
SceneManager.sceneLoaded += OnSceneLoaded;
}
GlobalMessenger.AddListener("RestartTimeLoop", OnLoopStart);
GlobalMessenger.AddListener(EventNames.RestartTimeLoop, OnLoopStart);
}
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@ -68,7 +69,7 @@ namespace QSB.TimeSync
private void Init()
{
GlobalMessenger.FireEvent("QSBPlayerStatesRequest");
GlobalMessenger.FireEvent(EventNames.QSBPlayerStatesRequest);
_state = State.Loaded;
gameObject.AddComponent<PreserveTimeScale>();
if (isServer)
@ -88,7 +89,7 @@ namespace QSB.TimeSync
private void SendServerTime()
{
GlobalMessenger<float, int>.FireEvent("QSBServerTime", Time.timeSinceLevelLoad, _localLoopCount);
GlobalMessenger<float, int>.FireEvent(EventNames.QSBServerTime, Time.timeSinceLevelLoad, _localLoopCount);
}
public void OnClientReceiveMessage(ServerTimeMessage message)

7
QSB/TransformSync/PlayerCameraSync.cs
View File

@ -1,4 +1,5 @@
using QSB.Tools;
using QSB.Events;
using QSB.Tools;
using UnityEngine;
namespace QSB.TransformSync
@ -23,8 +24,8 @@ namespace QSB.TransformSync
Player.Camera = body.gameObject;
Player.IsReady = true;
GlobalMessenger<bool>.FireEvent("QSBPlayerReady", true);
GlobalMessenger.FireEvent("QSBPlayerStatesRequest");
GlobalMessenger<bool>.FireEvent(EventNames.QSBPlayerReady, true);
GlobalMessenger.FireEvent(EventNames.QSBPlayerStatesRequest);
return body;
}

3
QSB/TransformSync/SectorSync.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using UnityEngine;
using System.Linq;
using QSB.Events;
using QSB.Utility;
namespace QSB.TransformSync
@ -38,7 +39,7 @@ namespace QSB.TransformSync
private void SendSector(uint id, Sector sector)
{
DebugLog.ToScreen($"Sending sector {sector.name} for id {id}");
GlobalMessenger<uint, int, string>.FireEvent("QSBSectorChange", id, (int)sector.GetName(), sector.name);
GlobalMessenger<uint, int, string>.FireEvent(EventNames.QSBSectorChange, id, (int)sector.GetName(), sector.name);
}
public Sector FindSectorByName(Sector.Name sectorName, string goName)

5
QSB/Utility/Patches.cs
View File

@ -1,4 +1,5 @@
using OWML.Common;
using QSB.Events;
namespace QSB.Utility
{
@ -6,14 +7,14 @@ namespace QSB.Utility
{
private static void ProbeAnchor()
{
GlobalMessenger.FireEvent("QSBOnProbeAnchor");
GlobalMessenger.FireEvent(EventNames.QSBOnProbeAnchor);
}
private static bool ProbeWarp(ref bool ____isRetrieving)
{
if (!____isRetrieving)
{
GlobalMessenger.FireEvent("QSBOnProbeWarp");
GlobalMessenger.FireEvent(EventNames.QSBOnProbeWarp);
}
return true;
}