mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-03-12 04:14:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #447 from misternebula/fix-tool-materials

Browse Source 
Fix tool materials + cleanup
This commit is contained in:
_nebula 2022-01-02 11:47:26 +00:00 committed by GitHub
commit 653f84e0c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 81 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ namespace QSB.Anglerfish.Patches
{
return true;
}
var qsbAngler = __instance.GetWorldObject<QSBAngler>();
switch (__instance._currentState)
@ -64,6 +65,7 @@ namespace QSB.Anglerfish.Patches
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
break;
case AnglerfishController.AnglerState.Chasing:
if (qsbAngler.TargetTransform == null)
@ -72,6 +74,7 @@ namespace QSB.Anglerfish.Patches
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
if ((qsbAngler.TargetTransform.position - __instance._anglerBody.GetPosition()).sqrMagnitude > __instance._escapeDistance * __instance._escapeDistance)
{
qsbAngler.TargetTransform = null;
@ -79,6 +82,7 @@ namespace QSB.Anglerfish.Patches
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
break;
case AnglerfishController.AnglerState.Consuming:
if (!__instance._consumeComplete)
@ -89,6 +93,7 @@ namespace QSB.Anglerfish.Patches
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
var num = Time.time - __instance._consumeStartTime;
if (qsbAngler.TargetTransform.CompareTag("Player") && num > __instance._consumeDeathDelay)
{
@ -96,18 +101,21 @@ namespace QSB.Anglerfish.Patches
__instance._consumeComplete = true;
return false;
}
if (qsbAngler.TargetTransform.CompareTag("Ship"))
{
if (num > __instance._consumeShipCrushDelay)
{
qsbAngler.TargetTransform.GetComponentInChildren<ShipDamageController>().TriggerSystemFailure();
}
if (num > __instance._consumeDeathDelay)
{
if (PlayerState.IsInsideShip())
{
Locator.GetDeathManager().KillPlayer(DeathType.Digestion);
}
__instance._consumeComplete = true;
return false;
}
@ -118,6 +126,7 @@ namespace QSB.Anglerfish.Patches
qsbAngler.TargetTransform = null;
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
}
break;
case AnglerfishController.AnglerState.Stunned:
__instance._stunTimer -= Time.deltaTime;
@ -129,9 +138,11 @@ namespace QSB.Anglerfish.Patches
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
__instance.ChangeState(AnglerfishController.AnglerState.Lurking);
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
}
break;
default:
return false;
@ -148,6 +159,7 @@ namespace QSB.Anglerfish.Patches
{
return true;
}
var qsbAngler = __instance.GetWorldObject<QSBAngler>();
qsbAngler.UpdateTargetVelocity();
@ -155,6 +167,7 @@ namespace QSB.Anglerfish.Patches
{
__instance.ApplyDrag(10f);
}
switch (__instance._currentState)
{
case AnglerfishController.AnglerState.Lurking:
@ -169,6 +182,7 @@ namespace QSB.Anglerfish.Patches
__instance.MoveTowardsTarget(targetPos, __instance._investigateSpeed, __instance._acceleration);
return false;
}
break;
}
case AnglerfishController.AnglerState.Chasing:
@ -200,6 +214,7 @@ namespace QSB.Anglerfish.Patches
d = Mathf.Lerp(num4, 0f, num8 * num8);
}
}
__instance._targetPos = qsbAngler.TargetTransform.position + normalized * d;
__instance.RotateTowardsTarget(__instance._targetPos, __instance._turnSpeed, __instance._quickTurnSpeed);
if (!__instance._turningInPlace)
@ -207,6 +222,7 @@ namespace QSB.Anglerfish.Patches
__instance.MoveTowardsTarget(__instance._targetPos, __instance._chaseSpeed, __instance._acceleration);
return false;
}
break;
}
case AnglerfishController.AnglerState.Consuming:
@ -254,6 +270,7 @@ namespace QSB.Anglerfish.Patches
{
return false;
}
if ((noiseMaker.GetNoiseOrigin() - __instance.transform.position).sqrMagnitude < __instance._pursueDistance * __instance._pursueDistance)
{
if (qsbAngler.TargetTransform != noiseMaker.GetAttachedBody().transform)
@ -263,6 +280,7 @@ namespace QSB.Anglerfish.Patches
{
__instance.ChangeState(AnglerfishController.AnglerState.Chasing);
}
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
return false;
}
@ -274,6 +292,7 @@ namespace QSB.Anglerfish.Patches
{
__instance.ChangeState(AnglerfishController.AnglerState.Investigating);
}
qsbAngler.SendMessage(new AnglerChangeStateMessage(qsbAngler));
}
@ -293,8 +312,10 @@ namespace QSB.Anglerfish.Patches
{
Locator.GetDeathManager().KillPlayer(DeathType.Digestion);
}
return false;
}
if (caughtBody.CompareTag("Player") || caughtBody.CompareTag("Ship"))
{
qsbAngler.TargetTransform = caughtBody.transform;

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

@ -35,6 +35,7 @@ namespace QSB.Anglerfish.TransformSync
{
NetIdentity.UnregisterAuthQueue();
}
AttachedObject.OnUnsuspendOWRigidbody -= OnUnsuspend;
AttachedObject.OnSuspendOWRigidbody -= OnSuspend;
}
@ -53,6 +54,7 @@ namespace QSB.Anglerfish.TransformSync
{
NetIdentity.RegisterAuthQueue();
}
AttachedObject.OnUnsuspendOWRigidbody += OnUnsuspend;
AttachedObject.OnSuspendOWRigidbody += OnSuspend;
NetIdentity.SendAuthQueueMessage(AttachedObject.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add);

