From 3860b2aacc1b2d812e4b837cd94d848f2ff73f7e Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Thu, 25 Nov 2021 15:38:05 +0000 Subject: [PATCH] add newlines --- QSB/Anglerfish/Patches/AnglerPatches.cs | 2 ++ QSB/Anglerfish/TransformSync/AnglerTransformSync.cs | 1 + QSB/Anglerfish/WorldObjects/QSBAngler.cs | 2 ++ QSB/Animation/NPC/Patches/SolanumPatches.cs | 8 ++++++++ QSB/Animation/NPC/Patches/TravelerControllerPatches.cs | 10 ++++++++++ QSB/ClientServerStateSync/ClientStateManager.cs | 2 ++ .../LightSensorSync/Patches/LightSensorPatches.cs | 2 ++ QSB/Menus/MenuManager.cs | 2 +- QSB/MeteorSync/Events/FragmentResyncEvent.cs | 3 +++ QSB/MeteorSync/Patches/MeteorClientPatches.cs | 7 +++++++ QSB/MeteorSync/Patches/MeteorServerPatches.cs | 8 ++++++++ QSB/MeteorSync/WorldObjects/QSBMeteor.cs | 2 ++ QSB/QuantumSync/Patches/ServerQuantumPatches.cs | 2 ++ QSB/ShipSync/TransformSync/ShipTransformSync.cs | 1 + QSB/Syncs/SyncBase.cs | 1 + QSB/TimeSync/TimeSyncUI.cs | 1 + QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs | 5 +++++ QSB/Utility/DebugGUI.cs | 1 + 18 files changed, 59 insertions(+), 1 deletion(-) diff --git a/QSB/Anglerfish/Patches/AnglerPatches.cs b/QSB/Anglerfish/Patches/AnglerPatches.cs index f062920a..198f87fa 100644 --- a/QSB/Anglerfish/Patches/AnglerPatches.cs +++ b/QSB/Anglerfish/Patches/AnglerPatches.cs @@ -157,6 +157,7 @@ namespace QSB.Anglerfish.Patches QSBEventManager.FireEvent(EventNames.QSBAnglerChangeState, qsbAngler); break; } + __instance.ChangeState(AnglerfishController.AnglerState.Lurking); QSBEventManager.FireEvent(EventNames.QSBAnglerChangeState, qsbAngler); break; @@ -174,6 +175,7 @@ namespace QSB.Anglerfish.Patches { return false; } + qsbAngler.FixedUpdate(); if (__instance._anglerBody.GetVelocity().sqrMagnitude > (double)Mathf.Pow(__instance._chaseSpeed * 1.5f, 2f)) diff --git a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs index edff6c7c..50390461 100644 --- a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs +++ b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs @@ -60,6 +60,7 @@ namespace QSB.Anglerfish.TransformSync { return false; } + _shouldUpdate = false; return base.UpdateTransform(); } diff --git a/QSB/Anglerfish/WorldObjects/QSBAngler.cs b/QSB/Anglerfish/WorldObjects/QSBAngler.cs index 48faf5fb..007c02c2 100644 --- a/QSB/Anglerfish/WorldObjects/QSBAngler.cs +++ b/QSB/Anglerfish/WorldObjects/QSBAngler.cs @@ -49,6 +49,7 @@ namespace QSB.Anglerfish.WorldObjects { identity.RemoveClientAuthority(identity.ClientAuthorityOwner); } + identity.AssignClientAuthority(conn); DebugLog.DebugWrite($"angler {ObjectId} - transferred authority to {id}"); @@ -60,6 +61,7 @@ namespace QSB.Anglerfish.WorldObjects { return; } + TargetVelocity = TargetTransform.position - _lastTargetPosition; _lastTargetPosition = TargetTransform.position; } diff --git a/QSB/Animation/NPC/Patches/SolanumPatches.cs b/QSB/Animation/NPC/Patches/SolanumPatches.cs index 4405b22f..30761ba6 100644 --- a/QSB/Animation/NPC/Patches/SolanumPatches.cs +++ b/QSB/Animation/NPC/Patches/SolanumPatches.cs @@ -82,6 +82,7 @@ namespace QSB.Animation.NPC.Patches __instance._state = NomaiConversationManager.State.WatchingPlayer; __instance._solanumAnimController.StartWatchingPlayer(); } + break; case NomaiConversationManager.State.WatchingPlayer: @@ -143,6 +144,7 @@ namespace QSB.Animation.NPC.Patches { __instance.ResetStoneGestureTimer(); } + __instance._stoneGestureTimer -= Time.deltaTime; if (__instance._stoneGestureTimer < 0f) { @@ -156,6 +158,7 @@ namespace QSB.Animation.NPC.Patches { __instance.ResetCairnGestureTimer(); } + __instance._cairnGestureTimer -= Time.deltaTime; if (__instance._cairnGestureTimer < 0f) { @@ -165,6 +168,7 @@ namespace QSB.Animation.NPC.Patches } } } + break; case NomaiConversationManager.State.CreatingStones: @@ -173,6 +177,7 @@ namespace QSB.Animation.NPC.Patches __instance._state = NomaiConversationManager.State.WatchingPlayer; __instance._conversationStonesCreated = true; } + break; case NomaiConversationManager.State.RaisingCairns: @@ -183,6 +188,7 @@ namespace QSB.Animation.NPC.Patches __instance._stoneSocketATrigger.SetActivation(true); __instance._stoneSocketBTrigger.SetActivation(true); } + break; case NomaiConversationManager.State.ErasingResponse: @@ -202,6 +208,7 @@ namespace QSB.Animation.NPC.Patches __instance._activeResponseText.Show(); } } + break; case NomaiConversationManager.State.WritingResponse: @@ -210,6 +217,7 @@ namespace QSB.Animation.NPC.Patches __instance._state = NomaiConversationManager.State.WatchingPlayer; __instance._solanumAnimController.StopWritingMessage(true); } + break; } diff --git a/QSB/Animation/NPC/Patches/TravelerControllerPatches.cs b/QSB/Animation/NPC/Patches/TravelerControllerPatches.cs index 6db99f75..04a9fe85 100644 --- a/QSB/Animation/NPC/Patches/TravelerControllerPatches.cs +++ b/QSB/Animation/NPC/Patches/TravelerControllerPatches.cs @@ -24,6 +24,7 @@ namespace QSB.Animation.NPC.Patches gabbro._animator.CrossFadeInFixedTime("Gabbro_Talking", 1.8f); gabbro._hammockAnimator.CrossFadeInFixedTime("GabbroHammock_Talking", 1.8f); } + Locator.GetTravelerAudioManager().StopTravelerAudio(gabbro.name); } else @@ -36,6 +37,7 @@ namespace QSB.Animation.NPC.Patches __instance._animator.SetTrigger("Talking"); } + Locator.GetTravelerAudioManager().StopTravelerAudio(__instance.name); if (__instance is ChertTravelerController chert) @@ -58,6 +60,7 @@ namespace QSB.Animation.NPC.Patches gabbro._animator.CrossFadeInFixedTime("Gabbro_Playing", gabbro._delayToRestartAudio, -1, -gabbro._delayToRestartAudio); gabbro._hammockAnimator.CrossFadeInFixedTime("GabbroHammock_Playing", gabbro._delayToRestartAudio, -1, -gabbro._delayToRestartAudio); } + Locator.GetTravelerAudioManager().PlayTravelerAudio(gabbro.name, gabbro._delayToRestartAudio); if (DialogueConditionManager.SharedInstance.GetConditionState("MAP_PROMPT_REMINDER") || DialogueConditionManager.SharedInstance.GetConditionState("MAP_PROMPT_ATTENTION")) { @@ -80,6 +83,7 @@ namespace QSB.Animation.NPC.Patches __instance._animator.SetTrigger("Playing"); } } + Locator.GetTravelerAudioManager().PlayTravelerAudio(__instance.name, __instance._delayToRestartAudio); } @@ -98,26 +102,32 @@ namespace QSB.Animation.NPC.Patches { return SignalName.Traveler_Esker; } + if (name.Contains("Chert")) { return SignalName.Traveler_Chert; } + if (name.Contains("Riebeck")) { return SignalName.Traveler_Riebeck; } + if (name.Contains("Gabbro")) { return SignalName.Traveler_Gabbro; } + if (name.Contains("Feldspar")) { return SignalName.Traveler_Feldspar; } + if (name.Contains("Nomai")) { return SignalName.Traveler_Nomai; } + if (name.Contains("Prisoner")) { return SignalName.Traveler_Prisoner; diff --git a/QSB/ClientServerStateSync/ClientStateManager.cs b/QSB/ClientServerStateSync/ClientStateManager.cs index a7e8fa08..c9b88e7e 100644 --- a/QSB/ClientServerStateSync/ClientStateManager.cs +++ b/QSB/ClientServerStateSync/ClientStateManager.cs @@ -65,6 +65,7 @@ namespace QSB.ClientServerStateSync // loading in from title screen newState = ClientState.AliveInSolarSystem; } + break; case OWScene.EyeOfTheUniverse: newState = ClientState.AliveInEye; @@ -112,6 +113,7 @@ namespace QSB.ClientServerStateSync newState = ClientState.AliveInSolarSystem; } } + break; case OWScene.EyeOfTheUniverse: newState = ClientState.WaitingForOthersToReadyInSolarSystem; diff --git a/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs b/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs index cd6ed8db..41ec66de 100644 --- a/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs +++ b/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs @@ -130,12 +130,14 @@ namespace QSB.EchoesOfTheEye.LightSensorSync.Patches break; } } + break; default: if (lightSourceType == LightSourceType.VOLUME_ONLY) { __instance._illuminated = true; } + break; } } diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs index 0b55a7fd..c24595ce 100644 --- a/QSB/Menus/MenuManager.cs +++ b/QSB/Menus/MenuManager.cs @@ -67,6 +67,7 @@ namespace QSB.Menus pauseCommandListener.RemovePauseCommandLock(); _addedPauseLock = false; } + OWTime.Unpause(OWTime.PauseType.System); OWInput.RestorePreviousInputs(); } @@ -153,7 +154,6 @@ namespace QSB.Menus titleAnimationController._optionsFadeDuration = small; titleAnimationController._optionsFadeSpacing = small; } - } private void Disconnect() diff --git a/QSB/MeteorSync/Events/FragmentResyncEvent.cs b/QSB/MeteorSync/Events/FragmentResyncEvent.cs index 7e51c613..c79a6829 100644 --- a/QSB/MeteorSync/Events/FragmentResyncEvent.cs +++ b/QSB/MeteorSync/Events/FragmentResyncEvent.cs @@ -77,10 +77,12 @@ namespace QSB.MeteorSync.Events { constantFluidDetector.SetDetectableFluid(whiteHoleVolume._fluidVolume); } + if (attachedForceDetector is not null and ConstantForceDetector constantForceDetector) { constantForceDetector.ClearAllFields(); } + qsbFragment.DetachableFragment.ChangeFragmentSector(whiteHoleVolume._whiteHoleSector, whiteHoleVolume._whiteHoleProxyShadowSuperGroup); @@ -94,6 +96,7 @@ namespace QSB.MeteorSync.Events DebugLog.ToConsole($"{qsbFragment.LogName} is thru white hole, but msg is not. fuck", MessageType.Error); return; } + if (qsbFragment.IsThruWhiteHole) { var debrisLeash = body.GetComponent(); diff --git a/QSB/MeteorSync/Patches/MeteorClientPatches.cs b/QSB/MeteorSync/Patches/MeteorClientPatches.cs index 2f8b943d..9c80e5fe 100644 --- a/QSB/MeteorSync/Patches/MeteorClientPatches.cs +++ b/QSB/MeteorSync/Patches/MeteorClientPatches.cs @@ -49,6 +49,7 @@ namespace QSB.MeteorSync.Patches meteorController.Initialize(__instance.transform, null, null); } } + if (meteorController != null) { var linearVelocity = __instance._parentBody.GetPointVelocity(__instance.transform.position) + (__instance.transform.TransformDirection(__instance._launchDirection) * qsbMeteorLauncher.LaunchSpeed); @@ -82,11 +83,13 @@ namespace QSB.MeteorSync.Patches particleSystem.transform.rotation = rotation; particleSystem.Play(); } + __instance._impactSource.PlayOneShot(AudioType.BH_MeteorImpact); foreach (var owCollider in __instance._owColliders) { owCollider.SetActivation(false); } + __instance._owRigidbody.MakeKinematic(); __instance.transform.SetParent(hitObject.GetAttachedOWRigidbody().transform); FragmentSurfaceProxy.UntrackMeteor(__instance); @@ -124,6 +127,7 @@ namespace QSB.MeteorSync.Patches { return true; } + var qsbFragment = QSBWorldSync.GetWorldFromUnity(__instance._detachableFragment._fragmentIntegrity); if (__instance.enabled) @@ -144,6 +148,7 @@ namespace QSB.MeteorSync.Patches { return true; } + var qsbFragment = QSBWorldSync.GetWorldFromUnity(__instance._detachableFragment._fragmentIntegrity); if (!__instance._deccelerating) @@ -169,9 +174,11 @@ namespace QSB.MeteorSync.Patches { __instance._detachableFragment.ComeToRest(__instance._anchorBody); } + __instance.enabled = false; return false; } + __instance._attachedBody.AddVelocityChange(velocityChange); } diff --git a/QSB/MeteorSync/Patches/MeteorServerPatches.cs b/QSB/MeteorSync/Patches/MeteorServerPatches.cs index 58df5e1c..929fccf3 100644 --- a/QSB/MeteorSync/Patches/MeteorServerPatches.cs +++ b/QSB/MeteorSync/Patches/MeteorServerPatches.cs @@ -30,6 +30,7 @@ namespace QSB.MeteorSync.Patches } } } + if (__instance._launchedDynamicMeteors != null) { for (var j = __instance._launchedDynamicMeteors.Count - 1; j >= 0; j--) @@ -45,6 +46,7 @@ namespace QSB.MeteorSync.Patches } } } + if (__instance._initialized && Time.time > __instance._lastLaunchTime + __instance._launchDelay) { if (!__instance._areParticlesPlaying) @@ -58,6 +60,7 @@ namespace QSB.MeteorSync.Patches var qsbMeteorLauncher = QSBWorldSync.GetWorldFromUnity(__instance); QSBEventManager.FireEvent(EventNames.QSBMeteorPreLaunch, qsbMeteorLauncher); } + if (Time.time > __instance._lastLaunchTime + __instance._launchDelay + 2.3f) { __instance.LaunchMeteor(); @@ -108,6 +111,7 @@ namespace QSB.MeteorSync.Patches __instance._launchedDynamicMeteors.Add(meteorController); } } + if (meteorController != null) { var qsbMeteorLauncher = QSBWorldSync.GetWorldFromUnity(__instance); @@ -172,6 +176,7 @@ namespace QSB.MeteorSync.Patches { return true; } + var qsbFragment = QSBWorldSync.GetWorldFromUnity(__instance._detachableFragment._fragmentIntegrity); if (__instance.enabled) @@ -192,6 +197,7 @@ namespace QSB.MeteorSync.Patches { return true; } + var qsbFragment = QSBWorldSync.GetWorldFromUnity(__instance._detachableFragment._fragmentIntegrity); if (!__instance._deccelerating) @@ -217,9 +223,11 @@ namespace QSB.MeteorSync.Patches { __instance._detachableFragment.ComeToRest(__instance._anchorBody); } + __instance.enabled = false; return false; } + __instance._attachedBody.AddVelocityChange(velocityChange); } diff --git a/QSB/MeteorSync/WorldObjects/QSBMeteor.cs b/QSB/MeteorSync/WorldObjects/QSBMeteor.cs index 52009db0..f3214007 100644 --- a/QSB/MeteorSync/WorldObjects/QSBMeteor.cs +++ b/QSB/MeteorSync/WorldObjects/QSBMeteor.cs @@ -23,11 +23,13 @@ namespace QSB.MeteorSync.WorldObjects { particleSystem.Play(); } + AttachedObject._impactSource.PlayOneShot(AudioType.BH_MeteorImpact); foreach (var owCollider in AttachedObject._owColliders) { owCollider.SetActivation(false); } + AttachedObject._owRigidbody.MakeKinematic(); FragmentSurfaceProxy.UntrackMeteor(AttachedObject); FragmentCollisionProxy.UntrackMeteor(AttachedObject); diff --git a/QSB/QuantumSync/Patches/ServerQuantumPatches.cs b/QSB/QuantumSync/Patches/ServerQuantumPatches.cs index d332a500..abf2c82f 100644 --- a/QSB/QuantumSync/Patches/ServerQuantumPatches.cs +++ b/QSB/QuantumSync/Patches/ServerQuantumPatches.cs @@ -107,6 +107,7 @@ namespace QSB.QuantumSync.Patches __result = true; return false; } + __result = false; return false; } @@ -161,6 +162,7 @@ namespace QSB.QuantumSync.Patches { Physics.SyncTransforms(); } + __instance._visibilityTracker.transform.localPosition = Vector3.zero; __instance._constantForceDetector.AddConstantVolume(bodyToOrbit.GetAttachedGravityVolume(), true, true); var bodyVelocity = bodyToOrbit.GetVelocity(); diff --git a/QSB/ShipSync/TransformSync/ShipTransformSync.cs b/QSB/ShipSync/TransformSync/ShipTransformSync.cs index a54b4053..9a6f232b 100644 --- a/QSB/ShipSync/TransformSync/ShipTransformSync.cs +++ b/QSB/ShipSync/TransformSync/ShipTransformSync.cs @@ -92,6 +92,7 @@ namespace QSB.ShipSync.TransformSync { rigidbody._rigidbody.velocity = newVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameVelocity_Internal(); } + rigidbody._lastVelocity = rigidbody._currentVelocity; rigidbody._currentVelocity = newVelocity; } diff --git a/QSB/Syncs/SyncBase.cs b/QSB/Syncs/SyncBase.cs index 95660d82..1a2dea9c 100644 --- a/QSB/Syncs/SyncBase.cs +++ b/QSB/Syncs/SyncBase.cs @@ -178,6 +178,7 @@ namespace QSB.Syncs DebugLog.ToConsole($"Exception when initializing {name} : {ex}", MessageType.Error); enabled = false; } + base.Update(); return; } diff --git a/QSB/TimeSync/TimeSyncUI.cs b/QSB/TimeSync/TimeSyncUI.cs index 75e6981e..4e079f8f 100644 --- a/QSB/TimeSync/TimeSyncUI.cs +++ b/QSB/TimeSync/TimeSyncUI.cs @@ -60,6 +60,7 @@ namespace QSB.TimeSync DebugLog.ToConsole("Error - Tried to start time sync UI when not in universe!", OWML.Common.MessageType.Error); return; } + _currentType = type; _currentReason = reason; _startTime = Time.timeSinceLevelLoad; diff --git a/QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs b/QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs index 62c6dabe..1059b415 100644 --- a/QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs +++ b/QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs @@ -48,6 +48,7 @@ namespace QSB.Tools.TranslatorTool { SetMaterialEmissionEnabled(_leftPageArrowRenderer, false); } + if (_rightPageArrowRenderer != null) { SetMaterialEmissionEnabled(_rightPageArrowRenderer, false); @@ -62,6 +63,7 @@ namespace QSB.Tools.TranslatorTool emissiveRenderer.SetPropertyBlock(s_matPropBlock); return; } + s_matPropBlock.SetColor(s_propID_EmissionColor, _baseEmissionColor * 0f); emissiveRenderer.SetPropertyBlock(s_matPropBlock); } @@ -73,10 +75,12 @@ namespace QSB.Tools.TranslatorTool { _targetBeam.Activate(); } + for (var i = 0; i < _scanBeams.Length; i++) { _scanBeams[i].enabled = true; } + TranslatorProp.SetActive(true); } @@ -98,6 +102,7 @@ namespace QSB.Tools.TranslatorTool { _scanBeams[i].enabled = false; } + TranslatorProp.SetActive(false); } diff --git a/QSB/Utility/DebugGUI.cs b/QSB/Utility/DebugGUI.cs index a784689d..424b1561 100644 --- a/QSB/Utility/DebugGUI.cs +++ b/QSB/Utility/DebugGUI.cs @@ -154,6 +154,7 @@ namespace QSB.Utility { WriteLine(3, $"Current Owner : {instance.NetIdentity.ClientAuthorityOwner.GetPlayerId()}"); } + var sector = instance.ReferenceSector; WriteLine(3, $"Ref. Sector : {(sector != null ? sector.Name : "NULL")}", sector == null ? Color.red : Color.white); var transform = instance.ReferenceTransform;