kneesox/sdraw_mods_cvr
1
0
Fork 0
mirror of https://github.com/SDraw/ml_mods_cvr.git synced 2026-05-04 01:07:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: kneesox:r180n
Branches Tags
kneesox:master
kneesox:nightly
kneesox:r181-2026
kneesox:r181
kneesox:r181n
kneesox:r180
kneesox:r180n
...
compare: kneesox:master
Branches Tags
kneesox:master
kneesox:nightly
kneesox:r181-2026
kneesox:r181
kneesox:r181n
kneesox:r180
kneesox:r180n

30 commits
r180n ... master

Author SHA1 Message Date
SDraw
2c4fbb1731
Lower default impact sounds volume 2026-05-02 16:28:39 +03:00
SDraw
812b930bed
Version bump 2026-04-26 10:56:23 +03:00
SDraw
c25eaaf754
Merge pull request #5 from Slime-Senpai/master 
Fix ml_vpc
 2026-04-26 10:04:13 +03:00
Slime-Senpai
d8bb5881fc Add ml_vpc readme tutorial for linux 2026-04-25 17:29:07 +02:00
Slime-Senpai
e04724ed9d Fix ml_vpc 2026-04-25 17:08:07 +02:00
SDraw
2a06001100
Impact sounds 2026-04-18 22:42:47 +03:00
SDraw
15de34c0bd
Update README.md 2026-04-04 05:41:42 +00:00
SDraw
e357f83227
PRM fix for build 2026r181 2026-04-04 08:29:42 +03:00
SDraw
49987b5d72
Fix for MelonLoader 0.7.1 2026-02-01 17:49:38 +03:00
SDraw
e6feaff0ec
Update README.md 2025-12-29 20:33:59 +00:00
SDraw
569a521be4
Game build 2025r181 update 2025-12-20 13:44:10 +03:00
SDraw
bab5346876
Update README.md 2025-11-19 09:47:21 +00:00
SDraw
38cb60567e
Version bump, additional credits, late settings initialization 2025-11-19 12:45:56 +03:00
SDraw
9a2832951d
Merge pull request #3 from kafeijao/feature/cookies-from-browser 
Video Player Cookies: Add option to get cookies from browser
 2025-11-18 20:54:43 +03:00
kafeijao
7ada4c4d86
ml_vpc: added options to use cookies from browsers and enable/disable the mod completely 2025-11-18 14:53:59 +00:00
SDraw
da9dc508d0
Update README.md 
Update README.md

Update README.md

Update README.md

Update README.md
 2025-08-27 15:54:25 +03:00
SDraw
92fc568e16
Fix for MelonLoader 0.7.1 2025-08-27 15:14:08 +03:00
SDraw
f8fa7e60f9
Fixes for compilation on Windows 2025-08-17 10:54:05 +03:00
SDraw
1295c1c175
Merge pull request #1 from hanetzer/formatting 
Formatting
 2025-08-17 09:58:14 +03:00
SDraw
8ae86701ac
Merge branch 'nightly' into formatting 2025-08-17 09:57:41 +03:00
SDraw
95e1a687da
Info update 2025-08-17 09:48:38 +03:00
Hanz
987bf62382 ml_dht: archive 2025-08-15 07:07:09 -05:00
Hanz
da6b917d89 Directory.Build.props: only use del command on Windows 2025-08-15 07:05:35 -05:00
Hanz
2b97399a54 ml_vet: archive 2025-08-15 06:50:49 -05:00
Hanz
1b3eacd915 move assembly metadata into AssemblyInfo.cs 2025-08-15 06:50:49 -05:00
Hanz
654ed53af0 ml_prm: ignore paid vendor files 2025-08-15 06:50:49 -05:00
Hanz
253fd1ae81 consolidate dll list in one place 2025-08-15 06:50:45 -05:00
Hanz
0d7f442e9a always use / for a directory separator 2025-08-15 06:49:24 -05:00
Hanz
e1245df3ad normalize line endings and remove BOM 2025-08-15 06:49:24 -05:00
Hanz
afb5191c35 editorconfig/gitconfig/gitignore 2025-08-15 06:49:20 -05:00
146 changed files with 1757 additions and 971 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitconfig Normal file
View file

@ -0,0 +1 @@
*.{cs,csproj,sln} text=auto eol=crlf

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
*.user
.idea
bin
obj

18
README.md
View file

@ -1,18 +0,0 @@
Merged set of MelonLoader mods for ChilloutVR.
**Table for game build 2025r179:**
| Full name | Latest version |
|:---------:|:--------------:|
|[Avatar Motion Tweaker](/ml_amt/README.md)|1.5.1 [:arrow_down:](../../releases/latest/download/AvatarMotionTweaker.dll)|
|[Avatar Synced Look](/ml_asl/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/AvatarSyncedLook.dll)|
|[Better Fingers Tracking](/ml_bft/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/BetterFingersTracking.dll)|
|[Desktop Head Tracking](/ml_dht/README.md)|1.3.2 [:arrow_down:](../../releases/latest/download/DesktopHeadTracking.dll)|
|[Leap Motion Extension](/ml_lme/README.md)| 1.6.1 [:arrow_down:](../../releases/latest/download/LeapMotionExtension.dll)|
|[Pickup Arm Movement](/ml_pam/README.md)|1.2.2 [:arrow_down:](../../releases/latest/download/PickupArmMovement.dll)|
|[Players Instance Notifier](/ml_pin/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/PlayersInstanceNotifier.dll)|
|[Player Movement Copycat](/ml_pmc/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/PlayerMovementCopycat.dll)|
|[Player Pick Up](/ml_ppu/README.md)|1.0.0 [:arrow_down:](../../releases/latest/download/PlayerPickUp.dll)|
|[Player Ragdoll Mod](/ml_prm/README.md)|1.2.3 [:arrow_down:](../../releases/latest/download/PlayerRagdollMod.dll)|
|[Video Player Cookies](/ml_vpc/README.md)|1.0.1 [:arrow_down:](../../releases/latest/download/VideoPlayerCookies.dll)|
|[Vive Eye Tracking](/ml_vet/README.md)|1.0.0 [:arrow_down:](../../releases/latest/download/ViveEyeTracking.dll)|
|[Vive Extended Input](/ml_vei/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/ViveExtendedInput.dll)|

