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

add newlines

Browse Source
This commit is contained in:
Mister_Nebula 2021-11-25 15:38:05 +00:00
parent eb79e32491
commit 3860b2aacc
18 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Anglerfish/Patches/AnglerPatches.cs
View File

@ -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))

1
QSB/Anglerfish/TransformSync/AnglerTransformSync.cs
View File

@ -60,6 +60,7 @@ namespace QSB.Anglerfish.TransformSync
{
return false;
}
_shouldUpdate = false;
return base.UpdateTransform();
}

2
QSB/Anglerfish/WorldObjects/QSBAngler.cs
View File

@ -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;
}

8
QSB/Animation/NPC/Patches/SolanumPatches.cs
View File

@ -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;
}

10
QSB/Animation/NPC/Patches/TravelerControllerPatches.cs
View File

@ -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;

2
QSB/ClientServerStateSync/ClientStateManager.cs
View File

@ -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;

2
QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs
View File

@ -130,12 +130,14 @@ namespace QSB.EchoesOfTheEye.LightSensorSync.Patches
break;
}
}
break;
default:
if (lightSourceType == LightSourceType.VOLUME_ONLY)
{
__instance._illuminated = true;
}
break;
}
}

2
QSB/Menus/MenuManager.cs
View File

@ -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()

3
QSB/MeteorSync/Events/FragmentResyncEvent.cs
View File

@ -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<DebrisLeash>();

7
QSB/MeteorSync/Patches/MeteorClientPatches.cs
View File

@ -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<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (__instance.enabled)
@ -144,6 +148,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__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);
}

8
QSB/MeteorSync/Patches/MeteorServerPatches.cs
View File

@ -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<QSBMeteorLauncher>(__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<QSBMeteorLauncher>(__instance);
@ -172,6 +176,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (__instance.enabled)
@ -192,6 +197,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__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);
}

2
QSB/MeteorSync/WorldObjects/QSBMeteor.cs
View File

@ -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);

2
QSB/QuantumSync/Patches/ServerQuantumPatches.cs
View File

@ -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();

1
QSB/ShipSync/TransformSync/ShipTransformSync.cs
View File

@ -92,6 +92,7 @@ namespace QSB.ShipSync.TransformSync
{
rigidbody._rigidbody.velocity = newVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameVelocity_Internal();
}
rigidbody._lastVelocity = rigidbody._currentVelocity;
rigidbody._currentVelocity = newVelocity;
}

1
QSB/Syncs/SyncBase.cs
View File

@ -178,6 +178,7 @@ namespace QSB.Syncs
DebugLog.ToConsole($"Exception when initializing {name} : {ex}", MessageType.Error);
enabled = false;
}
base.Update();
return;
}

1
QSB/TimeSync/TimeSyncUI.cs
View File

@ -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;

5
QSB/Tools/TranslatorTool/QSBNomaiTranslatorProp.cs
View File

@ -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);
}

1
QSB/Utility/DebugGUI.cs
View File

@ -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;