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

Merge pull request #362 from misternebula/restructure-of-folders

Browse Source 
Restructure of folders / cleanup
This commit is contained in:
_nebula 2021-11-25 15:46:55 +00:00 committed by GitHub
commit d71cb00796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 195 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.OnSectorOccupantRemoved))]
public static bool OnSectorOccupantRemoved(AnglerfishController __instance,
@ -51,7 +50,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.UpdateState))]
public static bool UpdateState(AnglerfishController __instance)
@ -159,6 +157,7 @@ namespace QSB.Anglerfish.Patches
QSBEventManager.FireEvent(EventNames.QSBAnglerChangeState, qsbAngler);
break;
}
__instance.ChangeState(AnglerfishController.AnglerState.Lurking);
QSBEventManager.FireEvent(EventNames.QSBAnglerChangeState, qsbAngler);
break;
@ -167,7 +166,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.UpdateMovement))]
public static bool UpdateMovement(AnglerfishController __instance)
@ -177,6 +175,7 @@ namespace QSB.Anglerfish.Patches
{
return false;
}
qsbAngler.FixedUpdate();
if (__instance._anglerBody.GetVelocity().sqrMagnitude > (double)Mathf.Pow(__instance._chaseSpeed * 1.5f, 2f))
@ -250,7 +249,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.OnImpact))]
public static bool OnImpact(AnglerfishController __instance,
@ -275,7 +273,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.OnClosestAudibleNoise))]
public static bool OnClosestAudibleNoise(AnglerfishController __instance,
@ -330,7 +327,6 @@ namespace QSB.Anglerfish.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.OnCaughtObject))]
public static bool OnCaughtObject(AnglerfishController __instance,

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

@ -1,8 +1,8 @@
using QSB.Anglerfish.WorldObjects;
using QSB.Syncs.Unsectored.Rigidbodies;
using QSB.WorldSync;
using System.Collections.Generic;
using QuantumUNET.Transport;
using System.Collections.Generic;
using UnityEngine;
namespace QSB.Anglerfish.TransformSync
@ -41,7 +41,6 @@ namespace QSB.Anglerfish.TransformSync
SetReferenceTransform(_qsbAngler.AttachedObject._brambleBody.transform);
}
private bool _shouldUpdate;
public override void DeserializeTransform(QNetworkReader reader, bool initialState)
@ -61,11 +60,11 @@ namespace QSB.Anglerfish.TransformSync
{
return false;
}
_shouldUpdate = false;
return base.UpdateTransform();
}
protected override void OnRenderObject()
{
base.OnRenderObject();

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

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

@ -3,7 +3,6 @@ using QSB.Animation.NPC.WorldObjects;
using QSB.Events;
using QSB.Patches;
using QSB.Player;
using QSB.Utility;
using QSB.WorldSync;
using System.Linq;
using UnityEngine;
@ -83,6 +82,7 @@ namespace QSB.Animation.NPC.Patches
__instance._state = NomaiConversationManager.State.WatchingPlayer;
__instance._solanumAnimController.StartWatchingPlayer();
}
break;
case NomaiConversationManager.State.WatchingPlayer:
@ -144,6 +144,7 @@ namespace QSB.Animation.NPC.Patches
{
__instance.ResetStoneGestureTimer();
}
__instance._stoneGestureTimer -= Time.deltaTime;
if (__instance._stoneGestureTimer < 0f)
{
@ -157,6 +158,7 @@ namespace QSB.Animation.NPC.Patches
{
__instance.ResetCairnGestureTimer();
}
__instance._cairnGestureTimer -= Time.deltaTime;
if (__instance._cairnGestureTimer < 0f)
{
@ -166,6 +168,7 @@ namespace QSB.Animation.NPC.Patches
}
}
}
break;
case NomaiConversationManager.State.CreatingStones:
@ -174,6 +177,7 @@ namespace QSB.Animation.NPC.Patches
__instance._state = NomaiConversationManager.State.WatchingPlayer;
__instance._conversationStonesCreated = true;
}
break;
case NomaiConversationManager.State.RaisingCairns:
@ -184,6 +188,7 @@ namespace QSB.Animation.NPC.Patches
__instance._stoneSocketATrigger.SetActivation(true);
__instance._stoneSocketBTrigger.SetActivation(true);
}
break;
case NomaiConversationManager.State.ErasingResponse:
@ -203,6 +208,7 @@ namespace QSB.Animation.NPC.Patches
__instance._activeResponseText.Show();
}
}
break;
case NomaiConversationManager.State.WritingResponse:
@ -211,6 +217,7 @@ namespace QSB.Animation.NPC.Patches
__instance._state = NomaiConversationManager.State.WatchingPlayer;
__instance._solanumAnimController.StopWritingMessage(true);
}
break;
}

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

@ -1,7 +1,7 @@
using System;
using System.Linq;
using HarmonyLib;
using HarmonyLib;
using QSB.Patches;
using System;
using System.Linq;
using UnityEngine;
namespace QSB.Animation.NPC.Patches
@ -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/ClientServerStateSync/ServerStateManager.cs
View File