1
QSB/Animation/NPC/Patches/CharacterAnimationPatches.cs
View File

@ -110,6 +110,7 @@ namespace QSB.Animation.NPC.Patches
var qsbObj = __instance.GetWorldObject<QSBCharacterAnimController>();
new EnterLeaveMessage(EnterLeaveType.EnterNonNomaiHeadZone, qsbObj.ObjectId).Send();
}
return false;
}

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

@ -63,6 +63,7 @@ namespace QSB.Animation.NPC.Patches
var qsbObj = __instance._solanumAnimController.GetWorldObject<QSBSolanumAnimController>();
new EnterLeaveMessage(EnterLeaveType.ExitNomaiHeadZone, qsbObj.ObjectId).Send();
}
return false;
}

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

@ -32,7 +32,6 @@ namespace QSB.Animation.NPC.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(TravelerController), nameof(TravelerController.StartConversation))]
public static bool StartConversation(TravelerController __instance)
@ -44,6 +43,7 @@ namespace QSB.Animation.NPC.Patches
: __instance._animator.GetCurrentAnimatorStateInfo(0).fullPathHash;
__instance._animator.SetTrigger("Talking");
}
Locator.GetTravelerAudioManager().StopTravelerAudio(__instance);
return false;
@ -58,6 +58,7 @@ namespace QSB.Animation.NPC.Patches
__instance._animator.CrossFadeInFixedTime("Gabbro_Talking", 1.8f);
__instance._hammockAnimator.CrossFadeInFixedTime("GabbroHammock_Talking", 1.8f);
}
Locator.GetTravelerAudioManager().StopTravelerAudio(__instance);
return false;
@ -78,6 +79,7 @@ namespace QSB.Animation.NPC.Patches
__instance._animator.SetTrigger("Playing");
}
}
Locator.GetTravelerAudioManager().PlayTravelerAudio(__instance, audioDelay);
return false;
@ -92,6 +94,7 @@ namespace QSB.Animation.NPC.Patches
__instance._animator.CrossFadeInFixedTime("Gabbro_Playing", audioDelay, -1, -audioDelay);
__instance._hammockAnimator.CrossFadeInFixedTime("GabbroHammock_Playing", audioDelay, -1, -audioDelay);
}
Locator.GetTravelerAudioManager().PlayTravelerAudio(__instance, audioDelay);
if (DialogueConditionManager.SharedInstance.GetConditionState("MAP_PROMPT_REMINDER") || DialogueConditionManager.SharedInstance.GetConditionState("MAP_PROMPT_ATTENTION"))
{

1
QSB/ClientServerStateSync/ClientStateManager.cs
View File

@ -135,6 +135,7 @@ namespace QSB.ClientServerStateSync
{
newState = ClientState.AliveInEye;
}
break;
default:
newState = ClientState.NotLoaded;

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

@ -105,6 +105,7 @@ namespace QSB.EyeOfTheUniverse.CosmicInflation
_controller._playerPostCollapseSocket = _controller._altPlayerPostCollapseSocket;
_controller._altTravelerToHidePostCollapse.SetActive(false);
}
Locator.GetPlayerBody().SetPosition(_controller._playerPostCollapseSocket.position);
Locator.GetPlayerBody().SetRotation(_controller._playerPostCollapseSocket.rotation);
Locator.GetPlayerBody().SetVelocity(-_controller._playerPostCollapseSocket.forward);

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

