fix a couple fumo issues

Alexejhero · Nov 8, 2023 · a257de9 · a257de9
1 parent ee09396
commit a257de9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/SCHIZO/Items/FumoItem/FumoItemTool.cs b/SCHIZO/Items/FumoItem/FumoItemTool.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using SCHIZO.Helpers;
 using UnityEngine;
 
 namespace SCHIZO.Items.FumoItem;
@@ -7,6 +8,7 @@ partial class FumoItemTool
 {
     public bool IsHugging => _isHugging;
     public bool IsFlushed => _isFlushed;
+    private Transform FumoModel => RetargetHelpers.Pick(fumoModelSN, fumoModelBZ);
 
     private const float _hugTransitionDuration = 0.2f;
     private float _hugDistScale;
@@ -23,7 +25,7 @@ partial class FumoItemTool
     private bool _flushOnAltUse;
     private bool _flushOnHug;
     private bool _isFlushed;
-    private const float _flushedZscalar = 2f;
+    private float _flushedZscalar = 1.5f;
 
     private GroundMotor _groundMotor;
 
@@ -184,8 +186,8 @@ public bool SetFlushed(bool flushed)
 
     private void ApplyZScaleMulti(float multi)
     {
-        Vector3 scale = fumoModel.localScale;
+        Vector3 scale = FumoModel.localScale;
         scale.z *= multi;
-        fumoModel.localScale = scale;
+        FumoModel.localScale = scale;
     }
 }
diff --git a/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab b/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab
@@ -103,7 +103,8 @@ MonoBehaviour:
   altUseText: Flushed ({0})
   hugCooldown: 1
   hugColdResistBuff: 20
-  fumoModel: {fileID: 6978155363206644661}
+  fumoModelSN: {fileID: 5699160057072596943}
+  fumoModelBZ: {fileID: 7859187418265201921}
 --- !u!1001 &5020507161881458003
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -192,18 +193,18 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5020507161881458003}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &6978155363206644661 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2700769981969528550, guid: 5a15aed96d8d1b84592bfbe203825ee4,
-    type: 3}
-  m_PrefabInstance: {fileID: 5020507161881458003}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3170597382691848538 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7614554720012481545, guid: 5a15aed96d8d1b84592bfbe203825ee4,
     type: 3}
   m_PrefabInstance: {fileID: 5020507161881458003}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &5699160057072596943 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 773237366140142236, guid: 5a15aed96d8d1b84592bfbe203825ee4,
+    type: 3}
+  m_PrefabInstance: {fileID: 5020507161881458003}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4100465261511830323 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 9028498753040047712, guid: 5a15aed96d8d1b84592bfbe203825ee4,
@@ -222,6 +223,12 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5020507161881458003}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &7859187418265201921 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2935535486473934930, guid: 5a15aed96d8d1b84592bfbe203825ee4,
+    type: 3}
+  m_PrefabInstance: {fileID: 5020507161881458003}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4925704660396223488 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 141848972193470803, guid: 5a15aed96d8d1b84592bfbe203825ee4,

diff --git a/Unity/Assets/Scripts/SCHIZO/Items/FumoItem/FumoItemTool.cs b/Unity/Assets/Scripts/SCHIZO/Items/FumoItem/FumoItemTool.cs
@@ -9,6 +9,7 @@ public sealed partial class FumoItemTool : CustomPlayerTool
         public float hugCooldown = 1f;
         [Range(0, 100)]
         public int hugColdResistBuff = 20;
-        [Required] public Transform fumoModel;
+        [Required] public Transform fumoModelSN;
+        [Required] public Transform fumoModelBZ;
     }
 }