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

use repel volume instead of game pause

Browse Source
This commit is contained in:
Will Corby 2022-01-02 18:45:46 -08:00
parent e0cf9a9d2d
commit b6e60fbbab
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
QSB/EyeOfTheUniverse/CosmicInflation/InflationManager.cs
View File

@ -30,11 +30,14 @@ namespace QSB.EyeOfTheUniverse.CosmicInflation
{
_playersInFog.Remove(QSBPlayerManager.GetPlayer(id));
// count - 1 because this happens right before player is actually removed
if (_playersInFog.Count == QSBPlayerManager.PlayerList.Count - 1)
// wait 1 frame for player to be removed
QSBCore.UnityEvents.FireOnNextUpdate(() =>
{
StartCollapse();
}
if (QSBCore.IsInMultiplayer && _playersInFog.Count == QSBPlayerManager.PlayerList.Count)
{
StartCollapse();
}
});
}
protected override void RebuildWorldObjects(OWScene scene)
@ -60,14 +63,18 @@ namespace QSB.EyeOfTheUniverse.CosmicInflation
_controller._probeDestroyTrigger.SetTriggerActivation(false);
new EnterLeaveMessage(EnterLeaveType.EnterCosmicFog).Send();
DebugLog.DebugWrite("pause, disable input, wait for other players to enter");
DebugLog.DebugWrite("disable input, wait for other players to enter");
var repelVolume = (WhiteHoleFluidVolume)_controller._repelVolume;
repelVolume._flowSpeed = -repelVolume._flowSpeed;
repelVolume._massiveFlowSpeed = -repelVolume._massiveFlowSpeed;
repelVolume.SetVolumeActivation(true);
QSBPlayerManager.HideAllPlayers();
ReticleController.Hide();
Locator.GetFlashlight().TurnOff(false);
Locator.GetPromptManager().SetPromptsVisible(false);
OWInput.ChangeInputMode(InputMode.None);
OWTime.SetTimeScale(0);
}
}
@ -89,9 +96,10 @@ namespace QSB.EyeOfTheUniverse.CosmicInflation
private void StartCollapse()
{
DebugLog.DebugWrite("unpause, fade in everyone, fog sphere collapse");
OWTime.SetTimeScale(1);
DebugLog.DebugWrite("fade in everyone, fog sphere collapse");
var repelVolume = (WhiteHoleFluidVolume)_controller._repelVolume;
repelVolume.SetVolumeActivation(false);
QSBPlayerManager.ShowAllPlayers();
_controller._state = CosmicInflationController.State.Collapsing;

11
QSB/EyeOfTheUniverse/EyeStateSync/Messages/EyeStateMessage.cs
View File

@ -1,7 +1,6 @@
using QSB.Messaging;
using QSB.Player;
using QSB.Player.TransformSync;
using QSB.TimeSync;
using QSB.WorldSync;
namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
@ -25,22 +24,12 @@ namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
public override void OnReceiveLocal()
{
QSBPlayerManager.LocalPlayer.EyeState = Value;
if (Value >= EyeState.ForestIsDark)
{
WakeUpSync.LocalInstance.EyeDisable = true;
}
}
public override void OnReceiveRemote()
{
var player = QSBPlayerManager.GetPlayer(From);
player.EyeState = Value;
if (Value >= EyeState.ForestIsDark)
{
WakeUpSync.LocalInstance.EyeDisable = true;
}
}
}
}

8
QSB/TimeSync/WakeUpSync.cs
View File

@ -34,8 +34,6 @@ namespace QSB.TimeSync
private int _serverLoopCount;
private bool _hasWokenUp;
public bool EyeDisable;
public override void OnStartLocalPlayer() => LocalInstance = this;
public void OnDisconnect()
@ -254,12 +252,6 @@ namespace QSB.TimeSync
{
UpdateClient();
}
if (EyeDisable)
{
OnDisconnect();
enabled = false;
}
}
private void UpdateServer()