@ -18,7 +18,6 @@ namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
}
}
private EyeStateMessage(EyeState state) => Value = state;
public override bool ShouldReceive => WorldObjectManager.AllObjectsReady;

3
QSB/EyeOfTheUniverse/EyeStateSync/Messages/FlickerMessage.cs
View File

@ -20,7 +20,6 @@ namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
}
}
private float _offDuration;
private float _onDuration;
@ -57,6 +56,7 @@ namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
{
throw new InvalidOperationException("GlobalMessenger does not support recursive FireEvent calls to the same eventType.");
}
eventData.isInvoking = true;
eventData.temp.AddRange(eventData.callbacks);
foreach (var callback in eventData.temp)
@ -76,6 +76,7 @@ namespace QSB.EyeOfTheUniverse.EyeStateSync.Messages
Debug.LogException(exception);
}
}
eventData.temp.Clear();
eventData.isInvoking = false;
}

1
QSB/EyeOfTheUniverse/ForestOfGalaxies/Messages/KillGalaxiesMessage.cs
View File

@ -47,6 +47,7 @@ namespace QSB.EyeOfTheUniverse.ForestOfGalaxies.Messages
{
galaxyController._galaxies[i].DieAfterSeconds(_deathDelays[i], true, AudioType.EyeGalaxyBlowAway);
}
galaxyController._forestIsDarkTime = Time.time + 65f;
galaxyController.enabled = true;

3
QSB/EyeOfTheUniverse/ForestOfGalaxies/Patches/ForestPatches.cs
View File

@ -78,6 +78,7 @@ namespace QSB.EyeOfTheUniverse.ForestOfGalaxies.Patches
delayList.Add(rnd);
galaxy.DieAfterSeconds(rnd, true, AudioType.EyeGalaxyBlowAway);
}
new KillGalaxiesMessage(delayList).Send();
__instance._forestIsDarkTime = Time.time + delay + 5f;
__instance.enabled = true;
@ -107,10 +108,12 @@ namespace QSB.EyeOfTheUniverse.ForestOfGalaxies.Patches
GlobalMessenger<float, float>.FireEvent(OWEvents.FlickerOffAndOn, 0.5f, 0.5f);
new EyeCloneSeenMessage().Send();
}
if (__instance._warpPlayerNextFrame)
{
__instance.WarpPlayerToCampfire();
}
return false;
}
}

5
QSB/EyeOfTheUniverse/GalaxyMap/QSBCharacterDialogueTree.cs
View File

