From 858305eb777a43837717b352143a7e95a1a53d68 Mon Sep 17 00:00:00 2001 From: Govorunb Date: Mon, 15 Apr 2024 23:11:55 +1000 Subject: [PATCH] flip the model faces neuro right side up in the pickup animation also flip spawn rotations due to the above --- Unity/Assets/Mod/Jukebox/Creep (evil).asset | 2 +- Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset | 2 +- Unity/Assets/Mod/Jukebox/Francium.asset | 2 +- Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset | 2 +- Unity/Assets/Mod/Jukebox/Neuro Neuro.asset | 2 +- Unity/Assets/Mod/Jukebox/Ocean Man.asset | 4 ++-- Unity/Assets/Mod/Jukebox/Sweater Weather.asset | 2 +- Unity/Assets/Mod/Jukebox/cog disk.prefab | 4 ++-- Unity/Assets/Mod/Jukebox/world.execute(me).asset | 2 +- Unity/Assets/Scripts/SCHIZO/Spawns/SpawnLocation.cs | 9 +++++++++ 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Unity/Assets/Mod/Jukebox/Creep (evil).asset b/Unity/Assets/Mod/Jukebox/Creep (evil).asset index dd24ccba..6c2ea5e8 100644 --- a/Unity/Assets/Mod/Jukebox/Creep (evil).asset +++ b/Unity/Assets/Mod/Jukebox/Creep (evil).asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: -206.1, y: -274.68, z: -740.5} - rotation: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 90, z: 0} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset b/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset index 63150a8f..a4237334 100644 --- a/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset +++ b/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: -59.4, y: 28.69, z: 545.45} - rotation: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 180, z: 0} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Francium.asset b/Unity/Assets/Mod/Jukebox/Francium.asset index daec767d..51a41c1f 100644 --- a/Unity/Assets/Mod/Jukebox/Francium.asset +++ b/Unity/Assets/Mod/Jukebox/Francium.asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: -251.636, y: 41.455, z: -790.693} - rotation: {x: 44, y: 0, z: 75} + rotation: {x: -4, y: 20, z: 80} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset b/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset index 6ff0489b..4eb22777 100644 --- a/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset +++ b/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: -1185, y: 18.19, z: -713} - rotation: {x: 342, y: 329, z: 355} + rotation: {x: -15, y: -65, z: 9} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset b/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset index 6d253735..ff2a1940 100644 --- a/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset +++ b/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: 77.49, y: -377.09, z: -914.05} - rotation: {x: 2, y: 231, z: 332} + rotation: {x: 0, y: 50, z: 20} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Ocean Man.asset b/Unity/Assets/Mod/Jukebox/Ocean Man.asset index 3f9e14ce..e744abbc 100644 --- a/Unity/Assets/Mod/Jukebox/Ocean Man.asset +++ b/Unity/Assets/Mod/Jukebox/Ocean Man.asset @@ -25,6 +25,6 @@ MonoBehaviour: diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118, type: 3} diskSpawnLocation: - position: {x: -82.53, y: -344.26, z: -1396.69} - rotation: {x: 10, y: 45, z: 0} + position: {x: -82.53, y: -344.28, z: -1396.69} + rotation: {x: -2, y: 135, z: 0} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/Sweater Weather.asset b/Unity/Assets/Mod/Jukebox/Sweater Weather.asset index 16a19771..62076cf5 100644 --- a/Unity/Assets/Mod/Jukebox/Sweater Weather.asset +++ b/Unity/Assets/Mod/Jukebox/Sweater Weather.asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: -768, y: 50.1, z: 689.9} - rotation: {x: 358, y: 294, z: 49} + rotation: {x: -10, y: -66, z: 49} unlockFmodEvent: diff --git a/Unity/Assets/Mod/Jukebox/cog disk.prefab b/Unity/Assets/Mod/Jukebox/cog disk.prefab index 87ffb356..4a5fe80a 100644 --- a/Unity/Assets/Mod/Jukebox/cog disk.prefab +++ b/Unity/Assets/Mod/Jukebox/cog disk.prefab @@ -4845,14 +4845,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6492233284419335816} - m_LocalRotation: {x: -0.49991274, y: 0.50008726, z: 0.49991274, w: 0.50008726} + m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 15, y: 15, z: 15} m_Children: - {fileID: 5069898742910002616} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -89.98, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} --- !u!33 &7421088858348413847 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Unity/Assets/Mod/Jukebox/world.execute(me).asset b/Unity/Assets/Mod/Jukebox/world.execute(me).asset index 34155c18..35600f9b 100644 --- a/Unity/Assets/Mod/Jukebox/world.execute(me).asset +++ b/Unity/Assets/Mod/Jukebox/world.execute(me).asset @@ -26,5 +26,5 @@ MonoBehaviour: type: 3} diskSpawnLocation: position: {x: 543.6885, y: -203.07, z: -1065} - rotation: {x: 0, y: 0, z: 2} + rotation: {x: 0, y: 90, z: 2} unlockFmodEvent: diff --git a/Unity/Assets/Scripts/SCHIZO/Spawns/SpawnLocation.cs b/Unity/Assets/Scripts/SCHIZO/Spawns/SpawnLocation.cs index 4139542c..5d307a5a 100644 --- a/Unity/Assets/Scripts/SCHIZO/Spawns/SpawnLocation.cs +++ b/Unity/Assets/Scripts/SCHIZO/Spawns/SpawnLocation.cs @@ -1,4 +1,6 @@ using System; +using JetBrains.Annotations; +using TriInspector; using UnityEngine; namespace SCHIZO.Spawns @@ -8,5 +10,12 @@ public partial struct SpawnLocation { public Vector3 position; public Vector3 rotation; + + [UsedImplicitly] + [Button("Copy Warp Command")] + private readonly void CopyWarpCommand() + { + GUIUtility.systemCopyBuffer = $"warp {position.x} {position.y} {position.z}"; + } } }