From 3f8c3c8252083afd3f5a5ad413f3f40b3de28c62 Mon Sep 17 00:00:00 2001 From: Joaquin <67109235+Taiga74164@users.noreply.github.com> Date: Sun, 19 Jun 2022 02:21:15 -0600 Subject: [PATCH] Clean up --- cheat-library/src/appdata/il2cpp-functions.h | 24 +-- cheat-library/src/appdata/il2cpp-types.h | 152 ++---------------- .../src/user/cheat/player/GodMode.cpp | 5 +- 3 files changed, 21 insertions(+), 160 deletions(-) diff --git a/cheat-library/src/appdata/il2cpp-functions.h b/cheat-library/src/appdata/il2cpp-functions.h index 495d1b5..848eeee 100644 --- a/cheat-library/src/appdata/il2cpp-functions.h +++ b/cheat-library/src/appdata/il2cpp-functions.h @@ -165,35 +165,17 @@ DO_APP_FUNC(0x0662F720, void, GameObject_set_active, (GameObject* __this, bool v DO_APP_FUNC(0x065546E0, Transform*, Transform_GetChild, (Transform* __this, int32_t index, MethodInfo* method)); DO_APP_FUNC(0x0652EA10, Component_1*, Component_1_GetComponent_1, (Component_1* __this, String* type, MethodInfo* method)); DO_APP_FUNC(0x0662F520, void, GameObject_SetActive, (GameObject* __this, bool value, MethodInfo* method)); - -DO_APP_FUNC(0x0418FEB0, Camera*, Component_1_GetComponent_17, (Component_1* __this, MethodInfo* method)); -DO_APP_FUNC(0x041A7D40, Camera*, GameObject_AddComponent_24, (GameObject* __this, MethodInfo* method)); -DO_APP_FUNC(0x041A8080, CinemachineBrain*, GameObject_GetComponent_189, (GameObject* __this, MethodInfo* method)); -DO_APP_FUNC(0x041A8080, CinemachineExternalCamera*, GameObject_GetComponent_741, (GameObject* __this, MethodInfo* method)); - -DO_APP_FUNC(0x06550C00, Object_1*, Object_1_Instantiate_2, (Object_1* original, MethodInfo* method)); -DO_APP_FUNC(0x041B0BB0, Object*, Object_1_Instantiate_5, (Object* original, MethodInfo* method)); -DO_APP_FUNC(0x041B0BB0, GameObject*, Object_1_Instantiate_11, (GameObject* original, MethodInfo* method)); - -// Browser DO_APP_FUNC(0x0662F100, GameObject*, GameObject_CreatePrimitive, (PrimitiveType__Enum type, MethodInfo* method)); DO_APP_FUNC(0x0662F700, Transform*, GameObject_get_transform, (GameObject* __this, MethodInfo* method)); DO_APP_FUNC(0x06555EF0, void, Transform_set_localRotation, (Transform* __this, Quaternion value, MethodInfo* method)); DO_APP_FUNC(0x065548E0, void, Transform_set_localScale, (Transform* __this, Vector3 value, MethodInfo* method)); DO_APP_FUNC(0x06555EE0, void, Transform_set_localPosition, (Transform* __this, Vector3 value, MethodInfo* method)); DO_APP_FUNC(0x0662F090, Component_1*, GameObject_AddComponentInternal, (GameObject* __this, String* className, MethodInfo* method)); -DO_APP_FUNC(0x064296D0, void, Browser_Show, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x06427060, void, Browser_Hide, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x00C21580, void, Browser_set_EnableRendering, (Browser* __this, bool value, MethodInfo* method)); -DO_APP_FUNC(0x0642C5D0, void, Browser_set_Url, (Browser* __this, String* value, MethodInfo* method)); -DO_APP_FUNC(0x064273E0, void, Browser_LoadURL, (Browser* __this, String* url, bool force, MethodInfo* method)); -DO_APP_FUNC(0x06427610, void, Browser_OnDestroy, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x0642A200, void, Browser_Update, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x06427100, void, Browser_LateUpdate, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x06429770, void, Browser_Stop, (Browser* __this, MethodInfo* method)); -DO_APP_FUNC(0x06550910, void, Object_1_Destroy_1, (Object_1* obj, MethodInfo* method)); DO_APP_FUNC(0x0662F0A0, Component_1*, GameObject_AddComponent, (GameObject* __this, Type* componentType, MethodInfo* method)); DO_APP_FUNC(0x065508C0, void, Object_1_DestroyImmediate_1, (Object_1* obj, MethodInfo* method)); +DO_APP_FUNC(0x06550C00, Object_1*, Object_1_Instantiate_2, (Object_1* original, MethodInfo* method)); +DO_APP_FUNC(0x041B0BB0, Object*, Object_1_Instantiate_5, (Object* original, MethodInfo* method)); +DO_APP_FUNC(0x041B0BB0, GameObject*, Object_1_Instantiate_11, (GameObject* original, MethodInfo* method)); // Music game event diff --git a/cheat-library/src/appdata/il2cpp-types.h b/cheat-library/src/appdata/il2cpp-types.h index 15ad260..90f8431 100644 --- a/cheat-library/src/appdata/il2cpp-types.h +++ b/cheat-library/src/appdata/il2cpp-types.h @@ -11651,142 +11651,6 @@ namespace app { struct Browser__Fields fields; }; - enum class CinemachineBrain_UpdateMethod__Enum : int32_t { - FixedUpdate = 0x00000000, - LateUpdate = 0x00000001, - SmartUpdate = 0x00000002, - }; - - struct CameraState_CustomBlendable { - struct Object_1* m_Custom; - float m_Weight; - }; - - struct CinemachineBlenderSettings__Fields { - void* _; - struct CinemachineBlenderSettings_CustomBlend__Array* m_CustomBlends; - }; - - struct CinemachineBlenderSettings { - struct CinemachineBlenderSettings__Class* klass; - MonitorData* monitor; - struct CinemachineBlenderSettings__Fields fields; - }; - - struct LensSettings { - float FieldOfView; - float OrthographicSize; - float NearClipPlane; - float FarClipPlane; - float Dutch; - bool _Orthographic_k__BackingField; - float _Aspect_k__BackingField; - }; - - struct CameraState { - struct LensSettings _Lens_k__BackingField; - struct Vector3 _ReferenceUp_k__BackingField; - struct Vector3 _ReferenceLookAt_k__BackingField; - struct Vector3 _RawPosition_k__BackingField; - struct Quaternion _RawOrientation_k__BackingField; - struct Vector3 _PositionDampingBypass_k__BackingField; - float _ShotQuality_k__BackingField; - struct Vector3 _PositionCorrection_k__BackingField; - struct Quaternion _OrientationCorrection_k__BackingField; - struct CameraState_CustomBlendable mCustom0; - struct CameraState_CustomBlendable mCustom1; - struct CameraState_CustomBlendable mCustom2; - struct CameraState_CustomBlendable mCustom3; - struct List_1_Cinemachine_CameraState_CustomBlendable_* m_CustomOverflow; - int32_t _NumCustomBlendables_k__BackingField; - }; - - enum class CinemachineBlendDefinition_Style__Enum : int32_t { - Cut = 0x00000000, - EaseInOut = 0x00000001, - EaseIn = 0x00000002, - EaseOut = 0x00000003, - HardIn = 0x00000004, - HardOut = 0x00000005, - Linear = 0x00000006, - Spherical_Linear = 0x00000007, - }; - - struct CinemachineBlendDefinition { - CinemachineBlendDefinition_Style__Enum m_Style; - float m_Time; - struct AnimationCurve* m_BlendCurve; - }; - - struct CinemachineBrain__Fields { - struct MonoBehaviour__Fields _; - bool m_SelfUpdate; - bool m_ShowDebugText; - bool m_ShowCameraFrustum; - bool m_IgnoreTimeScale; - struct Transform* m_WorldUpOverride; - CinemachineBrain_UpdateMethod__Enum m_UpdateMethod; - struct CinemachineBlendDefinition m_DefaultBlend; - struct CinemachineBlenderSettings* m_CustomBlends; - struct Camera* m_OutputCamera; - float mFieldOfView; - float mNearClipPlane; - float mDutch; - float mOrthographicSize; - struct Vector3 mFinalPosition; - struct Quaternion mOrientationWithoutDutch; - struct Quaternion mFinalOrientation; - struct CinemachineBrain_BrainEvent* m_CameraCutEvent; - struct CinemachineBrain_VcamEvent* m_CameraActivatedEvent; - struct CinemachineBrain_BlendEvent* m_CameraBlendCompeleteEvent; - struct Component_1* _PostProcessingComponent_k__BackingField; - struct ICinemachineCamera* mActiveCameraPreviousFrame; - struct ICinemachineCamera* mOutgoingCameraPreviousFrame; - struct CinemachineBlend* mActiveBlend; - bool mPreviousFrameWasOverride; - struct List_1_Cinemachine_CinemachineBrain_OverrideStackFrame_* mOverrideStack; - int32_t mNextOverrideId; - struct CinemachineBrain_OverrideStackFrame* mOverrideBlendFromNothing; - struct WaitForFixedUpdate* mWaitForFixedUpdate; - struct CameraState _CurrentCameraState_k__BackingField; - }; - - struct CinemachineBrain { - struct CinemachineBrain__Class* klass; - MonitorData* monitor; - struct CinemachineBrain__Fields fields; - }; - - struct CinemachineExternalCamera__Fields { - void* _; - struct Transform* m_LookAt; - struct Camera* m_Camera; - struct CameraState m_State; - struct Transform* _Follow_k__BackingField; - }; - - struct CinemachineExternalCamera { - struct CinemachineExternalCamera__Class* klass; - MonitorData* monitor; - struct CinemachineExternalCamera__Fields fields; - }; - - struct MusicGamePlayComponent__Fields { - void* _; - uint32_t _combo; - float _score_k__BackingField; - uint32_t _maxCombo_k__BackingField; - uint32_t _perfectCnt_k__BackingField; - uint32_t _greatCnt_k__BackingField; - uint32_t _missCnt_k__BackingField; - }; - - struct MusicGamePlayComponent { - struct MusicGamePlayComponent__Class* klass; - MonitorData* monitor; - struct MusicGamePlayComponent__Fields fields; - }; - struct __declspec(align(8)) BeatMapData__Fields { struct List_1_MoleMole_MusicGame_TrackData_* trackDatas; struct POLBDGNBFKM* config; @@ -11814,6 +11678,22 @@ namespace app { struct MusicMetaInfo__Fields fields; }; + struct MusicGamePlayComponent__Fields { + void* _; + uint32_t _combo; + float _score_k__BackingField; + uint32_t _maxCombo_k__BackingField; + uint32_t _perfectCnt_k__BackingField; + uint32_t _greatCnt_k__BackingField; + uint32_t _missCnt_k__BackingField; + }; + + struct MusicGamePlayComponent { + struct MusicGamePlayComponent__Class* klass; + MonitorData* monitor; + struct MusicGamePlayComponent__Fields fields; + }; + struct MoleMole_VCBaseSetDitherValue__Fields { void* _; bool _usingDitherAlpha; diff --git a/cheat-library/src/user/cheat/player/GodMode.cpp b/cheat-library/src/user/cheat/player/GodMode.cpp index 0e4e3d4..484d3db 100644 --- a/cheat-library/src/user/cheat/player/GodMode.cpp +++ b/cheat-library/src/user/cheat/player/GodMode.cpp @@ -88,9 +88,8 @@ namespace cheat::feature { auto& gm = GodMode::GetInstance(); auto& manager = game::EntityManager::instance(); - if (gm.f_AltGodMode) - if (manager.avatar()->runtimeID() == attackeeRuntimeID) - return; + if (gm.f_AltGodMode && manager.avatar()->runtimeID() == attackeeRuntimeID) + return; CALL_ORIGIN(LCBaseCombat_FireBeingHitEvent_Hook, __this, attackeeRuntimeID, attackResult, method); }