@ -22,7 +22,6 @@ namespace QSB.EyeOfTheUniverse.GalaxyMap
private DialogueBoxVer2 _currentDialogueBox;
private bool _wasFlashlightOn;
private bool _timeFrozen;
private bool _isRecording;
private const string SIGN_NAME = "SIGN";
private const string RECORDING_NAME = "RECORDING";
@ -356,7 +355,7 @@ namespace QSB.EyeOfTheUniverse.GalaxyMap
Locator.GetToolModeSwapper().UnequipTool();
GlobalMessenger.FireEvent("EnterConversation");
Locator.GetPlayerAudioController().PlayDialogueEnter(_isRecording);
Locator.GetPlayerAudioController().PlayDialogueEnter();
_wasFlashlightOn = Locator.GetFlashlight().IsFlashlightOn();
if (_wasFlashlightOn && _turnOffFlashlight)
{
@ -394,7 +393,7 @@ namespace QSB.EyeOfTheUniverse.GalaxyMap
_interactVolume.ResetInteraction();
Locator.GetPlayerTransform().GetRequiredComponent<PlayerLockOnTargeting>().BreakLock();
GlobalMessenger.FireEvent("ExitConversation");
Locator.GetPlayerAudioController().PlayDialogueExit(_isRecording);
Locator.GetPlayerAudioController().PlayDialogueExit();
if (_wasFlashlightOn && _turnOffFlashlight && _turnOnFlashlight)
{
Locator.GetFlashlight().TurnOn(false);

1
QSB/EyeOfTheUniverse/VesselSync/VesselManager.cs
View File

@ -56,7 +56,6 @@ namespace QSB.EyeOfTheUniverse.VesselSync
}
}
public void Enter(PlayerInfo player)
{
_playersInCage.Add(player);

1
QSB/JellyfishSync/Patches/JellyfishPatches.cs
View File

@ -19,6 +19,7 @@ namespace QSB.JellyfishSync.Patches
{
return true;
}
var qsbJellyfish = __instance.GetWorldObject<QSBJellyfish>();
var sqrMagnitude = (__instance._jellyfishBody.GetPosition() - __instance._planetBody.GetPosition()).sqrMagnitude;

3
QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs
View File

@ -36,6 +36,7 @@ namespace QSB.JellyfishSync.TransformSync
{
NetIdentity.UnregisterAuthQueue();
}
AttachedObject.OnUnsuspendOWRigidbody -= OnUnsuspend;
AttachedObject.OnSuspendOWRigidbody -= OnSuspend;
}
@ -54,6 +55,7 @@ namespace QSB.JellyfishSync.TransformSync
{
NetIdentity.RegisterAuthQueue();
}
AttachedObject.OnUnsuspendOWRigidbody += OnUnsuspend;
AttachedObject.OnSuspendOWRigidbody += OnSuspend;
NetIdentity.SendAuthQueueMessage(AttachedObject.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add);
@ -138,7 +140,6 @@ namespace QSB.JellyfishSync.TransformSync
return true;
}
protected override void OnRenderObject()
{
if (!QSBCore.ShowLinesInDebug

1
QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs
View File

@ -32,7 +32,6 @@ namespace QSB.JellyfishSync.WorldObjects
}
}
public bool IsRising
{
get => AttachedObject._isRising;

2
QSB/Menus/MenuManager.cs
View File

@ -77,6 +77,7 @@ namespace QSB.Menus
_nowLoadingSB = new StringBuilder();
return;
}
_nowLoadingSB.Length = 0;
}
@ -316,6 +317,7 @@ namespace QSB.Menus
{
address = QSBCore.DefaultServerIP;
}
QSBNetworkManager.Instance.networkAddress = address;
QSBNetworkManager.Instance.StartClient();

1
QSB/Messaging/QSBMessage.cs
View File

@ -47,7 +47,6 @@ namespace QSB.Messaging
public override string ToString() => GetType().Name;
}
public abstract class QSBBoolMessage : QSBMessage
{
protected bool Value;

2
QSB/Messaging/QSBMessageManager.cs
View File

@ -104,6 +104,7 @@ namespace QSB.Messaging
DebugLog.ToConsole($"SendTo unknown player! id: {msg.To}, message: {msg}", MessageType.Error);
return;
}
conn.Send(msgType, msg);
}
}
@ -158,7 +159,6 @@ namespace QSB.Messaging
#endregion
public static void SendRaw<M>(this M msg)
where M : QSBMessageRaw
{

1
QSB/Messaging/QSBWorldObjectMessage.cs
View File

@ -42,7 +42,6 @@ namespace QSB.Messaging
}
}
public abstract class QSBBoolWorldObjectMessage<T> : QSBWorldObjectMessage<T> where T : IWorldObject
{
protected bool Value;

3
QSB/MeteorSync/Patches/MeteorPatches.cs
View File

@ -168,7 +168,6 @@ namespace QSB.MeteorSync.Patches
}
}
/// <summary>
/// client only
/// </summary>
@ -271,7 +270,6 @@ namespace QSB.MeteorSync.Patches
}
}
/// <summary>
/// both server and client
/// </summary>
@ -320,6 +318,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
if (!WorldObjectManager.AllObjectsReady)
{
return true;

9
QSB/OrbSync/Patches/OrbPatches.cs
View File

@ -21,10 +21,12 @@ namespace QSB.OrbSync.Patches
{
return;
}
if (!__instance._isBeingDragged)
{
return;
}
var qsbOrb = __instance.GetWorldObject<QSBOrb>();
qsbOrb.SendMessage(new OrbDragMessage(true));
}
@ -37,15 +39,18 @@ namespace QSB.OrbSync.Patches
{
return true;
}
if (!__instance._isBeingDragged)
{
return false;
}
var qsbOrb = __instance.GetWorldObject<QSBOrb>();
if (!qsbOrb.TransformSync.HasAuthority)
{
return false;
}
qsbOrb.SendMessage(new OrbDragMessage(false));
return true;
}
@ -58,6 +63,7 @@ namespace QSB.OrbSync.Patches
{
return true;
}
var qsbOrb = __instance.GetWorldObject<QSBOrb>();
if (!qsbOrb.TransformSync.HasAuthority)
{
@ -77,10 +83,12 @@ namespace QSB.OrbSync.Patches
{
__instance.CancelDrag();
}
if (__instance._orbAudio != null && slot.GetPlayActivationAudio())
{
__instance._orbAudio.PlaySlotActivatedClip();
}
qsbOrb.SendMessage(new OrbSlotMessage(slotIndex));
break;
}
@ -91,6 +99,7 @@ namespace QSB.OrbSync.Patches
__instance._occupiedSlot = null;
qsbOrb.SendMessage(new OrbSlotMessage(-1));
}
__instance._owCollider.SetActivation(__instance._occupiedSlot == null || !__instance._occupiedSlot.IsAttractive() || __instance._isBeingDragged);
return false;