2
js/mods_extension.js
View file

@ -1,4 +1,4 @@
if (typeof modsExtension === 'undefined') {
if (typeof modsExtension === 'undefined') {
window.modsExtension = []
// UI elements, modified from original `inp` types, because I have no js knowledge to hook stuff

2
ml_amt/AvatarParameter.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Util.AnimatorManager;
using ABI_RC.Core.Util.AnimatorManager;
using System.Text.RegularExpressions;
using UnityEngine;

2
ml_amt/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Systems.IK;
using System;
using System.Reflection;

7
ml_amt/Main.cs
View file

@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using UnityEngine;
namespace ml_amt
@ -9,9 +9,12 @@ namespace ml_amt
public override void OnInitializeMelon()
{
Settings.Init();
GameEvents.Init(HarmonyInstance);
}
public override void OnLateInitializeMelon()
{
Settings.Init();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}

2
ml_amt/MotionTweaker.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using ABI_RC.Core.Util.AnimatorManager;
using ABI_RC.Systems.GameEventSystem;

2
ml_amt/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_amt/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;

2
ml_amt/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;

2
ml_amt/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Core.UI;

38
ml_amt/ml_amt.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
@ -6,7 +6,7 @@
<Company>SDraw</Company>
<Product>AvatarMotionTweaker</Product>
<PackageId>AvatarMotionTweaker</PackageId>
<Version>1.5.2</Version>
<Version>1.5.3</Version>
<Platforms>x64</Platforms>
<AssemblyName>AvatarMotionTweaker</AssemblyName>
</PropertyGroup>
@ -20,83 +20,79 @@
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Test.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="AvatarMotionTweaker.json" />
<None Remove="resources\mod_menu.js" />
<None Remove="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="ECM2">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/ECM2.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.PhysicsModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.PhysicsModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_amt/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
// Add own menu
// Add own menu
{
let l_block = document.createElement('div');
l_block.innerHTML = `

34
ml_asl/Main.cs
View file

@ -1,4 +1,6 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Systems.FaceTracking;
using System;
using System.Reflection;
using UnityEngine;
@ -10,25 +12,35 @@ namespace ml_asl
public override void OnInitializeMelon()
{
Settings.Init();
HarmonyInstance.Patch(
typeof(PlayerSetup).GetMethod("UpdatePlayerAvatarMovementData", BindingFlags.Instance | BindingFlags.NonPublic ),
typeof(PlayerSetup).GetMethod("UpdatePlayerAvatarMovementData", BindingFlags.Instance | BindingFlags.NonPublic),
null,
new HarmonyLib.HarmonyMethod(typeof(AvatarSyncedLook).GetMethod(nameof(OnPlayerAvatarMovementDataUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic ))
new HarmonyLib.HarmonyMethod(typeof(AvatarSyncedLook).GetMethod(nameof(OnPlayerAvatarMovementDataUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
);
}
public override void OnLateInitializeMelon()
{
Settings.Init();
}
static void OnPlayerAvatarMovementDataUpdate_Postfix(ref PlayerSetup __instance, PlayerAvatarMovementData ____playerAvatarMovementData)
{
if(Settings.Enabled && (__instance.EyeMovementController != null))
try
{
____playerAvatarMovementData.EyeTrackingOverride = true;
if(Settings.Enabled && (__instance.EyeMovementController != null) && !FaceTrackingManager.Instance.IsEyeDataAvailable())
{
____playerAvatarMovementData.EyeTrackingOverride = true;
if(__instance.EyeMovementController.CurrentTarget != null)
____playerAvatarMovementData.EyeTrackingPosition = __instance.EyeMovementController.CurrentTarget.GetPosition();
else
____playerAvatarMovementData.EyeTrackingPosition = (__instance.transform.GetMatrix() * ms_back).GetPosition();
if(__instance.EyeMovementController.CurrentTarget != null)
____playerAvatarMovementData.EyeTrackingPosition = __instance.EyeMovementController.CurrentTarget.GetPosition();
else
____playerAvatarMovementData.EyeTrackingPosition = (__instance.transform.GetMatrix() * ms_back).GetPosition();
}
}
catch(Exception e)
{
MelonLoader.MelonLogger.Error(e);
}
}
}

2
ml_asl/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_asl/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;

2
ml_asl/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;

2
ml_asl/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.UI;
using ABI_RC.Core.UI;
using System.Reflection;
using UnityEngine;

26
ml_asl/ml_asl.csproj
View file

@ -7,7 +7,7 @@
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>AvatarSyncedLook</Product>
<Version>1.1.2</Version>
<Version>1.1.4</Version>
<AssemblyName>AvatarSyncedLook</AssemblyName>
</PropertyGroup>
@ -17,59 +17,59 @@
</PropertyGroup>
<ItemGroup>
<None Remove="resources\mod_menu.js" />
<None Remove="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
<EmbeddedResource Include="resources/mod_menu.js" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_asl/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
// Add own menu
// Add own menu
{
let l_block = document.createElement('div');
l_block.innerHTML = `

2
ml_bft/AssetsHandler.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using UnityEngine;

2
ml_bft/FingerSystem.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.GameEventSystem;

2
ml_bft/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Systems.IK;
using ABI_RC.Systems.InputManagement;
using System;

2
ml_bft/HandHandlerVR.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using UnityEngine;
using Valve.VR;

2
ml_bft/InputHandler.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Savior;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.InputManagement;
using ABI_RC.Systems.VRModeSwitch;
using UnityEngine;

8
ml_bft/Main.cs
View file

@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
namespace ml_bft
{
@ -9,12 +9,16 @@ namespace ml_bft
public override void OnInitializeMelon()
{
Settings.Init();
AssetsHandler.Load();
GameEvents.Init(HarmonyInstance);
}
public override void OnLateInitializeMelon()
{
Settings.Init();
MelonLoader.MelonCoroutines.Start(WaitForInstances());
}
IEnumerator WaitForInstances()
{
while(ABI_RC.Systems.InputManagement.CVRInputManager.Instance == null)

2
ml_bft/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_bft/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;

2
ml_bft/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;

2
ml_bft/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Core.UI;
using ABI_RC.Systems.IK;

36
ml_bft/ml_bft.csproj
View file

@ -7,7 +7,7 @@
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>BetterFingersTracking</Product>
<Version>1.1.3</Version>
<Version>1.1.4</Version>
<AssemblyName>BetterFingersTracking</AssemblyName>
</PropertyGroup>
@ -17,84 +17,84 @@
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="resources\ovr_fingers.asset" />
<EmbeddedResource Include="resources/mod_menu.js" />
<EmbeddedResource Include="resources/ovr_fingers.asset" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="SteamVR">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\SteamVR.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/SteamVR.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Unity.XR.Hands">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.Hands.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Unity.XR.Hands.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="Unity.XR.OpenVR">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.OpenVR.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Unity.XR.OpenVR.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="Unity.XR.OpenXR">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.OpenXR.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Unity.XR.OpenXR.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.AssetBundleModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AssetBundleModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.XRModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.XRModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_bft/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
{
{
let l_block = document.createElement('div');
l_block.innerHTML = `
<div class ="settings-subcategory">

2
ml_lme/AssetsHandler.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using UnityEngine;

2
ml_lme/DependenciesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;

5
ml_lme/GameEvents.cs
View file

@ -1,4 +1,5 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.InteractionSystem.Base;
using ABI_RC.Core.Player;
using ABI_RC.Systems.IK;
using System;
@ -51,7 +52,7 @@ namespace ml_lme
);
p_instance.Patch(
typeof(CVRPickupObject).GetMethod(nameof(CVRPickupObject.Grab), BindingFlags.Instance | BindingFlags.Public),
typeof(Pickupable).GetMethod(nameof(Pickupable.Grab), BindingFlags.Instance | BindingFlags.Public),
null,
new HarmonyLib.HarmonyMethod(typeof(GameEvents).GetMethod(nameof(OnPickupGrab_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
);

2
ml_lme/LeapHand.cs
View file

@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
namespace ml_lme
{

8
ml_lme/LeapInput.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
@ -29,7 +29,7 @@ namespace ml_lme
public override void ModuleAdded()
{
base.ModuleAdded();
base.InputEnabled = Settings.Enabled;
base.InputModuleEnabled = Settings.Enabled;
base.HapticFeedback = false;
m_inVR = Utils.IsInVR();
@ -159,7 +159,7 @@ namespace ml_lme
public override void UpdateInput()
{
if(base.InputEnabled)
if(base.InputModuleEnabled)
{
LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData();
@ -360,7 +360,7 @@ namespace ml_lme
// Settings changes
void OnEnableChanged(bool p_state)
{
base.InputEnabled = p_state;
base.InputModuleEnabled = p_state;
m_handVisibleLeft &= p_state;
m_handVisibleRight &= p_state;

2
ml_lme/LeapManager.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Systems.InputManagement;
using System.Collections;
using UnityEngine;

2
ml_lme/LeapParser.cs
View file

@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
namespace ml_lme
{

2
ml_lme/LeapTracked.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using ABI_RC.Systems.GameEventSystem;
using ABI_RC.Systems.IK;

2
ml_lme/LeapTracking.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using UnityEngine;
namespace ml_lme

7
ml_lme/Main.cs
View file

@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using UnityEngine;
namespace ml_lme
@ -11,10 +11,13 @@ namespace ml_lme
public override void OnInitializeMelon()
{
DependenciesHandler.ExtractDependencies();
Settings.Init();
AssetsHandler.Load();
GameEvents.Init(HarmonyInstance);
}
public override void OnLateInitializeMelon()
{
Settings.Init();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}

2
ml_lme/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_lme/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;

2
ml_lme/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;
using UnityEngine;

2
ml_lme/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Core.UI;

52
ml_lme/ml_lme.csproj
View file

@ -4,7 +4,7 @@
<TargetFramework>netstandard2.1</TargetFramework>
<Platforms>x64</Platforms>
<PackageId>LeapMotionExtension</PackageId>
<Version>1.6.2</Version>
<Version>1.6.4</Version>
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>LeapMotionExtension</Product>
@ -17,100 +17,100 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="vendor\LeapSDK\**" />
<EmbeddedResource Remove="vendor\LeapSDK\**" />
<None Remove="vendor\LeapSDK\**" />
<Compile Remove="vendor/LeapSDK/**" />
<EmbeddedResource Remove="vendor/LeapSDK/**" />
<None Remove="vendor/LeapSDK/**" />
</ItemGroup>
<ItemGroup>
<None Remove="LeapMotionExtension.json" />
<None Remove="resources\leapmotion_controller.asset" />
<None Remove="resources\leapmotion_hands.asset" />
<None Remove="resources\mod_menu.js" />
<None Remove="resources/leapmotion_controller.asset" />
<None Remove="resources/leapmotion_hands.asset" />
<None Remove="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\leapmotion_controller.asset" />
<EmbeddedResource Include="resources\leapmotion_hands.asset" />
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="vendor\LeapSDK\lib\x64\LeapC.dll">
<EmbeddedResource Include="resources/leapmotion_controller.asset" />
<EmbeddedResource Include="resources/leapmotion_hands.asset" />
<EmbeddedResource Include="resources/mod_menu.js" />
<EmbeddedResource Include="vendor/LeapSDK/lib/x64/LeapC.dll">
<Link>resources/LeapC.dll</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AssetBundleModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AssetBundleModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.JSONSerializeModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.JSONSerializeModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.JSONSerializeModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.XRModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.XRModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="vendor\LeapCSharp\" />
<Folder Include="vendor/LeapCSharp/" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_lme/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
{
{
let l_block = document.createElement('div');
l_block.innerHTML = `
<div class ="settings-subcategory">

3
ml_mods_cvr.sln
View file

@ -27,6 +27,9 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vpc", "ml_vpc\ml_vpc.csproj", "{7CF37B93-9341-422D-845C-9AB96DB4D0A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_ppu", "ml_ppu\ml_ppu.csproj", "{F16DF16B-D127-4A2A-81FF-2FD80F320E64}"
ProjectSection(ProjectDependencies) = postProject
{C4C3F080-379F-49DB-ADC6-6328BE884AE3} = {C4C3F080-379F-49DB-ADC6-6328BE884AE3}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pah", "ml_pah\ml_pah.csproj", "{C4659F60-3FED-4F43-88E4-969907D4C7A6}"
EndProject

2
ml_pah/AvatarEntry.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
namespace ml_pah
{

7
ml_pah/HistoryManager.cs
View file

@ -1,5 +1,6 @@
using ABI_RC.Core.Networking.API;
using ABI_RC.Core.Networking.API;
using ABI_RC.Core.Networking.API.Responses;
using ABI_RC.Core.Networking.API.Responses.DetailsV2;
using Newtonsoft.Json;
using System;
using System.Collections;
@ -178,12 +179,12 @@ namespace ml_pah
static async Task RequestAvatarInfoTask(AvatarEntry p_entry)
{
BaseResponse<AvatarDetailsResponse> l_baseResponse = await ApiConnection.MakeRequest<AvatarDetailsResponse>(ApiConnection.ApiOperation.AvatarDetail, new { avatarID = p_entry.m_id });
BaseResponse<ContentAvatarResponse> l_baseResponse = await ApiConnection.MakeRequest<ContentAvatarResponse>(ApiConnection.ApiOperation.AvatarDetail, new { avatarID = p_entry.m_id }, "2");
if(l_baseResponse != null)
{
if(!l_baseResponse.IsSuccessStatusCode) return;
p_entry.m_name = l_baseResponse.Data.Name;
p_entry.m_imageUrl = l_baseResponse.Data.ImageUrl;
p_entry.m_imageUrl = l_baseResponse.Data.Image.AbsoluteUri;
p_entry.m_cached = true;
}
}

22
ml_pah/Main.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core;
using System;
using System.Collections;
@ -12,17 +12,12 @@ namespace ml_pah
{
Settings.Init();
HistoryManager.Initialize();
ModUi.Initialize();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}
public override void OnDeinitializeMelon()
public override void OnLateInitializeMelon()
{
CVRGameEventSystem.Avatar.OnLocalAvatarLoad.RemoveListener(this.OnLocalAvatarLoad);
HistoryManager.OnEntriesUpdated.RemoveListener(this.OnHistoryEntriesUpdated);
ModUi.Shutdown();
HistoryManager.Shutdown();
ModUi.Initialize();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}
IEnumerator WaitForRootLogic()
@ -34,6 +29,15 @@ namespace ml_pah
HistoryManager.OnEntriesUpdated.AddListener(this.OnHistoryEntriesUpdated);
}
public override void OnDeinitializeMelon()
{
CVRGameEventSystem.Avatar.OnLocalAvatarLoad.RemoveListener(this.OnLocalAvatarLoad);
HistoryManager.OnEntriesUpdated.RemoveListener(this.OnHistoryEntriesUpdated);
ModUi.Shutdown();
HistoryManager.Shutdown();
}
public override void OnUpdate()
{
HistoryManager.Update();

2
ml_pah/ModUi.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.EventSystem;
using ABI_RC.Core.EventSystem;
using ABI_RC.Core.InteractionSystem;
using BTKUILib.UIObjects;
using BTKUILib.UIObjects.Components;

2
ml_pah/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_pah.PlayerAvatarHistory), "PlayerAvatarHistory", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_pah.PlayerAvatarHistory), "PlayerAvatarHistory", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_pah/Settings.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using UnityEngine;

25
ml_pah/ml_pah.csproj
View file

@ -6,6 +6,7 @@
<PackageId>PlayerAvatarHistory</PackageId>
<AssemblyName>PlayerAvatarHistory</AssemblyName>
<Authors>SDraw</Authors>
<Version>1.0.1</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -14,47 +15,47 @@
</PropertyGroup>
<ItemGroup>
<None Remove="resources\delete.png" />
<None Remove="resources\guardian.png" />
<None Remove="resources\save.png" />
<None Remove="resources/delete.png" />
<None Remove="resources/guardian.png" />
<None Remove="resources/save.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\delete.png" />
<EmbeddedResource Include="resources\guardian.png" />
<EmbeddedResource Include="resources\save.png" />
<EmbeddedResource Include="resources/delete.png" />
<EmbeddedResource Include="resources/guardian.png" />
<EmbeddedResource Include="resources/save.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="BTKUILib">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll</HintPath>
<HintPath>$(CVRPath)/Mods/BTKUILib.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Newtonsoft.Json.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Newtonsoft.Json.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_pam/ArmMover.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
using ABI_RC.Systems.GameEventSystem;

2
ml_pam/AvatarBoolParameter.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Util.AnimatorManager;
using ABI_RC.Core.Util.AnimatorManager;
using System.Text.RegularExpressions;
using UnityEngine;

2
ml_pam/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Player;
using ABI_RC.Systems.IK;
using System;

7
ml_pam/Main.cs
View file

@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
namespace ml_pam
{
@ -8,9 +8,12 @@ namespace ml_pam
public override void OnInitializeMelon()
{
Settings.Init();
GameEvents.Init(HarmonyInstance);
}
public override void OnLateInitializeMelon()
{
Settings.Init();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}

2
ml_pam/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPriority(1)]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]

2
ml_pam/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;

2
ml_pam/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;
using UnityEngine;

2
ml_pam/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Core.UI;
using ABI_RC.Systems.IK;

30
ml_pam/ml_pam.csproj
View file

@ -4,7 +4,7 @@
<TargetFramework>netstandard2.1</TargetFramework>
<Platforms>x64</Platforms>
<PackageId>PickupArmMovement</PackageId>
<Version>1.2.3</Version>
<Version>1.2.4</Version>
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>PickupArmMovement</Product>
@ -18,72 +18,72 @@
<ItemGroup>
<None Remove="PickupArmMovement.json" />
<None Remove="resources\mod_menu.js" />
<None Remove="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.InputLegacyModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_pam/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
{
{
let l_block = document.createElement('div');
l_block.innerHTML = `
<div class ="settings-subcategory">

15
ml_pin/Main.cs
View file

@ -1,8 +1,6 @@
using ABI_RC.Core.AudioEffects;
using ABI_RC.Core.AudioEffects;
using ABI_RC.Core.Networking.IO.Social;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Core.Networking.IO.Instancing;
using ABI_RC.Systems.GameEventSystem;
using System;
using System.Collections;
@ -15,9 +13,12 @@ namespace ml_pin
public override void OnInitializeMelon()
{
Settings.Init();
ResourcesHandler.ExtractAudioResources();
}
public override void OnLateInitializeMelon()
{
Settings.Init();
MelonLoader.MelonCoroutines.Start(WaitForInstances());
}
@ -108,9 +109,9 @@ namespace ml_pin
bool ShouldNotifyInCurrentInstance()
{
bool l_isInPublic = ((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.Public) && Settings.NotifyInPublic);
bool l_isInFriends = (((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.Friends) || (MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.FriendsOfFriends)) && Settings.NotifyInFriends);
bool l_isInPrivate = (((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.EveryoneCanInvite) || (MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.OwnerMustInvite)) && Settings.NotifyInPrivate);
bool l_isInPublic = Utils.IsInPublicInstance() && Settings.NotifyInPublic;
bool l_isInFriends = Utils.IsInFriendsInstance() && Settings.NotifyInFriends;
bool l_isInPrivate = Utils.IsInPrivateInstance() && Settings.NotifyInPrivate;
return (l_isInPublic || l_isInFriends || l_isInPrivate);
}
}

2
ml_pin/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

2
ml_pin/ResourcesHandler.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;

2
ml_pin/Settings.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem;
using System;
using System.Collections.Generic;

2
ml_pin/SoundManager.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.AudioEffects;
using ABI_RC.Core.AudioEffects;
using System;
using System.Collections;
using System.IO;

45
ml_pin/Utils.cs
View file

@ -1,4 +1,5 @@
using ABI_RC.Core.UI;
using ABI_RC.Core.Networking.IO.Instancing;
using ABI_RC.Core.UI;
using System.Reflection;
namespace ml_pin
@ -8,5 +9,47 @@ namespace ml_pin
static readonly FieldInfo ms_view = typeof(CohtmlControlledViewWrapper).GetField("_view", BindingFlags.Instance | BindingFlags.NonPublic);
public static void ExecuteScript(this CohtmlControlledViewWrapper p_instance, string p_script) => (ms_view?.GetValue(p_instance) as cohtml.Net.View)?.ExecuteScript(p_script);
// Instance info
public static bool IsInPublicInstance()
{
bool l_result = false;
switch(Instances.CurrentInstancePrivacyType)
{
case Instances.InstancePrivacyType.Public:
case Instances.InstancePrivacyType.GroupPublic:
l_result = true;
break;
}
return l_result;
}
public static bool IsInFriendsInstance()
{
bool l_result = false;
switch(Instances.CurrentInstancePrivacyType)
{
case Instances.InstancePrivacyType.Friends:
case Instances.InstancePrivacyType.FriendsOfFriends:
case Instances.InstancePrivacyType.GroupPlus:
l_result = true;
break;
}
return l_result;
}
public static bool IsInPrivateInstance()
{
bool l_result = false;
switch(Instances.CurrentInstancePrivacyType)
{
case Instances.InstancePrivacyType.EveryoneCanInvite:
case Instances.InstancePrivacyType.OwnerMustInvite:
case Instances.InstancePrivacyType.Group:
l_result = true;
break;
}
return l_result;
}
}
}

38
ml_pin/ml_pin.csproj
View file

@ -7,7 +7,7 @@
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>PlayersInstanceNotifier</Product>
<Version>1.1.2</Version>
<Version>1.1.3</Version>
<AssemblyName>PlayersInstanceNotifier</AssemblyName>
</PropertyGroup>
@ -17,76 +17,76 @@
</PropertyGroup>
<ItemGroup>
<None Remove="resources\Chime.wav" />
<None Remove="resources\DoorClose.wav" />
<None Remove="resources\mod_menu.js" />
<None Remove="resources/Chime.wav" />
<None Remove="resources/DoorClose.wav" />
<None Remove="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\Chime.wav" />
<EmbeddedResource Include="resources\DoorClose.wav" />
<EmbeddedResource Include="resources/Chime.wav" />
<EmbeddedResource Include="resources/DoorClose.wav" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
<EmbeddedResource Include="resources\mod_menu.js" />
<EmbeddedResource Include="../js/mods_extension.js" Link="resources/mods_extension.js" />
<EmbeddedResource Include="resources/mod_menu.js" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="cohtml.Net">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/cohtml.Net.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Cohtml.Runtime">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AudioModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AudioModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestAudioModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.UnityWebRequestModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_pin/resources/mod_menu.js
View file

@ -1,4 +1,4 @@
{
{
let l_block = document.createElement('div');
l_block.innerHTML = `
<div class ="settings-subcategory">

2
ml_pmc/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using ABI_RC.Systems.IK;
using System;
using System.Reflection;

7
ml_pmc/Main.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using UnityEngine;
namespace ml_pmc
@ -10,9 +10,12 @@ namespace ml_pmc
public override void OnInitializeMelon()
{
Settings.Init();
ModUi.Init();
GameEvents.Init(HarmonyInstance);
}
public override void OnLateInitializeMelon()
{
ModUi.Init();
MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
}

2
ml_pmc/ModUi.cs
View file

@ -1,4 +1,4 @@
using BTKUILib.UIObjects;
using BTKUILib.UIObjects;
using BTKUILib.UIObjects.Components;
using System;
using System.Collections.Generic;

2
ml_pmc/PoseCopycat.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Networking.IO.Social;
using ABI_RC.Core.Player;
using ABI_RC.Systems.GameEventSystem;

2
ml_pmc/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPriority(3)]
[assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")]

2
ml_pmc/PuppetParser.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core.Player;
using UnityEngine;
namespace ml_pmc

2
ml_pmc/Settings.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
namespace ml_pmc

2
ml_pmc/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.InputManagement;

33
ml_pmc/ml_pmc.csproj
View file

@ -7,7 +7,7 @@
<Authors>SDraw</Authors>
<Company>SDraw</Company>
<Product>PlayerMovementCopycat</Product>
<Version>1.1.2</Version>
<Version>1.1.3</Version>
<AssemblyName>PlayerMovementCopycat</AssemblyName>
</PropertyGroup>
@ -17,68 +17,67 @@
</PropertyGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
<ItemGroup>
<None Remove="resources\dancing.png" />
<None Remove="resources\dancing_on.png" />
<None Remove="Utils.cs~RFd8ec2a.TMP" />
<None Remove="resources/dancing.png" />
<None Remove="resources/dancing_on.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\dancing.png" />
<EmbeddedResource Include="resources\dancing_on.png" />
<EmbeddedResource Include="resources/dancing.png" />
<EmbeddedResource Include="resources/dancing_on.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="BTKUILib">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll</HintPath>
<HintPath>$(CVRPath)/Mods/BTKUILib.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="ECM2">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/ECM2.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.PhysicsModule">
<HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.PhysicsModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>

109
ml_ppu/AvatarParameter.cs Normal file
View file

@ -0,0 +1,109 @@
using ABI_RC.Core.Util.AnimatorManager;
using System.Text.RegularExpressions;
using UnityEngine;
namespace ml_ppu
{
class AvatarParameter
{
public readonly string m_name;
public readonly int m_hash = 0;
public readonly bool m_sync;
public readonly AnimatorControllerParameterType m_type;
readonly AvatarAnimatorManager m_manager = null;
public AvatarParameter(string p_name, AvatarAnimatorManager p_manager)
{
m_name = p_name;
m_manager = p_manager;
Regex l_regex = new Regex("^#?" + p_name + '$');
foreach(var l_param in m_manager.Animator.parameters)
{
if(l_regex.IsMatch(l_param.name))
{
m_name = l_param.name;
m_sync = !l_param.name.StartsWith('#');
m_hash = l_param.nameHash;
m_type = l_param.type;
break;
}
}
}
public void SetValue(bool p_value)
{
if(m_hash != 0)
{
if(m_sync)
m_manager.SetParameter(m_name, p_value);
else
{
switch(m_type)
{
case AnimatorControllerParameterType.Bool:
case AnimatorControllerParameterType.Trigger:
m_manager.Animator.SetBool(m_hash, p_value);
break;
case AnimatorControllerParameterType.Int:
m_manager.Animator.SetInteger(m_hash, p_value ? 1 : 0);
break;
case AnimatorControllerParameterType.Float:
m_manager.Animator.SetFloat(m_hash, p_value ? 1f : 0f);
break;
}
}
}
}
public void SetValue(int p_value)
{
if(m_hash != 0)
{
if(m_sync)
m_manager.SetParameter(m_name, p_value);
else
{
switch(m_type)
{
case AnimatorControllerParameterType.Bool:
case AnimatorControllerParameterType.Trigger:
m_manager.Animator.SetBool(m_hash, p_value > 0);
break;
case AnimatorControllerParameterType.Int:
m_manager.Animator.SetInteger(m_hash, p_value);
break;
case AnimatorControllerParameterType.Float:
m_manager.Animator.SetFloat(m_hash, p_value);
break;
}
}
}
}
public void SetValue(float p_value)
{
if(m_hash != 0)
{
if(m_sync)
m_manager.SetParameter(m_name, p_value);
else
{
switch(m_type)
{
case AnimatorControllerParameterType.Bool:
case AnimatorControllerParameterType.Trigger:
m_manager.Animator.SetBool(m_hash, p_value > 0f);
break;
case AnimatorControllerParameterType.Int:
m_manager.Animator.SetInteger(m_hash, (int)p_value);
break;
case AnimatorControllerParameterType.Float:
m_manager.Animator.SetFloat(m_hash, p_value);
break;
}
}
}
}
}
}

2
ml_ppu/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core;
using ABI_RC.Core;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
using System;

2
ml_ppu/GrabDetector.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core.Networking.IO.Social;
using ABI_RC.Core.Player;
using UnityEngine;

7
ml_ppu/Main.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using UnityEngine;
@ -12,9 +12,12 @@ namespace ml_ppu
{
Settings.Init();
GameEvents.Init(HarmonyInstance);
ModUi.Init();
ModSupport.Init();
}
public override void OnLateInitializeMelon()
{
ModUi.Init();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
}

2
ml_ppu/ModSupport.cs
View file

@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
namespace ml_ppu
{

2
ml_ppu/ModUi.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;
using BTKUILib.UIObjects;

11
ml_ppu/PickUpManager.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
@ -33,6 +33,8 @@ namespace ml_ppu
Vector3 m_lastPosition = Vector3.zero;
Vector3 m_velocity = Vector3.zero;
AvatarParameter m_avatarParameter = null;
void Awake()
{
if(Instance != null)
@ -122,6 +124,7 @@ namespace ml_ppu
m_held = false;
BetterBetterCharacterController.Instance.SetVelocity(m_velocity * Settings.VelocityMultiplier);
m_avatarParameter?.SetValue(false);
}
}
}
@ -134,6 +137,8 @@ namespace ml_ppu
Animator l_animator = PlayerSetup.Instance.Animator;
if((l_animator != null) && l_animator.isHuman)
{
m_avatarParameter = new AvatarParameter("PickedUp", PlayerSetup.Instance.AnimatorManager);
IKSystem.Instance.SetAvatarPose(IKSystem.AvatarPose.TPose);
PlayerSetup.Instance.AvatarTransform.localPosition = Vector3.zero;
PlayerSetup.Instance.AvatarTransform.localRotation = Quaternion.identity;
@ -171,6 +176,8 @@ namespace ml_ppu
{
try
{
m_avatarParameter = null;
m_ready = false;
m_held = false;
@ -264,6 +271,8 @@ namespace ml_ppu
m_lastPosition = l_playerPos;
m_velocity = Vector3.zero;
m_held = true;
m_avatarParameter?.SetValue(true);
}
}
}

2
ml_ppu/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_ppu.PlayerPickUp), "PlayerPickUp", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonInfo(typeof(ml_ppu.PlayerPickUp), "PlayerPickUp", "1.0.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonOptionalDependencies("PlayerRagdollMod")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]

5
ml_ppu/README.md
View file

@ -13,9 +13,14 @@ Available mod's settings in BTKUILib's page:
* **Friends only:** allow only friends to pick you up; `true` by default;
* **Velocity multiplier:** velocity multiplier upon drop/throw; `1.0` by default.
To pick you up remote player should:
* Make hands `grab` pointers to appear on your side (usually, press controller grip, trigger button or fist gesture, depends on remote player controllers type);
* Touch your avatar's torso with both pointers;
Available additional parameters for AAS animator:
* **`PickedUp`:** defines current picked up state; boolean.
* Note: Can be set as local-only (not synced) if starts with `#` character.
# Notes
* Compatible with PlayerRagdollMod.

2
ml_ppu/Settings.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using UnityEngine;

2
ml_ppu/Utils.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core;
using ABI_RC.Core;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.Movement;

28
ml_ppu/ml_ppu.csproj
View file

@ -5,7 +5,7 @@
<Platforms>x64</Platforms>
<AssemblyName>PlayerPickUp</AssemblyName>
<Authors>SDraw</Authors>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -14,68 +14,68 @@
</PropertyGroup>
<ItemGroup>
<None Remove="resources\person.png" />
<None Remove="resources/person.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources\person.png" />
<EmbeddedResource Include="resources/person.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/0Harmony.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="BTKUILib">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll</HintPath>
<HintPath>$(CVRPath)/Mods/BTKUILib.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="ECM2">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/ECM2.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="MelonLoader">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
<HintPath>$(CVRPath)/MelonLoader/net35/MelonLoader.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="PlayerRagdollMod">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\Mods\PlayerRagdollMod.dll</HintPath>
<HintPath>$(CVRPath)/Mods/PlayerRagdollMod.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.AnimationModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll</HintPath>
<Private>false</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
<Reference Include="UnityEngine.PhysicsModule">
<HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>$(CVRPath)/ChilloutVR_Data/Managed/UnityEngine.PhysicsModule.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Private>false</Private>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
<Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;$(CVRPath)/Mods/&quot;" />
</Target>
</Project>

2
ml_prm/AvatarParameter.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Util.AnimatorManager;
using ABI_RC.Core.Util.AnimatorManager;
using System.Text.RegularExpressions;
using UnityEngine;

6
ml_prm/GameEvents.cs
View file

@ -1,4 +1,4 @@
using ABI.CCK.Components;
using ABI.CCK.Components;
using ABI_RC.Core;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Player;
@ -55,7 +55,7 @@ namespace ml_prm
);
p_instance.Patch(
typeof(PlayerSetup).GetMethod("SetupIKScaling", BindingFlags.Instance |BindingFlags.NonPublic),
typeof(PlayerSetup).GetMethod("SetupIKScaling", BindingFlags.Instance | BindingFlags.NonPublic),
null,
new HarmonyLib.HarmonyMethod(typeof(GameEvents).GetMethod(nameof(OnSetupIKScaling_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
);
@ -73,7 +73,7 @@ namespace ml_prm
);
p_instance.Patch(
typeof(RootLogic).GetMethod(nameof(RootLogic.SpawnOnWorldInstance),BindingFlags.Instance | BindingFlags.Public),
typeof(RootLogic).GetMethod(nameof(RootLogic.SpawnOnWorldInstance), BindingFlags.Instance | BindingFlags.Public),
new HarmonyLib.HarmonyMethod(typeof(GameEvents).GetMethod(nameof(OnWorldSpawn_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
null
);

13
ml_prm/Main.cs
View file

@ -1,18 +1,23 @@
using ABI_RC.Core.Util.AssetFiltering;
using ABI_RC.Core.Util.AssetFiltering;
namespace ml_prm
{
public class PlayerRagdollMod : MelonLoader.MelonMod
{
RagdollController m_controller = null;
SoundManager m_soundManager = null;
public override void OnInitializeMelon()
{
Settings.Init();
ModUi.Init();
GameEvents.Init(HarmonyInstance);
WorldManager.Init();
ResourcesHandler.ExtractResources();
}
public override void OnLateInitializeMelon()
{
ModUi.Init();
MelonLoader.MelonCoroutines.Start(WaitForRootLogic());
MelonLoader.MelonCoroutines.Start(WaitForWhitelist());
}
@ -23,6 +28,8 @@ namespace ml_prm
yield return null;
m_controller = new UnityEngine.GameObject("[PlayerRagdollMod]").AddComponent<RagdollController>();
m_soundManager = new SoundManager(m_controller.transform);
m_soundManager.LoadSounds();
}
System.Collections.IEnumerator WaitForWhitelist()
@ -37,6 +44,8 @@ namespace ml_prm
{
WorldManager.DeInit();
m_soundManager = null;
if(m_controller != null)
UnityEngine.Object.Destroy(m_controller.gameObject);
m_controller = null;

44
ml_prm/ModUi.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Reflection;
using BTKUILib.UIObjects;
@ -21,7 +21,6 @@ namespace ml_prm
Hotkey = 0,
Gravity,
PointersReaction,
IgnoreLocal,
CombatReaction,
AutoRecover,
Slipperiness,
@ -36,7 +35,8 @@ namespace ml_prm
RecoverDelay,
FallLimit,
GestureGrab,
FriendsGrab
ImpactSounds,
ImpactVolume
}
const string c_ragdollKeyTooltip = "Switch ragdoll mode with '{0}' key";
@ -52,7 +52,6 @@ namespace ml_prm
static ToggleButton ms_hotkeyToggle = null;
static ToggleButton ms_gravityToggle = null;
static ToggleButton ms_pointersToggle = null;
static ToggleButton ms_ignoreLocalToggle = null;
static ToggleButton ms_combatToggle = null;
static ToggleButton ms_recoveryToggle = null;
static ToggleButton ms_slipperinessToggle = null;
@ -62,12 +61,13 @@ namespace ml_prm
static ToggleButton ms_buoyancyToggle = null;
static ToggleButton ms_fallDamageToggle = null;
static ToggleButton ms_gestureGrabToggle = null;
static ToggleButton ms_friendsGrabToggle = null;
static ToggleButton ms_impactSoundsToggle = null;
static SliderFloat ms_velocityMultiplierSlider = null;
static SliderFloat ms_movementDragSlider = null;
static SliderFloat ms_angularMovementDragSlider = null;
static SliderFloat ms_recoverDelaySlider = null;
static SliderFloat ms_fallLimitSlider = null;
static SliderFloat ms_impactVolumeSlider = null;
static Button ms_resetButton = null;
internal static void Init()
@ -94,9 +94,6 @@ namespace ml_prm
ms_pointersToggle = ms_category.AddToggle("Pointers reaction", "React to trigger colliders with CVRPointer component of 'ragdoll' type", Settings.PointersReaction);
ms_pointersToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.PointersReaction, state);
ms_ignoreLocalToggle = ms_category.AddToggle("Ignore local pointers", "Ignore local avatar's CVRPointer components of 'ragdoll' type", Settings.IgnoreLocal);
ms_ignoreLocalToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.IgnoreLocal, state);
ms_combatToggle = ms_category.AddToggle("Combat reaction", "Ragdoll upon combat system death", Settings.CombatReaction);
ms_combatToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.CombatReaction, state);
@ -121,11 +118,11 @@ namespace ml_prm
ms_fallDamageToggle = ms_category.AddToggle("Fall damage", "Enable ragdoll when falling from height", Settings.FallDamage);
ms_fallDamageToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.FallDamage, state);
ms_gestureGrabToggle = ms_category.AddToggle("Gesture grab", "Enable grabbing of ragdolled body parts by remote players with trigger/grab gesture<p>Warning: can lead to unpredictable physics behaviour in some cases", Settings.GestureGrab);
ms_gestureGrabToggle = ms_category.AddToggle("Grab attaching", "Enable attaching of ragdolled body parts to pointers of 'grab' type<p>Warning: can lead to unpredictable physics behaviour in some cases", Settings.GestureGrab);
ms_gestureGrabToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.GestureGrab, state);
ms_friendsGrabToggle = ms_category.AddToggle("Friends grab only", " ", Settings.FriendsGrab);
ms_friendsGrabToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.FriendsGrab, state);
ms_impactSoundsToggle = ms_category.AddToggle("Impact sounds", "Enable collision sound effects of ragdolled body parts", Settings.ImpactSounds);
ms_impactSoundsToggle.OnValueUpdated += (state) => OnToggleUpdate(UiIndex.ImpactSounds, state);
ms_velocityMultiplierSlider = ms_category.AddSlider("Velocity multiplier", "Velocity multiplier upon entering ragdoll state", Settings.VelocityMultiplier, 1f, 50f);
ms_velocityMultiplierSlider.OnValueUpdated += (value) => OnSliderUpdate(UiIndex.VelocityMultiplier, value);
@ -143,6 +140,9 @@ namespace ml_prm
ms_fallLimitSlider.SliderTooltip = string.Format(c_fallLimitTooltip, GetDropHeight(Settings.FallLimit));
ms_fallLimitSlider.OnValueUpdated += (value) => OnSliderUpdate(UiIndex.FallLimit, value);
ms_impactVolumeSlider = ms_category.AddSlider("Impact volume", "Volume of collision of ragdolled body parts", Settings.ImpactVolume * 100f, 0f, 100f);
ms_impactVolumeSlider.OnValueUpdated += (value) => OnSliderUpdate(UiIndex.ImpactVolume, value);
ms_resetButton = ms_category.AddButton("Reset settings", "", "Reset mod settings to default");
ms_resetButton.OnPress += Reset;
}
@ -177,10 +177,6 @@ namespace ml_prm
Settings.SetSetting(Settings.ModSetting.PointersReaction, p_state);
break;
case UiIndex.IgnoreLocal:
Settings.SetSetting(Settings.ModSetting.IgnoreLocal, p_state);
break;
case UiIndex.CombatReaction:
Settings.SetSetting(Settings.ModSetting.CombatReaction, p_state);
break;
@ -217,8 +213,8 @@ namespace ml_prm
Settings.SetSetting(Settings.ModSetting.GestureGrab, p_state);
break;
case UiIndex.FriendsGrab:
Settings.SetSetting(Settings.ModSetting.FriendsGrab, p_state);
case UiIndex.ImpactSounds:
Settings.SetSetting(Settings.ModSetting.ImpactSounds, p_state);
break;
}
}
@ -256,6 +252,10 @@ namespace ml_prm
ms_fallLimitSlider.SliderTooltip = string.Format(c_fallLimitTooltip, GetDropHeight(p_value));
}
break;
case UiIndex.ImpactVolume:
Settings.SetSetting(Settings.ModSetting.ImpactVolume, p_value * 0.01f);
break;
}
}
catch(Exception e)
@ -275,9 +275,6 @@ namespace ml_prm
OnToggleUpdate(UiIndex.PointersReaction, true);
ms_pointersToggle.ToggleValue = true;
OnToggleUpdate(UiIndex.IgnoreLocal, true);
ms_ignoreLocalToggle.ToggleValue = true;
OnToggleUpdate(UiIndex.CombatReaction, true);
ms_combatToggle.ToggleValue = true;
@ -305,8 +302,8 @@ namespace ml_prm
OnToggleUpdate(UiIndex.GestureGrab, false);
ms_gestureGrabToggle.ToggleValue = false;
OnToggleUpdate(UiIndex.FriendsGrab, true);
ms_friendsGrabToggle.ToggleValue = true;
OnToggleUpdate(UiIndex.ImpactSounds, true);
ms_impactSoundsToggle.ToggleValue = true;
OnSliderUpdate(UiIndex.VelocityMultiplier, 2f);
ms_velocityMultiplierSlider.SetSliderValue(2f);
@ -322,6 +319,9 @@ namespace ml_prm
OnSliderUpdate(UiIndex.FallLimit, 9.899494f);
ms_fallLimitSlider.SetSliderValue(9.899494f);
OnSliderUpdate(UiIndex.ImpactVolume, 100f);
ms_impactVolumeSlider.SetSliderValue(25f);
}
static void OnHotkeyKeyChanged(UnityEngine.KeyCode p_keyCode)

Some files were not shown because too many files have changed in this diff Show more