diff --git a/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs b/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs index 79b5b3bd..6d243423 100644 --- a/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs +++ b/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs @@ -19,9 +19,10 @@ protected override void ApplyAltEffect(bool active) { stolenKnife = knife; YoinkKnife(); - damageOnPoke *= 4; + dmg *= 4; } usingPlayer.liveMixin.TakeDamage(dmg); + damageOnPoke *= 1.25f; // negative reward function } else { diff --git a/Unity/Assets/Mod/Evil Fumo/Evil Fumo item.prefab b/Unity/Assets/Mod/Evil Fumo/Evil Fumo item.prefab index 0891798f..d1f9845d 100644 --- a/Unity/Assets/Mod/Evil Fumo/Evil Fumo item.prefab +++ b/Unity/Assets/Mod/Evil Fumo/Evil Fumo item.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4427810026626581335} - m_LocalRotation: {x: 0.30061084, y: -0.040196054, z: -0.9146508, w: 0.26726663} - m_LocalPosition: {x: 0.16, y: -0.24, z: -1.74} + m_LocalRotation: {x: 0.625588, y: -0.61014813, z: -0.006086991, w: -0.4861295} + m_LocalPosition: {x: -0.015, y: 0.07, z: 1.22} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8418634198100310474} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 5, y: 325, z: 211} + m_Father: {fileID: 4264099153745794611} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: -142, y: 312, z: 106} --- !u!54 &3813723675008832454 Rigidbody: m_ObjectHideFlags: 0 @@ -83,10 +83,10 @@ MonoBehaviour: ikAimRightArm: 1 leftHandIKTarget: {fileID: 2700174289789152960} rightHandIKTarget: {fileID: 2379098350310527419} - ikAimLookDownAngleLimit: 90 + ikAimLookDownAngleLimit: 30 useLeftAimTargetOnPlayer: 0 hasAnimations: 1 - drawTime: 0.5 + drawTime: 0.1 drawSound: {fileID: 0} drawSoundUnderwater: {fileID: 0} holsterTime: 0.1 @@ -117,8 +117,8 @@ MonoBehaviour: secondaryUseText: hasAltUse: 1 altUseText: Poke ({0}) - altUsableChance: 1 - altEffectOnHugChance: 1 + altUsableChance: 0.25 + altEffectOnHugChance: 0.9 altEffectMinHugTime: 2 altEffectDuration: 5 hugCooldown: 1 @@ -149,41 +149,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.92 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.12 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.4503371 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.55991226 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.36945873 - objectReference: {fileID: 0} - - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.58923256 - objectReference: {fileID: 0} - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -192,7 +157,7 @@ PrefabInstance: - target: {fileID: 746724311710824617, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 73 + value: 64 objectReference: {fileID: 0} - target: {fileID: 1752336031019831118, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} @@ -209,91 +174,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.75 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.4 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.5 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.21850795 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.21850795 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.6724985 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.6724985 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 270 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 206 - objectReference: {fileID: 0} - - target: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.1 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.6577197 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.504686 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.34041518 - objectReference: {fileID: 0} - - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.44363776 - objectReference: {fileID: 0} - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -307,7 +187,7 @@ PrefabInstance: - target: {fileID: 6514621892085946840, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 292 + value: 270 objectReference: {fileID: 0} - target: {fileID: 6614380495750585589, guid: 494d51939a4d56f47a65310c2d52e286, type: 3} @@ -427,12 +307,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8219148621552729296} m_PrefabAsset: {fileID: 0} ---- !u!4 &8418634198100310474 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 487716062766548250, guid: 494d51939a4d56f47a65310c2d52e286, - type: 3} - m_PrefabInstance: {fileID: 8219148621552729296} - m_PrefabAsset: {fileID: 0} --- !u!4 &4264099153745794611 stripped Transform: m_CorrespondingSourceObject: {fileID: 5277470585440791267, guid: 494d51939a4d56f47a65310c2d52e286, diff --git a/Unity/Assets/Mod/Evil Fumo/Prefabs/eliv fmuo.prefab b/Unity/Assets/Mod/Evil Fumo/Prefabs/eliv fmuo.prefab index 64c360e9..f0aa7ed4 100644 --- a/Unity/Assets/Mod/Evil Fumo/Prefabs/eliv fmuo.prefab +++ b/Unity/Assets/Mod/Evil Fumo/Prefabs/eliv fmuo.prefab @@ -117,8 +117,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1798631660459328383} - m_LocalRotation: {x: -0.50162613, y: -0.35124245, z: -0.6951938, w: 0.376438} - m_LocalPosition: {x: 0.18, y: 0.12, z: 0.28} + m_LocalRotation: {x: -0.5119557, y: -0.40365285, z: -0.6313463, w: 0.4199615} + m_LocalPosition: {x: 1.4, y: 0.2, z: 0.4} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5419433240391866972} @@ -384,14 +384,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7421920065753750915} - m_LocalRotation: {x: 0.72331744, y: 0.43967965, z: -0.39190376, w: 0.36042345} - m_LocalPosition: {x: -0.1, y: 0.2, z: 0.25} + m_LocalRotation: {x: 0.43045938, y: 0.43045938, z: -0.56098557, w: 0.56098557} + m_LocalPosition: {x: -1.5, y: 1, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 238201367746555259} m_Father: {fileID: 4736173708019816525} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 60, y: 210, z: 135} + m_LocalEulerAnglesHint: {x: 105, y: 180, z: 90} --- !u!1 &7450774047414590063 GameObject: m_ObjectHideFlags: 0 @@ -509,14 +509,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7477671560574643639} - m_LocalRotation: {x: 0.6830127, y: 0.6830127, z: -0.18301272, w: 0.18301272} - m_LocalPosition: {x: -0.15, y: 0.1, z: 0.1} + m_LocalRotation: {x: 0.6208851, y: 0.73994213, z: -0.19826692, w: 0.16636568} + m_LocalPosition: {x: -1.5, y: 0.1, z: 0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 519677654592181912} m_Father: {fileID: 8737768397791346830} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 30, y: 180, z: 90} + m_LocalEulerAnglesHint: {x: 30, y: 180, z: 80} --- !u!1 &7502298296431153527 GameObject: m_ObjectHideFlags: 0 @@ -667,14 +667,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8968076867070538981} - m_LocalRotation: {x: -0.62364864, y: -0.37326875, z: -0.52330345, w: 0.44484428} - m_LocalPosition: {x: 0.2, y: 0.15, z: 0.08} + m_LocalRotation: {x: -0.4499235, y: -0.41157937, z: -0.68786794, w: 0.39371186} + m_LocalPosition: {x: 1.5, y: 0.2, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2285320029251614515} m_Father: {fileID: 8737768397791346830} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 289, y: 100, z: 180} + m_LocalEulerAnglesHint: {x: 293, y: 49, z: 206} --- !u!1001 &452619963061540272 PrefabInstance: m_ObjectHideFlags: 0 @@ -700,57 +700,57 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.x - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.y - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.z - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.x - value: 0.08 + value: -0.6 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.y - value: -0.1 + value: -2.3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0.17 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 0.006447359 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.14766875 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0.9880746 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0.043140285 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} @@ -760,7 +760,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 17 objectReference: {fileID: 0} - target: {fileID: -7809350589859516066, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} @@ -930,67 +930,67 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.x - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.y - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalScale.z - value: 0.9 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.x - value: 0.03 + value: -0.4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.y - value: -0.1 + value: -1.3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalPosition.z - value: 0.05 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.w - value: 0.03073132 + value: -0.09051445 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.x - value: 0.14457953 + value: -0.24515282 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.y - value: -0.9674035 + value: -0.75159836 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalRotation.z - value: 0.20562796 + value: -0.605646 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 24 + value: 300 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 120 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 343 + value: 73 objectReference: {fileID: 0} - target: {fileID: -7809350589859516066, guid: e3ae9b09031b4ee4c973e91ee16fd887, type: 3} diff --git a/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab b/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab index c0e26560..01622d84 100644 --- a/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab +++ b/Unity/Assets/Mod/Neurofumo/Neurofumo item.prefab @@ -104,6 +104,7 @@ MonoBehaviour: altUsableChance: 0.05 altEffectOnHugChance: 0.5 altEffectMinHugTime: 10 + altEffectDuration: 5 hugCooldown: 1 hugColdResistBuff: 20 fumoModelSN: {fileID: 5699160057072596943} diff --git a/Unity/Assets/Mod/Neurofumo/Prefabs/Neurofumo2.prefab b/Unity/Assets/Mod/Neurofumo/Prefabs/Neurofumo2.prefab index 115c0d7e..2024fd84 100644 --- a/Unity/Assets/Mod/Neurofumo/Prefabs/Neurofumo2.prefab +++ b/Unity/Assets/Mod/Neurofumo/Prefabs/Neurofumo2.prefab @@ -182,8 +182,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 666456267747732917} - m_LocalRotation: {x: -0.62364864, y: -0.37326875, z: -0.52330345, w: 0.44484428} - m_LocalPosition: {x: 0.2, y: 0.15, z: 0.08} + m_LocalRotation: {x: -0.6877695, y: -0.29703835, z: -0.5470765, w: 0.37342837} + m_LocalPosition: {x: 0.16, y: 0.13, z: 0.17} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3350924741076424414} @@ -921,7 +921,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 4164a75495544b9488a7f9ff390c7c26, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4164a75495544b9488a7f9ff390c7c26, type: 3}