3
QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs
View File

@ -38,6 +38,7 @@ namespace QSB.OrbSync.TransformSync
{
NetIdentity.UnregisterAuthQueue();
}
_attachedBody.OnUnsuspendOWRigidbody -= OnUnsuspend;
_attachedBody.OnSuspendOWRigidbody -= OnSuspend;
}
@ -50,6 +51,7 @@ namespace QSB.OrbSync.TransformSync
DebugLog.ToConsole($"Error - No orb at index {index}.", MessageType.Error);
return;
}
_qsbOrb = orb.GetWorldObject<QSBOrb>();
_qsbOrb.TransformSync = this;
@ -68,6 +70,7 @@ namespace QSB.OrbSync.TransformSync
{
NetIdentity.RegisterAuthQueue();
}
_attachedBody.OnUnsuspendOWRigidbody += OnUnsuspend;
_attachedBody.OnSuspendOWRigidbody += OnSuspend;
NetIdentity.SendAuthQueueMessage(_attachedBody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add);

1
QSB/OrbSync/WorldObjects/QSBOrb.cs
View File

@ -83,6 +83,7 @@ namespace QSB.OrbSync.WorldObjects
{
AttachedObject.CancelDrag();
}
if (AttachedObject._orbAudio != null && newSlot.GetPlayActivationAudio())
{
AttachedObject._orbAudio.PlaySlotActivatedClip();

1
QSB/Patches/QSBPatchManager.cs
View File

@ -65,6 +65,7 @@ namespace QSB.Patches
DebugLog.ToConsole($"Error while patching {patch.GetType().Name} :\r\n{ex}", MessageType.Error);
}
}
_patchedTypes.Add(type);
}

1
QSB/Player/Messages/EnterLeaveMessage.cs
View File

@ -30,7 +30,6 @@ namespace QSB.Player.Messages
}
}
private int ObjectId;
public EnterLeaveMessage(EnterLeaveType type, int objectId = -1)

1
QSB/StatueSync/Messages/StartStatueMessage.cs
View File

@ -35,7 +35,6 @@ namespace QSB.StatueSync.Messages
CameraDegrees = reader.ReadSingle();
}
public override bool ShouldReceive => WorldObjectManager.AllObjectsReady;
public override void OnReceiveLocal()

23
QSB/Tools/PlayerToolsManager.cs
View File

