-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into sneaky-fumo
- Loading branch information
Showing
46 changed files
with
6,202 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using UnityEngine; | ||
|
|
||
| namespace SCHIZO.Items.Components; | ||
|
|
||
| partial class SeaMonkeyHeldItemOverrides | ||
| { | ||
| private Vector3 _savedLocalPos; | ||
| private Quaternion _savedLocalRot; | ||
| public void OnPickedUp() | ||
| { | ||
| if (!enabled) return; | ||
|
|
||
| _savedLocalPos = overrideTransform.localPosition; | ||
| _savedLocalRot = overrideTransform.localRotation; | ||
|
|
||
| overrideTransform.localPosition = localPosition; | ||
| overrideTransform.localEulerAngles = localRotation; | ||
| } | ||
|
|
||
| public void OnDropped() | ||
| { | ||
| if (!enabled) return; | ||
|
|
||
| overrideTransform.localPosition = _savedLocalPos; | ||
| overrideTransform.localRotation = _savedLocalRot; | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
SCHIZO/Items/Components/SeaMonkeyHeldItemOverridesPatches.BelowZero.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using HarmonyLib; | ||
|
|
||
| namespace SCHIZO.Items.Components; | ||
| [HarmonyPatch] | ||
| public static class SeaMonkeyHeldItemOverridesPatches | ||
| { | ||
| [HarmonyPatch(typeof(SeaMonkeyHeldItem), nameof(SeaMonkeyHeldItem.Hold), [typeof(Pickupable), typeof(bool)])] | ||
| [HarmonyPostfix] | ||
| public static void OnHold(Pickupable pickupable) | ||
| { | ||
| if (!pickupable) return; | ||
| SeaMonkeyHeldItemOverrides overrideComponent = pickupable.GetComponent<SeaMonkeyHeldItemOverrides>(); | ||
| if (!overrideComponent) return; | ||
|
|
||
| overrideComponent.OnPickedUp(); | ||
| } | ||
|
|
||
| [HarmonyPatch(typeof(SeaMonkeyHeldItem), nameof(SeaMonkeyHeldItem.Drop))] | ||
| [HarmonyPrefix] | ||
| public static void OnDrop(SeaMonkeyHeldItem __instance) | ||
| { | ||
| if (!__instance.item) return; | ||
| SeaMonkeyHeldItemOverrides overrideComponent = __instance.item.GetComponent<SeaMonkeyHeldItemOverrides>(); | ||
| if (!overrideComponent) return; | ||
|
|
||
| overrideComponent.OnDropped(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1001 &6525880274626874321 | ||
| PrefabInstance: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 2 | ||
| m_Modification: | ||
| m_TransformParent: {fileID: 0} | ||
| m_Modifications: | ||
| - target: {fileID: 4691052849724364637, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_Materials.Array.data[0] | ||
| value: | ||
| objectReference: {fileID: 2100000, guid: 68c4bf79f01ae85468c245feb1519c49, type: 2} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_RootOrder | ||
| value: 0 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalPosition.x | ||
| value: -0 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalPosition.y | ||
| value: 0 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalPosition.z | ||
| value: 0 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalRotation.w | ||
| value: 0.5 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalRotation.x | ||
| value: -0.5 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalRotation.y | ||
| value: -0.5 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalRotation.z | ||
| value: -0.5 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalEulerAnglesHint.x | ||
| value: -90 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalEulerAnglesHint.y | ||
| value: 0 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_LocalEulerAnglesHint.z | ||
| value: -90 | ||
| objectReference: {fileID: 0} | ||
| - target: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118, | ||
| type: 3} | ||
| propertyPath: m_Name | ||
| value: cog disk | ||
| objectReference: {fileID: 0} | ||
| m_RemovedComponents: [] | ||
| m_SourcePrefab: {fileID: 100100000, guid: d22ec62c611ee7545b0126d2a612b118, type: 3} |
7 changes: 7 additions & 0 deletions
7
Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.