@ -142,7 +142,7 @@ namespace QSB.ClientServerStateSync
DebugLog.ToConsole($"Error - All players were ready in non-universe scene!?", OWML.Common.MessageType.Error);
QSBEventManager.FireEvent(EventNames.QSBServerState, ServerState.NotLoaded);
}
_blockNextCheck = true;
}
}

91
QSB/DeathSync/Necronomicon.cs
View File

@ -7,12 +7,17 @@ namespace QSB.DeathSync
{
private static readonly Dictionary<DeathType, string[]> Darkhold = new()
{
{ DeathType.Default, new[] // Running out of health
{
DeathType.Default,
new[] // Running out of health
{
"{0} died",
"{0} was killed"
} },
{ DeathType.Impact, new[] // Hitting the ground/wall/object
}
},
{
DeathType.Impact,
new[] // Hitting the ground/wall/object
{
"{0} forgot to use retro-rockets",
"{0} bonked into the ground too hard",
@ -22,8 +27,11 @@ namespace QSB.DeathSync
"{0} was killed",
"{0} died due to impact",
"{0} impacted the ground too hard"
} },
{ DeathType.Asphyxiation, new[] // Running out of oxygen
}
},
{
DeathType.Asphyxiation,
new[] // Running out of oxygen
{
"{0} forgot to breathe",
"{0} asphyxiated",
@ -33,14 +41,20 @@ namespace QSB.DeathSync
"{0} ran out of air",
"{0} ran out of oxygen",
"{0} didn't need air anyway"
} },
{ DeathType.Energy, new[] // Electricity, sun, etc.
}
},
{
DeathType.Energy,
new[] // Electricity, sun, etc.
{
"{0} was cooked",
"{0} died",
"{0} was killed"
} },
{ DeathType.Supernova, new[] // Supernova
}
},
{
DeathType.Supernova,
new[] // Supernova
{
"{0} ran out of time",
"{0} burnt up",
@ -52,8 +66,11 @@ namespace QSB.DeathSync
"{0} became cosmic marshmallow",
"{0} photosynthesized too much",
"{0} died due to the supernova"
} },
{ DeathType.Digestion, new[] // Anglerfish
}
},
{
DeathType.Digestion,
new[] // Anglerfish
{
"{0} was eaten",
"{0} found a fish",
@ -61,15 +78,21 @@ namespace QSB.DeathSync
"{0} messed with the wrong fish",
"{0} was digested",
"{0} died due to digestion"
} },
{ DeathType.BigBang, new[] // End of the game
}
},
{
DeathType.BigBang,
new[] // End of the game
{
// TODO : maybe don't show these?
"{0} sacrificed themself for the universe",
"{0} knows the true meaning of sacrifice",
"{0} won at the cost of their life"
} },
{ DeathType.Crushed, new[] // Crushed in sand
}
},
{
DeathType.Crushed,
new[] // Crushed in sand
{
"{0} went through the tunnel too slow",
"{0} didn't make it out in time",
@ -79,14 +102,20 @@ namespace QSB.DeathSync
"{0} went swimming in the sand",
"{0} underestimated the danger of sand",
"{0} died due to being crushed"
} },
{ DeathType.TimeLoop, new[] // Escaping the supernova
}
},
{
DeathType.TimeLoop,
new[] // Escaping the supernova
{
"{0} ran out of time",
"{0} lost track of time",
"{0} watched the sun go kaboom"
} },
{ DeathType.Lava, new[] // Lava
}
},
{
DeathType.Lava,
new[] // Lava
{
"{0} died in lava",
"{0} was melted",
@ -96,14 +125,20 @@ namespace QSB.DeathSync
"{0} became one with the glowing gooey rock",
"{0} died due to lava",
"{0} got burnt in the lava"
} },
{ DeathType.BlackHole, new[] // ATP core black hole
}
},
{
DeathType.BlackHole,
new[] // ATP core black hole
{
"{0} should visit the Ash Twin Project again",
"{0} waited inside the Ash Twin Project",
"{0} chased their memories"
} },
{ DeathType.DreamExplosion, new[] // using the prototype
}
},
{
DeathType.DreamExplosion,
new[] // using the prototype
{
"{0} exploded",
"{0} was an early adopter",
@ -111,8 +146,11 @@ namespace QSB.DeathSync
"{0} was fried",
"{0} died due to explosion",
"{0} used the wrong artifact"
} },
{ DeathType.CrushedByElevator, new[] // elevator-induced pancakeness
}
},
{
DeathType.CrushedByElevator,
new[] // elevator-induced pancakeness
{
"{0} was crushed",
"{0} was squished",
@ -120,7 +158,8 @@ namespace QSB.DeathSync
"{0} stood under an elevator",
"{0} became a flat-hearther",
"{0} was squished by an elevator"
} },
}
},
};
public static string GetPhrase(DeathType deathType, int index)