@ -26,23 +26,14 @@ namespace QSB.Tools
{
CreateStowTransforms(player.CameraBody.transform);
Props_HEA_PlayerTool_mat = GameObject.Find("Props_HEA_ProbeLauncher_ProbeCamera/ProbeLauncherChassis").GetComponent<MeshRenderer>().materials[0];
Props_HEA_Lightbulb_OFF_mat = GameObject.Find("Props_HEA_Probe_Prelaunch").GetComponent<MeshRenderer>().materials[1];
var surfaceData = Locator.GetSurfaceManager()._surfaceLookupAsset;
var metal = surfaceData.surfaceTypeGroups[15].materials;
var glass = surfaceData.surfaceTypeGroups[19].materials;
if (QSBSceneManager.CurrentScene == OWScene.SolarSystem)
{
Structure_HEA_PlayerShip_Screens_mat = GameObject.Find("ProbeScreen (1)/ProbeScreenPivot/ProbeScreen").GetComponent<MeshRenderer>().materials[2];
Props_HEA_Lightbulb_mat = GameObject.Find("Props_HEA_Lantern (10)/Lantern_Lamp").GetComponent<MeshRenderer>().materials[0];
Props_HEA_Lightbulb_OFF_mat = GameObject.Find("NomaiResearchExhibit/Props_HEA_Probe_STATIC").GetComponent<MeshRenderer>().materials[1];
}
else if (QSBSceneManager.CurrentScene == OWScene.EyeOfTheUniverse)
{
Props_HEA_Lightbulb_mat = GameObject.Find("lantern_lamp").GetComponent<MeshRenderer>().materials[0];
// BUG : uhhhhh fuckin' uhhhhhhhh (find a material)
Props_HEA_Lightbulb_OFF_mat = null;
Structure_HEA_PlayerShip_Screens_mat = null;
}
Props_HEA_PlayerTool_mat = metal[27];
Props_HEA_Lightbulb_mat = glass[47];
Props_HEA_Lightbulb_OFF_mat = glass[48];
Structure_HEA_PlayerShip_Screens_mat = glass[41];
}
catch (Exception ex)
{

1
QSB/Tools/TranslatorTool/TranslationSync/Patches/SpiralPatches.cs
View File

@ -19,6 +19,7 @@ namespace QSB.Tools.TranslatorTool.TranslationSync.Patches
{
return;
}
if (__instance.IsTranslated(id))
{
return;

2
QSB/TornadoSync/Patches/TornadoPatches.cs
View File

@ -37,6 +37,7 @@ namespace QSB.TornadoSync.Patches
{
__instance.UpdateFormation();
}
if (__instance._isSectorOccupied)
{
__instance.UpdateAnimation();
@ -53,7 +54,6 @@ namespace QSB.TornadoSync.Patches
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(TornadoController), nameof(TornadoController.OnEnterCollapseTrigger))]
public static bool OnEnterCollapseTrigger(TornadoController __instance,

1
QSB/TornadoSync/TornadoManager.cs
View File

@ -32,6 +32,7 @@ namespace QSB.TornadoSync
{
SpawnOccasional(proxy.transform.root.GetAttachedOWRigidbody(), gdBody);
}
SpawnOccasional(cannon._probeBody, gdBody);
// islands

5
QSB/TornadoSync/TransformSync/OccasionalTransformSync.cs
View File

@ -116,14 +116,17 @@ namespace QSB.TornadoSync.TransformSync
{
QueueMove(Locator._playerBody);
}
if (_sectors.Contains(ShipTransformSync.LocalInstance?.ReferenceSector?.AttachedObject))
{
QueueMove(Locator._shipBody);
}
if (_sectors.Contains(PlayerProbeSync.LocalInstance?.ReferenceSector?.AttachedObject))
{
QueueMove(Locator._probe._owRigidbody);
}
foreach (var child in _childBodies)
{
QueueMove(child);
@ -140,7 +143,6 @@ namespace QSB.TornadoSync.TransformSync
return true;
}
private readonly List<MoveData> _toMove = new();
private struct MoveData
@ -186,6 +188,7 @@ namespace QSB.TornadoSync.TransformSync
data.Child.SetVelocity(AttachedObject.FromRelVel(data.RelVel, pos));
data.Child.SetAngularVelocity(AttachedObject.FromRelAngVel(data.RelAngVel));
}
_toMove.Clear();
}
}

4
QSBTests/MessageTests.cs
View File

@ -37,6 +37,7 @@ namespace QSBTests
{
constructor.CheckUses(field, Util.UseType.Store);
}
serialize.CheckUses(field, Util.UseType.Load);
deserialize.CheckUses(field, Util.UseType.Store);
}
@ -73,6 +74,7 @@ namespace QSBTests
{
UseType.Store => OpCodes.Stfld,
UseType.Load => OpCodes.Ldfld,
_ => throw new System.NotImplementedException(),
};
while (true)
@ -92,6 +94,7 @@ namespace QSBTests
{
break;
}
var callBase = il.Any(x =>
x.IsOp(OpCodes.Call, out MethodReference m) &&
m.Eq(baseMethod)
@ -100,6 +103,7 @@ namespace QSBTests
{
break;
}
method = baseMethod;
}

3
QuantumUNET/Transport/QNetworkHash128.cs
View File

@ -66,6 +66,7 @@ namespace QuantumUNET.Transport
{
result = 0;
}
return result;
}
@ -79,8 +80,10 @@ namespace QuantumUNET.Transport
{
str += "0";
}
text = str + text;
}
QNetworkHash128 result;
result.i0 = (byte)(HexToNumber(text[0]) * 16 + HexToNumber(text[1]));
result.i1 = (byte)(HexToNumber(text[2]) * 16 + HexToNumber(text[3]));