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

fix map zoomout always happening at TH

Browse Source
This commit is contained in:
Mister_Nebula 2021-06-23 18:35:56 +01:00
parent 3fb513618c
commit 1c74e6fea4
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
QSB/DeathSync/Patches/MapPatches.cs
View File

@ -1,8 +1,6 @@
using OWML.Utils;
using QSB.Events;
using QSB.Events;
using QSB.Patches;
using QSB.Player;
using QSB.Utility;
using UnityEngine;
namespace QSB.DeathSync.Patches
@ -46,11 +44,9 @@ namespace QSB.DeathSync.Patches
ref bool ____gridOverride,
ref float ____gridTimer,
ref float ____revealLength,
Transform ____playerTransform,
ReferenceFrame ____currentRFrame,
float ____gridLockOnLength,
ref float ____revealTimer,
float ____observatoryRevealLength
ref float ____revealTimer
)
{
if (____isMapMode)
@ -79,14 +75,14 @@ namespace QSB.DeathSync.Patches
____gridRenderer.enabled = false;
____targetTransform = null;
____lockedToTargetTransform = false;
____position = ____playerTransform.position - Locator.GetCenterOfTheUniverse().GetStaticReferenceFrame().GetPosition();
____position = RespawnOnDeath.Instance.DeathPositionWorld - Locator.GetCenterOfTheUniverse().GetStaticReferenceFrame().GetPosition();
____position.y = 0f;
____yaw = ____defaultYawAngle;
____pitch = ____initialPitchAngle;
____zoom = ____initialZoomDist;
____targetZoom = ____defaultZoomDist;
__instance.transform.rotation = Quaternion.LookRotation(-____playerTransform.up, ____playerTransform.forward);
__instance.transform.position = ____activeCam.transform.position;
__instance.transform.rotation = Quaternion.LookRotation(-RespawnOnDeath.Instance.DeathPlayerUpVector, RespawnOnDeath.Instance.DeathPlayerForwardVector);
__instance.transform.position = RespawnOnDeath.Instance.DeathPositionWorld;
____interpPosition = true;
____interpPitch = true;
____interpZoom = true;
@ -95,7 +91,7 @@ namespace QSB.DeathSync.Patches
____gridOverrideSize = (____currentRFrame == null) ? 0f : ____currentRFrame.GetAutopilotArrivalDistance();
____gridOverride = ____gridOverrideSize > 0f;
____gridTimer = (!____gridOverride) ? 0f : ____gridLockOnLength;
____revealLength = ____observatoryRevealLength;
____revealLength = 20f;
____revealTimer = 0f;
____isMapMode = true;
return false;
@ -111,7 +107,6 @@ namespace QSB.DeathSync.Patches
ref float ____revealTimer,
float ____lockOnMoveLength,
float ____revealLength,
float ____observatoryInteractDelay,
ref bool ____screenPromptsVisible,
bool ____isPaused,
ScreenPrompt ____closePrompt,
@ -133,7 +128,6 @@ namespace QSB.DeathSync.Patches
ref float ____pitch,
float ____minPitchAngle,
float ____maxPitchAngle,
Transform ____playerTransform,
ref float ____targetZoom,
float ____minZoomDistance,
float ____maxZoomDistance,
@ -148,7 +142,7 @@ namespace QSB.DeathSync.Patches
var revealFraction = Mathf.Clamp01(____revealTimer / ____revealLength);
var smoothedRevealFraction = Mathf.SmoothStep(0f, 1f, revealFraction);
var canInteractWith = ____revealTimer > ____observatoryInteractDelay;
var canInteractWith = ____revealTimer > 20f;
if (____screenPromptsVisible && ____isPaused)
{
@ -233,11 +227,11 @@ namespace QSB.DeathSync.Patches
var num5 = Mathf.SmoothStep(0f, 1f, num4);
// Create rotation that's looking down at the player from above
var lookingDownAtPlayer = Quaternion.LookRotation(-____playerTransform.up, Vector3.up);
var lookingDownAtPlayer = Quaternion.LookRotation(-RespawnOnDeath.Instance.DeathPlayerUpVector, Vector3.up);
// Get starting position - distance above player
var startingPosition = ____activeCam.transform.position;
startingPosition += ____playerTransform.up * num5 * ____observatoryRevealDist;
var startingPosition = RespawnOnDeath.Instance.DeathPositionWorld;
startingPosition += RespawnOnDeath.Instance.DeathPlayerUpVector * num5 * ____observatoryRevealDist;
// Lerp to final rotation
__instance.transform.rotation = Quaternion.Lerp(lookingDownAtPlayer, finalRotation, num5);

44
QSB/DeathSync/RespawnOnDeath.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using OWML.Utils;
using QSB.Player.TransformSync;
using QSB.Utility;
using System.Linq;
using UnityEngine;
@ -22,6 +23,13 @@ namespace QSB.DeathSync
private PlayerResources _playerResources;
private PlayerSpacesuit _spaceSuit;
private SuitPickupVolume[] _suitPickupVolumes;
private Vector3 _deathPositionRelative;
public Transform DeathClosestAstroObject { get; private set; }
public Vector3 DeathPositionWorld
=> DeathClosestAstroObject.TransformPoint(_deathPositionRelative);
public Vector3 DeathPlayerUpVector { get; private set; }
public Vector3 DeathPlayerForwardVector { get; private set; }
public void Awake() => Instance = this;
@ -47,7 +55,30 @@ namespace QSB.DeathSync
RespawnManager.Instance.TriggerRespawnMap();
//QSBCore.UnityEvents.FireInNUpdates(() => ResetPlayerPosition(), 5);
var inSpace = PlayerTransformSync.LocalInstance.SectorSync.SectorList.Count == 0;
if (inSpace)
{
DeathClosestAstroObject = Locator.GetAstroObject(AstroObject.Name.Sun).transform;
}
else
{
var allAstroobjects = Resources.FindObjectsOfTypeAll<AstroObject>().Where(x => x.GetAstroObjectName() != AstroObject.Name.None && x.GetAstroObjectType() != AstroObject.Type.Satellite);
var ordered = allAstroobjects.OrderBy(x => Vector3.SqrMagnitude(x.transform.position));
DeathClosestAstroObject = ordered.First().transform;
}
var deathPosition = Locator.GetPlayerTransform().position;
_deathPositionRelative = DeathClosestAstroObject.InverseTransformPoint(deathPosition);
DeathPlayerUpVector = Locator.GetPlayerTransform().up;
DeathPlayerForwardVector = Locator.GetPlayerTransform().forward;
var playerBody = Locator.GetPlayerBody();
playerBody.WarpToPositionRotation(_playerSpawnPoint.transform.position, _playerSpawnPoint.transform.rotation);
playerBody.SetVelocity(_playerSpawnPoint.GetPointVelocity());
_playerSpawnPoint.AddObjectToTriggerVolumes(Locator.GetPlayerDetector().gameObject);
_playerSpawnPoint.AddObjectToTriggerVolumes(_fluidDetector.gameObject);
_playerSpawnPoint.OnSpawnPlayer();
_playerResources.SetValue("_isSuffocating", false);
_playerResources.DebugRefillResources();
@ -81,17 +112,6 @@ namespace QSB.DeathSync
}
}
private void ResetPlayerPosition()
{
// Cant use _playerSpawner.DebugWarp because that will warp the ship if the player is in it
var playerBody = Locator.GetPlayerBody();
playerBody.WarpToPositionRotation(_playerSpawnPoint.transform.position, _playerSpawnPoint.transform.rotation);
playerBody.SetVelocity(_playerSpawnPoint.GetPointVelocity());
_playerSpawnPoint.AddObjectToTriggerVolumes(Locator.GetPlayerDetector().gameObject);
_playerSpawnPoint.AddObjectToTriggerVolumes(_fluidDetector.gameObject);
_playerSpawnPoint.OnSpawnPlayer();
}
private SpawnPoint GetSpawnPoint()
{
var spawnList = _playerSpawner.GetValue<SpawnPoint[]>("_spawnList");