4
QSB/DeathSync/RespawnOnDeath.cs
View File

@ -3,11 +3,11 @@ using OWML.Utils;
using QSB.Events;
using QSB.Player;
using QSB.Player.TransformSync;
using QSB.WorldSync;
using QSB.RespawnSync;
using QSB.Utility;
using QSB.WorldSync;
using System.Linq;
using UnityEngine;
using QSB.RespawnSync;
namespace QSB.DeathSync
{

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

11
QSB/Events/QSBEventManager.cs
View File

@ -1,4 +1,5 @@
using OWML.Common;
using QSB.Anglerfish.Events;
using QSB.Animation.NPC.Events;
using QSB.Animation.Player.Events;
using QSB.CampfireSync.Events;
@ -6,13 +7,14 @@ using QSB.ClientServerStateSync.Events;
using QSB.ConversationSync.Events;
using QSB.DeathSync.Events;
using QSB.ElevatorSync.Events;
using QSB.FrequencySync.Events;
using QSB.GeyserSync.Events;
using QSB.ItemSync.Events;
using QSB.LogSync.Events;
using QSB.MeteorSync.Events;
using QSB.OrbSync.Events;
using QSB.Player.Events;
using QSB.QuantumSync.Events;
using QSB.RespawnSync.Events;
using QSB.RoastingSync.Events;
using QSB.SatelliteSync.Events;
using QSB.ShipSync.Events;
@ -24,16 +26,13 @@ using QSB.Tools.FlashlightTool.Events;
using QSB.Tools.ProbeLauncherTool.Events;
using QSB.Tools.ProbeTool.Events;
using QSB.Tools.SignalscopeTool.Events;
using QSB.Tools.SignalscopeTool.FrequencySync.Events;
using QSB.Tools.TranslatorTool.Events;
using QSB.TranslationSync.Events;
using QSB.Anglerfish.Events;
using QSB.Tools.TranslatorTool.TranslationSync.Events;
using QSB.Utility;
using QSB.Utility.Events;
using System.Collections.Generic;
using QSB.MeteorSync.Events;
using QSB.RespawnSync.Events;
using System.Linq;
using HarmonyLib;
using System.Text;
namespace QSB.Events

1
QSB/ItemSync/Events/MoveToCarryEvent.cs
View File

@ -3,7 +3,6 @@ using QSB.ItemSync.WorldObjects.Items;
using QSB.Player;
using QSB.WorldSync;
using QSB.WorldSync.Events;
using UnityEngine;
namespace QSB.ItemSync.Events
{

4
QSB/Menus/MenuManager.cs
View File

@ -1,6 +1,5 @@
using QSB.Player;
using System.Linq;
using QSB.Utility;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;
@ -68,6 +67,7 @@ namespace QSB.Menus
pauseCommandListener.RemovePauseCommandLock();
_addedPauseLock = false;
}
OWTime.Unpause(OWTime.PauseType.System);
OWInput.RestorePreviousInputs();
}
@ -93,7 +93,6 @@ namespace QSB.Menus
DisconnectButton = MenuApi.PauseMenu_MakeSimpleButton("DISCONNECT");
DisconnectButton.onClick.AddListener(Disconnect);
if (QSBCore.IsInMultiplayer)
{
ClientButton.SetActive(false);
@ -155,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>();

4
QSB/MeteorSync/MeteorManager.cs
View File

@ -1,6 +1,6 @@
using System.Linq;
using QSB.MeteorSync.WorldObjects;
using QSB.MeteorSync.WorldObjects;
using QSB.WorldSync;
using System.Linq;
namespace QSB.MeteorSync
{

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

@ -18,7 +18,6 @@ namespace QSB.MeteorSync.Patches
public static bool FixedUpdate(MeteorLauncher __instance)
=> false;
[HarmonyPrefix]
[HarmonyPatch(typeof(MeteorLauncher), nameof(MeteorLauncher.LaunchMeteor))]
public static bool LaunchMeteor(MeteorLauncher __instance)
@ -50,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);
@ -69,7 +69,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Impact))]
public static bool Impact(MeteorController __instance,
@ -84,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);
@ -106,7 +107,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(DetachableFragment), nameof(DetachableFragment.Detach))]
public static void Detach_Prefix(DetachableFragment __instance, out FragmentIntegrity __state) =>
@ -118,7 +118,6 @@ namespace QSB.MeteorSync.Patches
public static void Detach_Postfix(DetachableFragment __instance, FragmentIntegrity __state) =>
__instance._fragmentIntegrity = __state;
[HarmonyPrefix]
[HarmonyPatch(typeof(DebrisLeash), nameof(DebrisLeash.MoveByDistance))]
public static bool MoveByDistance(DebrisLeash __instance,
@ -128,6 +127,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (__instance.enabled)
@ -140,7 +140,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(DebrisLeash), nameof(DebrisLeash.FixedUpdate))]
public static bool FixedUpdate(DebrisLeash __instance)
@ -149,6 +148,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (!__instance._deccelerating)
@ -174,9 +174,11 @@ namespace QSB.MeteorSync.Patches
{
__instance._detachableFragment.ComeToRest(__instance._anchorBody);
}
__instance.enabled = false;
return false;
}
__instance._attachedBody.AddVelocityChange(velocityChange);
}

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

