Skip to content

Commit 13e5f3a

Browse files
ermaccerermaccer
committed
update
1 parent 130a08a commit 13e5f3a

28 files changed

+18889
-8120
lines changed

‎MKXHook/MKXHook.rc

0 Bytes
Binary file not shown.

‎MKXHook/MKXHook.vcxproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@
123123
<ClInclude Include="kiero\minhook\src\trampoline.h" />
124124
<ClInclude Include="pch.h" />
125125
<ClInclude Include="resource.h" />
126-
<ClInclude Include="utils\HookInit.hpp" />
127126
<ClInclude Include="utils\MemoryMgr.h" />
128-
<ClInclude Include="utils\Patterns.h" />
129127
<ClInclude Include="utils\Trampoline.h" />
130128
</ItemGroup>
131129
<ItemGroup>
@@ -143,6 +141,7 @@
143141
<ClCompile Include="imgui\imgui_draw.cpp" />
144142
<ClCompile Include="imgui\imgui_impl_dx11.cpp" />
145143
<ClCompile Include="imgui\imgui_impl_win32.cpp" />
144+
<ClCompile Include="imgui\imgui_tables.cpp" />
146145
<ClCompile Include="imgui\imgui_widgets.cpp" />
147146
<ClCompile Include="IniReader.cpp" />
148147
<ClCompile Include="kiero\kiero.cpp" />
@@ -155,7 +154,6 @@
155154
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
156155
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
157156
</ClCompile>
158-
<ClCompile Include="utils\Patterns.cpp" />
159157
</ItemGroup>
160158
<ItemGroup>
161159
<ResourceCompile Include="MKXHook.rc" />

‎MKXHook/MKXHook.vcxproj.filters

+3-9
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<ClInclude Include="utils\MemoryMgr.h">
4040
<Filter>Header Files\utils</Filter>
4141
</ClInclude>
42-
<ClInclude Include="utils\Patterns.h">
43-
<Filter>Header Files\utils</Filter>
44-
</ClInclude>
4542
<ClInclude Include="utils\Trampoline.h">
4643
<Filter>Header Files\utils</Filter>
4744
</ClInclude>
@@ -51,9 +48,6 @@
5148
<ClInclude Include="code\mk10utils.h">
5249
<Filter>Header Files\code</Filter>
5350
</ClInclude>
54-
<ClInclude Include="utils\HookInit.hpp">
55-
<Filter>Header Files\utils</Filter>
56-
</ClInclude>
5751
<ClInclude Include="IniReader.h">
5852
<Filter>Header Files</Filter>
5953
</ClInclude>
@@ -137,9 +131,6 @@
137131
<ClCompile Include="pch.cpp">
138132
<Filter>Source Files</Filter>
139133
</ClCompile>
140-
<ClCompile Include="utils\Patterns.cpp">
141-
<Filter>Header Files\utils</Filter>
142-
</ClCompile>
143134
<ClCompile Include="code\mk10utils.cpp">
144135
<Filter>Header Files\code</Filter>
145136
</ClCompile>
@@ -203,6 +194,9 @@
203194
<ClCompile Include="code\eNotifManager.cpp">
204195
<Filter>Header Files\code</Filter>
205196
</ClCompile>
197+
<ClCompile Include="imgui\imgui_tables.cpp">
198+
<Filter>Header Files\imgui</Filter>
199+
</ClCompile>
206200
</ItemGroup>
207201
<ItemGroup>
208202
<ResourceCompile Include="MKXHook.rc">

‎MKXHook/code/MKCamera.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#include "mkcamera.h"
22
#include "mk10menu.h"
33
#include <iostream>
4+
MKCamera* TheCamera;
45

56
void MKCamera::SetPosition(FVector * pos)
67
{
8+
TheCamera = this;
79
*(float*)(this + 0x414) = pos->X;
810
*(float*)(this + 0x414 + 4) = pos->Y;
911
*(float*)(this + 0x414 + 8) = pos->Z;
@@ -12,6 +14,7 @@ void MKCamera::SetPosition(FVector * pos)
1214

1315
void MKCamera::SetRotation(FRotator * rot)
1416
{
17+
TheCamera = this;
1518
*(int*)(this + 0x414 + 12) = rot->Pitch;
1619
*(int*)(this + 0x414 + 12 + 4) = rot->Yaw;
1720
*(int*)(this + 0x414 + 12 + 8) = rot->Roll;

‎MKXHook/code/MKCamera.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ class MKCamera {
1010

1111
void HookedSetPosition(FVector* pos);
1212
void HookedSetRotation(FRotator* rot);
13-
};
13+
};
14+
15+
extern MKCamera* TheCamera;

‎MKXHook/code/mk10.cpp

+36-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include "mk10utils.h"
44
#include "mk10menu.h"
55
#include <iostream>
6-
#include "..\dxhook.h"
76
#include "eSettingsManager.h"
87
#include "eNotifManager.h"
8+
#include "MKCamera.h"
99
#include <imgui.h>
1010

1111

@@ -127,6 +127,11 @@ void MK10::SetCharacterPosition(FVector * vec, PLAYER_NUM plr)
127127
((int64(__fastcall*)(int64, FVector*))_addr(0x140CBF720))(ptr, vec);
128128
}
129129