@ -11,7 +11,6 @@ namespace QSB.MeteorSync.Patches
{
public override QSBPatchTypes Type => QSBPatchTypes.OnServerClientConnect;
[HarmonyPrefix]
[HarmonyPatch(typeof(MeteorLauncher), nameof(MeteorLauncher.FixedUpdate))]
public static bool FixedUpdate(MeteorLauncher __instance)
@ -31,6 +30,7 @@ namespace QSB.MeteorSync.Patches
}
}
}
if (__instance._launchedDynamicMeteors != null)
{
for (var j = __instance._launchedDynamicMeteors.Count - 1; j >= 0; j--)
@ -46,6 +46,7 @@ namespace QSB.MeteorSync.Patches
}
}
}
if (__instance._initialized && Time.time > __instance._lastLaunchTime + __instance._launchDelay)
{
if (!__instance._areParticlesPlaying)
@ -59,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();
@ -75,7 +77,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(MeteorLauncher), nameof(MeteorLauncher.LaunchMeteor))]
public static bool LaunchMeteor(MeteorLauncher __instance)
@ -110,6 +111,7 @@ namespace QSB.MeteorSync.Patches
__instance._launchedDynamicMeteors.Add(meteorController);
}
}
if (meteorController != null)
{
var qsbMeteorLauncher = QSBWorldSync.GetWorldFromUnity<QSBMeteorLauncher>(__instance);
@ -133,7 +135,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPostfix]
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Impact))]
public static void Impact(MeteorController __instance,
@ -146,7 +147,6 @@ namespace QSB.MeteorSync.Patches
}
}
[HarmonyPostfix]
[HarmonyPatch(typeof(FragmentIntegrity), nameof(FragmentIntegrity.AddDamage))]
public static void AddDamage(FragmentIntegrity __instance,
@ -156,7 +156,6 @@ namespace QSB.MeteorSync.Patches
QSBEventManager.FireEvent(EventNames.QSBFragmentDamage, qsbFragment, damage);
}
[HarmonyPrefix]
[HarmonyPatch(typeof(DetachableFragment), nameof(DetachableFragment.Detach))]
public static void Detach_Prefix(DetachableFragment __instance, out FragmentIntegrity __state) =>
@ -168,7 +167,6 @@ namespace QSB.MeteorSync.Patches
public static void Detach_Postfix(DetachableFragment __instance, FragmentIntegrity __state) =>
__instance._fragmentIntegrity = __state;
[HarmonyPrefix]
[HarmonyPatch(typeof(DebrisLeash), nameof(DebrisLeash.MoveByDistance))]
public static bool MoveByDistance(DebrisLeash __instance,
@ -178,6 +176,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (__instance.enabled)
@ -190,7 +189,6 @@ namespace QSB.MeteorSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(DebrisLeash), nameof(DebrisLeash.FixedUpdate))]
public static bool FixedUpdate(DebrisLeash __instance)
@ -199,6 +197,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
var qsbFragment = QSBWorldSync.GetWorldFromUnity<QSBFragment>(__instance._detachableFragment._fragmentIntegrity);
if (!__instance._deccelerating)
@ -224,9 +223,11 @@ namespace QSB.MeteorSync.Patches
{
__instance._detachableFragment.ComeToRest(__instance._anchorBody);
}
__instance.enabled = false;
return false;
}
__instance._attachedBody.AddVelocityChange(velocityChange);
}

1
QSB/MeteorSync/WorldObjects/QSBFragment.cs
View File

@ -22,7 +22,6 @@ namespace QSB.MeteorSync.WorldObjects
}
}
public DetachableFragment DetachableFragment;
public bool IsDetached => DetachableFragment != null && DetachableFragment._isDetached;
public bool IsThruWhiteHole => IsDetached && DetachableFragment._sector != null &&

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

@ -11,7 +11,6 @@ namespace QSB.MeteorSync.WorldObjects
AttachedObject = attachedObject;
}
public static bool IsSpecialImpact(GameObject go) =>
go == Locator.GetPlayerCollider().gameObject || go == Locator.GetProbe()._anchor._collider.gameObject;
@ -24,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);

1
QSB/MeteorSync/WorldObjects/QSBMeteorLauncher.cs
View File

@ -10,7 +10,6 @@ namespace QSB.MeteorSync.WorldObjects
AttachedObject = attachedObject;
}
public int MeteorId;
public float LaunchSpeed;

8
QSB/Patches/QSBPatchManager.cs
View File

@ -1,5 +1,6 @@
using HarmonyLib;
using OWML.Common;
using QSB.Anglerfish.Patches;
using QSB.Animation.NPC.Patches;
using QSB.Animation.Patches;
using QSB.CampfireSync.Patches;
@ -7,11 +8,11 @@ using QSB.ConversationSync.Patches;
using QSB.DeathSync.Patches;
using QSB.EchoesOfTheEye.LightSensorSync.Patches;
using QSB.ElevatorSync.Patches;
using QSB.FrequencySync.Patches;
using QSB.GeyserSync.Patches;
using QSB.Inputs.Patches;
using QSB.ItemSync.Patches;
using QSB.LogSync.Patches;
using QSB.MeteorSync.Patches;
using QSB.OrbSync.Patches;
using QSB.Player.Patches;
using QSB.PoolSync.Patches;
@ -22,9 +23,8 @@ using QSB.ShipSync.Patches;
using QSB.StatueSync.Patches;
using QSB.TimeSync.Patches;
using QSB.Tools.ProbeLauncherTool.Patches;
using QSB.TranslationSync.Patches;
using QSB.Anglerfish.Patches;
using QSB.MeteorSync.Patches;
using QSB.Tools.SignalscopeTool.FrequencySync.Patches;
using QSB.Tools.TranslatorTool.TranslationSync.Patches;
using QSB.Utility;
using System;
using System.Collections.Generic;

1
QSB/Player/Events/LaunchCodesEvent.cs
View File