130+
void MK10::SetCharacterMeter(int64 obj, float meter)
131+
{
132+
((void(__fastcall*)(int64, float))_addr(0x14055EC40))(obj, meter);
133+
}
134+
130135
int64 MK10Hooks::IsNPCCharacter(const char * character)
131136
{
132137
int64 result = 0;
@@ -193,7 +198,7 @@ void __fastcall MK10Hooks::HookProcessStuff()
193198
if (TheMenu->b1HealthPlayer1)
194199
MK10::GetCharacterObject(PLAYER1)->SetLife(0.01f);
195200
if (TheMenu->bInfiniteSuperBarPlayer1)
196-
MK10::GetCharacterObject(PLAYER1)->SetMeter(1.0f);
201+
MK10::SetCharacterMeter(MK10::GetCharacterInfo(PLAYER1), 1.0f);
197202
}
198203
if (MK10::GetCharacterObject(PLAYER2))
199204
{
@@ -204,7 +209,7 @@ void __fastcall MK10Hooks::HookProcessStuff()
204209
if (TheMenu->b1HealthPlayer2)
205210
MK10::GetCharacterObject(PLAYER2)->SetLife(0.01f);
206211
if (TheMenu->bInfiniteSuperBarPlayer2)
207-
MK10::GetCharacterObject(PLAYER2)->SetMeter(1.0f);
212+
MK10::SetCharacterMeter(MK10::GetCharacterInfo(PLAYER2), 1.0f);
208213
}
209214

210215

@@ -256,7 +261,16 @@ void __fastcall MK10Hooks::HookProcessStuff()
256261
MK10::SetCharacterPosition(&TheMenu->plrPos, PLAYER2);
257262
}
258263

264+
if (TheMenu->bForceMoveCamera)
265+
{
266+
if (TheCamera)
267+
{
268+
TheCamera->HookedSetPosition(&TheMenu->camPos);
269+
TheCamera->HookedSetRotation(&TheMenu->camRot);
270+
TheCamera->SetFOV(TheMenu->camFov);
271+
}
259272

273+
}
260274

261275

262276

@@ -379,3 +393,22 @@ int64 __fastcall MK10Hooks::HookGetCharacterVictory(const char * name, const cha
379393

380394
return ((int64(__fastcall*)(const char*, const char*, char*, int))_addr(0x140553850))(newName,packageID,packageName,packageBuffer);
381395
}
396+
397+
void MK10Hooks::HookDispatch(int64 ptr, int a2)
398+
{
399+
if (TheMenu->bHookDispatch)
400+
{
401+
int64 arg = *(int64*)(ptr);
402+
403+
if (!TheMenu->bFreezeWorld)
404+
a2 = *(uint32_t*)(ptr + 0x18);
405+
406+
if (*(uint32_t*)(ptr + 0x14) == a2)
407+
return;
408+
409+
*(int*)(ptr + 0x14) = a2;
410+
((void(*)(int64, int))*(int64*)(arg + 0xD8))(ptr, a2);
411+
}
412+
else
413+
((int64(__fastcall*)(int64, int))_addr(0x140875590))(ptr, a2);
414+
}

‎MKXHook/code/mk10.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define GFG_GAME_INFO 0x1430DBA00
66

77

8-
#define MKXHOOK_VERSION "0.5.5"
8+
#define MKXHOOK_VERSION "0.5.6"
99

1010
enum PLAYER_NUM
1111
{
@@ -37,7 +37,7 @@ namespace MK10 {
3737

3838
void GetCharacterPosition(FVector* vec, PLAYER_NUM plr);
3939
void SetCharacterPosition(FVector* vec, PLAYER_NUM plr);
40-
40+
void SetCharacterMeter(int64 obj, float meter);
4141

4242
}
4343

@@ -58,6 +58,8 @@ namespace MK10Hooks {
5858
void __fastcall HookDamageMultiplierThree(int64 ptr, float mult);
5959
int64 __fastcall HookGetCharacterVictory(const char* name, const char* packageID, char* packageName, int packageBuffer);
6060

61+
62+
void HookDispatch(int64 ptr, int a2);
6163
}
6264

6365

0 commit comments

Comments
 (0)