@ -1,6 +1,5 @@
using QSB.Events;
using QSB.Messaging;
using QSB.Utility;
namespace QSB.Player.Events
{

6
QSB/Player/Events/RequestStateResyncEvent.cs
View File

@ -1,12 +1,12 @@
using OWML.Utils;
using QSB.CampfireSync.WorldObjects;
using QSB.MeteorSync.WorldObjects;
using QSB.ClientServerStateSync;
using QSB.Events;
using QSB.Messaging;
using QSB.MeteorSync.WorldObjects;
using QSB.QuantumSync;
using QSB.TranslationSync;
using QSB.TranslationSync.WorldObjects;
using QSB.Tools.TranslatorTool.TranslationSync;
using QSB.Tools.TranslatorTool.TranslationSync.WorldObjects;
using QSB.Utility;
using QSB.WorldSync;
using System.Linq;

2
QSB/Player/PlayerInfo.cs
View File

@ -79,7 +79,7 @@ namespace QSB.Player
// Tools
public GameObject ProbeBody { get; set; }
public QSBProbe Probe { get; set; }
public QSBFlashlight FlashLight
public QSBFlashlight FlashLight
{
get
{

22
QSB/QSB.csproj
View File

@ -111,9 +111,9 @@
<Compile Include="DeathSync\Events\PlayerDeathEvent.cs" />
<Compile Include="Events\IQSBEvent.cs" />
<Compile Include="Animation\Player\Events\ChangeAnimTypeEvent.cs" />
<Compile Include="FrequencySync\Events\IdentifyFrequencyEvent.cs" />
<Compile Include="FrequencySync\Events\IdentifySignalEvent.cs" />
<Compile Include="FrequencySync\Patches\FrequencyPatches.cs" />
<Compile Include="Tools\SignalscopeTool\FrequencySync\Events\IdentifyFrequencyEvent.cs" />
<Compile Include="Tools\SignalscopeTool\FrequencySync\Events\IdentifySignalEvent.cs" />
<Compile Include="Tools\SignalscopeTool\FrequencySync\Patches\FrequencyPatches.cs" />
<Compile Include="ClientServerStateSync\ClientState.cs" />
<Compile Include="GeyserSync\Patches\GeyserPatches.cs" />
<Compile Include="Inputs\Patches\InputPatches.cs" />
@ -299,14 +299,14 @@
<Compile Include="StatueSync\Patches\StatuePatches.cs" />
<Compile Include="StatueSync\StatueManager.cs" />
<Compile Include="Syncs\TransformSyncUtil.cs" />
<Compile Include="TranslationSync\Events\SetAsTranslatedEvent.cs" />
<Compile Include="TranslationSync\Events\SetAsTranslatedMessage.cs" />
<Compile Include="TranslationSync\NomaiTextType.cs" />
<Compile Include="TranslationSync\WorldObjects\QSBComputer.cs" />
<Compile Include="TranslationSync\WorldObjects\QSBVesselComputer.cs" />
<Compile Include="TranslationSync\WorldObjects\QSBWallText.cs" />
<Compile Include="TranslationSync\SpiralManager.cs" />
<Compile Include="TranslationSync\Patches\SpiralPatches.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\Events\SetAsTranslatedEvent.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\Events\SetAsTranslatedMessage.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\NomaiTextType.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\WorldObjects\QSBComputer.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\WorldObjects\QSBVesselComputer.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\WorldObjects\QSBWallText.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\SpiralManager.cs" />
<Compile Include="Tools\TranslatorTool\TranslationSync\Patches\SpiralPatches.cs" />
<Compile Include="TimeSync\TimeSyncType.cs" />
<Compile Include="TimeSync\TimeSyncUI.cs" />
<Compile Include="Tools\FlashlightTool\Events\PlayerFlashlightEvent.cs" />

8
QSB/QSBCore.cs
View File

@ -1,6 +1,7 @@
using OWML.Common;
using OWML.ModHelper;
using OWML.ModHelper.Input;
using QSB.Anglerfish;
using QSB.Animation.NPC;
using QSB.CampfireSync;
using QSB.ConversationSync;
@ -11,28 +12,27 @@ using QSB.GeyserSync;
using QSB.Inputs;
using QSB.ItemSync;
using QSB.Menus;
using QSB.MeteorSync;
using QSB.OrbSync;
using QSB.Patches;
using QSB.Player;
using QSB.Player.TransformSync;
using QSB.PoolSync;
using QSB.QuantumSync;
using QSB.RespawnSync;
using QSB.SatelliteSync;
using QSB.SectorSync;
using QSB.ShipSync;
using QSB.StatueSync;
using QSB.TimeSync;
using QSB.Tools.ProbeLauncherTool;
using QSB.TranslationSync;
using QSB.Tools.TranslatorTool.TranslationSync;
using QSB.Utility;
using QSB.WorldSync;
using QSB.Anglerfish;
using QSB.MeteorSync;
using QuantumUNET;
using QuantumUNET.Components;
using System.Linq;
using UnityEngine;
using QSB.RespawnSync;
/*
Copyright (C) 2020 - 2021

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

9
QSB/RespawnSync/RespawnHUDMarker.cs
View File

@ -1,11 +1,4 @@
using QSB.Player;
using QSB.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine;
namespace QSB.RespawnSync
{

2
QSB/RespawnSync/RespawnManager.cs
View File

@ -68,7 +68,7 @@ namespace QSB.RespawnSync
DebugLog.ToConsole($"Error - Couldn't find the ship's PlayerRecoveryPoint!", OWML.Common.MessageType.Error);
return;
}
_owRecoveryPoint.SetActive(false);
var Systems_Supplies = _owRecoveryPoint.gameObject.transform.parent;

4
QSB/SatelliteSync/SatelliteProjectorManager.cs
View File

@ -1,5 +1,5 @@
using System.Linq;
using QSB.WorldSync;
using QSB.WorldSync;
using System.Linq;
using UnityEngine;
namespace QSB.SatelliteSync

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

6
QSB/StatueSync/StatueManager.cs
View File

@ -1,5 +1,4 @@
using QSB.Player;
using QSB.Utility;
using System.Collections;
using UnityEngine;
@ -25,10 +24,7 @@ namespace QSB.StatueSync
QSBPlayerManager.LocalPlayer.UpdateStatesFromObjects();
}
public void BeginSequence(Vector3 position, Quaternion rotation, float cameraDegrees)
{
StartCoroutine(BeginRemoteUplinkSequence(position, rotation, cameraDegrees));
}
public void BeginSequence(Vector3 position, Quaternion rotation, float cameraDegrees) => StartCoroutine(BeginRemoteUplinkSequence(position, rotation, cameraDegrees));
private IEnumerator BeginRemoteUplinkSequence(Vector3 position, Quaternion rotation, float cameraDegrees)
{

1
QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs
View File

@ -1,5 +1,4 @@
using OWML.Common;
using OWML.Utils;
using QSB.Utility;
using QuantumUNET.Transport;
using UnityEngine;

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/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs
View File

@ -93,7 +93,6 @@ namespace QSB.Syncs.Unsectored.Rigidbodies
_relativeAngularVelocity = ReferenceTransform.GetAttachedOWRigidbody().EncodeAngVel(((OWRigidbody)AttachedObject).GetAngularVelocity());
}
protected override bool UpdateTransform()
{
if (HasAuthority)

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;

2
QSB/FrequencySync/Events/IdentifyFrequencyEvent.cs → QSB/Tools/SignalscopeTool/FrequencySync/Events/IdentifyFrequencyEvent.cs
View File

@ -2,7 +2,7 @@
using QSB.Messaging;
using QSB.Player;
namespace QSB.FrequencySync.Events
namespace QSB.Tools.SignalscopeTool.FrequencySync.Events
{
public class IdentifyFrequencyEvent : QSBEvent<EnumMessage<SignalFrequency>>
{

2
QSB/FrequencySync/Events/IdentifySignalEvent.cs → QSB/Tools/SignalscopeTool/FrequencySync/Events/IdentifySignalEvent.cs
View File

@ -2,7 +2,7 @@
using QSB.Messaging;
using QSB.Player;
namespace QSB.FrequencySync.Events
namespace QSB.Tools.SignalscopeTool.FrequencySync.Events
{
public class IdentifySignalEvent : QSBEvent<EnumMessage<SignalName>>
{

2
QSB/FrequencySync/Patches/FrequencyPatches.cs → QSB/Tools/SignalscopeTool/FrequencySync/Patches/FrequencyPatches.cs
View File

@ -2,7 +2,7 @@
using QSB.Events;
using QSB.Patches;
namespace QSB.FrequencySync.Patches
namespace QSB.Tools.SignalscopeTool.FrequencySync.Patches
{
[HarmonyPatch]
public class FrequencyPatches : QSBPatch

2
QSB/Tools/TranslatorTool/QSBNomaiTranslator.cs
View File

@ -2,7 +2,7 @@
namespace QSB.Tools.TranslatorTool
{
class QSBNomaiTranslator : QSBTool
internal class QSBNomaiTranslator : QSBTool
{
public static float distToClosestTextCenter = 1f;

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

@ -2,7 +2,7 @@
namespace QSB.Tools.TranslatorTool
{
class QSBNomaiTranslatorProp : MonoBehaviour
internal class QSBNomaiTranslatorProp : MonoBehaviour
{
private static MaterialPropertyBlock s_matPropBlock;
private static int s_propID_EmissionColor;
@ -15,7 +15,6 @@ namespace QSB.Tools.TranslatorTool
private TranslatorTargetBeam _targetBeam;
private QSBTranslatorScanBeam[] _scanBeams;
private bool _isTranslating;
private void Awake()
{
@ -49,6 +48,7 @@ namespace QSB.Tools.TranslatorTool
{
SetMaterialEmissionEnabled(_leftPageArrowRenderer, false);
}
if (_rightPageArrowRenderer != null)
{
SetMaterialEmissionEnabled(_rightPageArrowRenderer, false);
@ -63,6 +63,7 @@ namespace QSB.Tools.TranslatorTool
emissiveRenderer.SetPropertyBlock(s_matPropBlock);
return;
}
s_matPropBlock.SetColor(s_propID_EmissionColor, _baseEmissionColor * 0f);
emissiveRenderer.SetPropertyBlock(s_matPropBlock);
}
@ -74,10 +75,12 @@ namespace QSB.Tools.TranslatorTool
{
_targetBeam.Activate();
}
for (var i = 0; i < _scanBeams.Length; i++)
{
_scanBeams[i].enabled = true;
}
TranslatorProp.SetActive(true);
}
@ -99,6 +102,7 @@ namespace QSB.Tools.TranslatorTool
{
_scanBeams[i].enabled = false;
}
TranslatorProp.SetActive(false);
}

15
QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs
View File

@ -2,17 +2,16 @@
namespace QSB.Tools.TranslatorTool
{
class QSBTranslatorScanBeam : MonoBehaviour
internal class QSBTranslatorScanBeam : MonoBehaviour
{
public Renderer _projectorRenderer;
public Renderer _lightVolumeRenderer;
const float _focusedBeamWidth = 0.25f;
const float _maxBeamWidth = 1f;
const float _maxBeamLength = 10f;
const float _scanOffset = 0f;
const float _switchLength = 0.33f;
const float _fadeLength = 0.66f;
private const float _focusedBeamWidth = 0.25f;
private const float _maxBeamWidth = 1f;
private const float _maxBeamLength = 10f;
private const float _scanOffset = 0f;
private const float _switchLength = 0.33f;
private const float _fadeLength = 0.66f;
public float _scanSpeed = 1f;
public readonly Color _baseProjectorColor = new(0.3545942f, 2.206932f, 4.594794f, 1f);

4
QSB/TranslationSync/Events/SetAsTranslatedEvent.cs → QSB/Tools/TranslatorTool/TranslationSync/Events/SetAsTranslatedEvent.cs
View File

@ -1,8 +1,8 @@
using QSB.Events;
using QSB.TranslationSync.WorldObjects;
using QSB.Tools.TranslatorTool.TranslationSync.WorldObjects;
using QSB.WorldSync;
namespace QSB.TranslationSync.Events
namespace QSB.Tools.TranslatorTool.TranslationSync.Events
{
public class SetAsTranslatedEvent : QSBEvent<SetAsTranslatedMessage>
{

2
QSB/TranslationSync/Events/SetAsTranslatedMessage.cs → QSB/Tools/TranslatorTool/TranslationSync/Events/SetAsTranslatedMessage.cs
View File

@ -1,7 +1,7 @@
using QSB.WorldSync.Events;
using QuantumUNET.Transport;
namespace QSB.TranslationSync.Events
namespace QSB.Tools.TranslatorTool.TranslationSync.Events
{
public class SetAsTranslatedMessage : EnumWorldObjectMessage<NomaiTextType>
{

2
QSB/TranslationSync/NomaiTextType.cs → QSB/Tools/TranslatorTool/TranslationSync/NomaiTextType.cs
View File

@ -1,4 +1,4 @@
namespace QSB.TranslationSync
namespace QSB.Tools.TranslatorTool.TranslationSync
{
public enum NomaiTextType
{

4
QSB/TranslationSync/Patches/SpiralPatches.cs → QSB/Tools/TranslatorTool/TranslationSync/Patches/SpiralPatches.cs
View File

@ -1,10 +1,10 @@
using HarmonyLib;
using QSB.Events;
using QSB.Patches;
using QSB.TranslationSync.WorldObjects;
using QSB.Tools.TranslatorTool.TranslationSync.WorldObjects;
using QSB.WorldSync;
namespace QSB.TranslationSync.Patches
namespace QSB.Tools.TranslatorTool.TranslationSync.Patches
{
[HarmonyPatch]
internal class SpiralPatches : QSBPatch

4
QSB/TranslationSync/SpiralManager.cs → QSB/Tools/TranslatorTool/TranslationSync/SpiralManager.cs
View File

@ -1,7 +1,7 @@
using QSB.TranslationSync.WorldObjects;
using QSB.Tools.TranslatorTool.TranslationSync.WorldObjects;
using QSB.WorldSync;
namespace QSB.TranslationSync
namespace QSB.Tools.TranslatorTool.TranslationSync
{
internal class SpiralManager : WorldObjectManager
{

2
QSB/TranslationSync/WorldObjects/QSBComputer.cs → QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBComputer.cs
View File

@ -2,7 +2,7 @@
using QSB.WorldSync;
using System.Collections.Generic;
namespace QSB.TranslationSync.WorldObjects
namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects
{
internal class QSBComputer : WorldObject<NomaiComputer>
{

2
QSB/TranslationSync/WorldObjects/QSBVesselComputer.cs → QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBVesselComputer.cs
View File

@ -3,7 +3,7 @@ using QSB.WorldSync;
using System.Collections.Generic;
using System.Linq;
namespace QSB.TranslationSync.WorldObjects
namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects
{
internal class QSBVesselComputer : WorldObject<NomaiVesselComputer>
{

2
QSB/TranslationSync/WorldObjects/QSBWallText.cs → QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBWallText.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace QSB.TranslationSync.WorldObjects
namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects
{
internal class QSBWallText : WorldObject<NomaiWallText>
{

1
QSB/Tools/TranslatorTool/TranslatorCreator.cs
View File

@ -18,7 +18,6 @@ namespace QSB.Tools.TranslatorTool
var REMOTE_TranslatorGroup = REMOTE_NomaiTranslatorProp.transform.Find("TranslatorGroup");
var REMOTE_Props_HEA_Translator = REMOTE_TranslatorGroup.Find("Props_HEA_Translator");
Object.Destroy(REMOTE_TranslatorGroup.Find("Canvas").gameObject);
Object.Destroy(REMOTE_Props_HEA_Translator.Find("Props_HEA_Translator_Pivot_RotatingPart")
.Find("Props_HEA_Translator_RotatingPart")

4
QSB/Utility/DebugActions.cs
View File

@ -1,9 +1,9 @@
using System.Linq;
using OWML.Utils;
using OWML.Utils;
using QSB.Events;
using QSB.Player;
using QSB.ShipSync;
using QSB.Utility.Events;
using System.Linq;
using UnityEngine;
using UnityEngine.InputSystem;

15
QSB/Utility/DebugGUI.cs
View File

@ -1,18 +1,13 @@
using OWML.Utils;
using QSB.ClientServerStateSync;
using QSB.ClientServerStateSync;
using QSB.OrbSync.TransformSync;
using QSB.Player;
using QSB.QuantumSync;
using QSB.ShipSync;
using QSB.ShipSync.TransformSync;
using QSB.ShipSync.WorldObjects;
using QSB.Syncs;
using QSB.TimeSync;
using QSB.WorldSync;
using System.ComponentModel;
using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using UnityEngine;
namespace QSB.Utility
@ -150,7 +145,7 @@ namespace QSB.Utility
#endregion
#region Column3 - Ship data
WriteLine(3, $"Current Flyer : {ShipManager.Instance.CurrentFlyer}");
if (ShipTransformSync.LocalInstance != null)
{
@ -159,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;
@ -188,7 +184,7 @@ namespace QSB.Utility
{
var attachedObject = hull.AttachedObject;
if (attachedObject == null)
{
{
WriteLine(3, $"- {hull.ObjectId} NULL ATTACHEDOBJECT", Color.red);
}
else
@ -213,8 +209,7 @@ namespace QSB.Utility
foreach (var quantumObject in ownedQuantumObjects)
{
var qsbObj = quantumObject as IWorldObject;
if (qsbObj == null)
if (quantumObject is not IWorldObject qsbObj)
{
WriteLine(4, $"NULL QSBOBJ", Color.red);
}

1
QSB/Utility/Popcron.Gizmos/GizmosInstance.cs
View File

@ -1,4 +1,3 @@
using QSB.Utility;
using System;
using System.Collections.Generic;
using UnityEngine;

1
QuantumUNET/Components/QNetworkManager.cs
View File

@ -4,7 +4,6 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.SceneManagement;
namespace QuantumUNET.Components
{