abilities update, menu scaling

I2Hook/I2Hook.vcxproj

@@ -26,7 +26,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -59,6 +59,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.asi</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -72,13 +73,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;I2HOOK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;I2HOOK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -140,6 +142,7 @@
     <ClInclude Include="code\mk10utils.h" />
     <ClInclude Include="code\mkcamera.h" />
     <ClInclude Include="code\MKCharacter.h" />
+    <ClInclude Include="code\MKModifier.h" />
     <ClInclude Include="code\MKStructs.h" />
     <ClInclude Include="eDirectX11Hook.h" />
     <ClInclude Include="framework.h" />
@@ -174,8 +177,10 @@
     <ClCompile Include="code\mk10utils.cpp" />
     <ClCompile Include="code\mkcamera.cpp" />
     <ClCompile Include="code\MKCharacter.cpp" />
+    <ClCompile Include="code\MKModifier.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="eDirectX11Hook.cpp" />
+    <ClCompile Include="font.h" />
     <ClCompile Include="imgui\imgui.cpp" />
     <ClCompile Include="imgui\imgui_demo.cpp" />
     <ClCompile Include="imgui\imgui_draw.cpp" />

I2Hook/I2Hook.vcxproj.filters

@@ -126,6 +126,9 @@
     <ClInclude Include="code\eGamepadManager.h">
       <Filter>Header Files\code</Filter>
     </ClInclude>
+    <ClInclude Include="code\MKModifier.h">
+      <Filter>Header Files\code</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -203,6 +206,12 @@
     <ClCompile Include="code\eGamepadManager.cpp">
       <Filter>Header Files\code</Filter>
     </ClCompile>
+    <ClCompile Include="code\MKModifier.cpp">
+      <Filter>Header Files\code</Filter>
+    </ClCompile>
+    <ClCompile Include="font.h">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="utils\LICENSE">

I2Hook/IniReader.cpp

@@ -28,8 +28,8 @@ CIniReader::CIniReader(char* szFileName)
 	strcat(dllPath, szFileName);
 	}
 
- memset(m_szFileName, 0x00, 255);
- memcpy(m_szFileName, dllPath, strlen(dllPath));
+	memset(m_szFileName, 0x00, 255);
+	memcpy(m_szFileName, dllPath, strlen(dllPath));
 }
 int CIniReader::ReadInteger(char* szSection, char* szKey, int iDefaultValue)
 {

I2Hook/code/MKCharacter.cpp

@@ -13,4 +13,19 @@ void MKCharacter::SetScale(FVector * scale)
 void MKCharacter::SetSpeed(float speed)
 {
 	((void(__fastcall*)(MKCharacter*, float))_addr(0x14096E0C0))(this, speed);
-}
+}
+
+void MKCharacter::SetAbility(unsigned int id)
+{
+	*(int*)(this + 99068) = id;
+}
+
+int MKCharacter::GetAbility()
+{
+	return *(int*)(this + 99068);
+}
+
+void MKCharacter::ClearAbility()
+{
+	*(int*)(this + 99068) = 0;
+}

I2Hook/code/MKCharacter.h

@@ -8,5 +8,11 @@ class MKCharacter {
 	void SetLife(float life);
 	void SetScale(FVector* scale);
 	void SetSpeed(float speed);
+	void SetAbility(unsigned int id);
+
+	int GetAbility();
+
+	void ClearAbility();
+
 };
 

I2Hook/code/MKModifier.cpp

@@ -0,0 +1,27 @@
+#include "MKModifier.h"
+#include "mk10utils.h"
+
+TagAssistModifier::TagAssistModifier(const char * character)
+{
+	((void(__fastcall*)(BaseModifier*,const char*, int))_addr(0x140B38390))(this, character, 0);
+}
+
+void TagAssistModifier::Activate(int64 info)
+{
+	((void(__fastcall*)(BaseModifier*, int64))_addr(0x140B3E1A0))(this, info);
+}
+
+TagAssistModifierObject * TagAssistModifier::CreateObject()
+{
+	return  nullptr;
+}
+
+void MKModifier::ActivateModifier(BaseModifier * modifier, MKCharacter * obj)
+{
+	((void(__fastcall*)(MKModifier*, BaseModifier*, MKCharacter*))_addr(0x140B85BD0))(this, modifier, obj);
+}
+
+void TagAssistModifierObject::Activate(MKCharacter* obj)
+{
+	//((void(__fastcall*)(TagAssistModifierObject*, MKCharacter*))_addr(0x1405581D0))(this, obj);
+}

I2Hook/code/MKModifier.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "MKCharacter.h"
+#include "mk10utils.h"
+
+class BaseModifier {
+public:
+	char data[96] = {};
+};
+
+class TagAssistModifierObject {
+public:
+	void Activate(MKCharacter* obj);
+};
+
+class TagAssistModifier : public BaseModifier {
+public:
+	TagAssistModifier(const char* character);
+	void Activate(int64 info);
+	TagAssistModifierObject* CreateObject();
+};
+
+
+
+
+class MKModifier {
+public:
+	void ActivateModifier(BaseModifier* modifier, MKCharacter* obj);
+};
+
+
+

I2Hook/code/dcf2.cpp

@@ -7,7 +7,8 @@
 #include <Windows.h>
 #include "mkcamera.h"
 #include "MKCharacter.h"
-
+#include <math.h>
+#include "MKModifier.h"
 int64 hud_property = 0;
 
 void __fastcall Hooks::HookProcessStuff()
@@ -28,6 +29,19 @@ void __fastcall Hooks::HookProcessStuff()
 			SetCharacterMeter(GetInfo(PLAYER1), 1.0f);
 		if (TheMenu->m_bZeroMeterP1)
 			SetCharacterMeter(GetInfo(PLAYER1), 0.0f);
+
+		if (TheMenu->m_bP1CustomAbilities)
+		{
+			TheMenu->m_nP1Abilities = 0;
+			for (int i = 0; i < sizeof(TheMenu->m_P1Abilities) / sizeof(TheMenu->m_P1Abilities[0]); i++)
+			{
+				if (TheMenu->m_P1Abilities[i])
+				{
+					TheMenu->m_nP1Abilities += pow(2, i);
+				}
+			}
+			GetObj(PLAYER1)->SetAbility(TheMenu->m_nP1Abilities);
+		}
 	}
 
 
@@ -43,6 +57,19 @@ void __fastcall Hooks::HookProcessStuff()
 			SetCharacterMeter(GetInfo(PLAYER2), 1.0f);
 		if (TheMenu->m_bZeroMeterP2)
 			SetCharacterMeter(GetInfo(PLAYER2), 0.0f);
+
+		if (TheMenu->m_bP1CustomAbilities)
+		{
+			TheMenu->m_nP2Abilities = 0;
+			for (int i = 0; i < sizeof(TheMenu->m_P2Abilities) / sizeof(TheMenu->m_P2Abilities[0]); i++)
+			{
+				if (TheMenu->m_P2Abilities[i])
+				{
+					TheMenu->m_nP2Abilities += pow(2, i);
+				}
+			}
+			GetObj(PLAYER2)->SetAbility(TheMenu->m_nP2Abilities);
+		}
 	}
 
 
@@ -227,6 +254,18 @@ void SlowGameTimeForXTicks(float speed, int ticks)
 	((void(__fastcall*)(float, int, int))_addr(0x1409C4630))(speed, ticks, 0);
 }
 
+void SetTagAssist(PLAYER_NUM plr, char * character)
+{
+	((void(__fastcall*)(int64, char*))_addr(0x140B70E50))(GetInfo(plr), character);
+
+}
+
+void LoadModifierAssets()
+{
+	int64 gameinfo = *(__int64*)_addr(GFG_GAME_INFO);
+	((void(__fastcall*)(int64, bool))_addr(0x1405A0C30))(gameinfo, 1);
+}
+
 void SetCharacterLife(int64 obj, float life)
 {
 	((void(__fastcall*)(int64, float))_addr(0x1409725D0))(obj, life);

I2Hook/code/dcf2.h

@@ -5,7 +5,7 @@
 
 #define GFG_GAME_INFO 0x14417DF30
 
-#define I2HOOK_VERSION "0.4.1"
+#define I2HOOK_VERSION "0.4.2"
 
 
 MKCharacter* GetObj(PLAYER_NUM plr);
@@ -22,6 +22,11 @@ void	GetCharacterPosition(FVector* vec,PLAYER_NUM plr);
 
 void	SlowGameTimeForXTicks(float speed, int ticks);
 
+void	SetTagAssist(PLAYER_NUM plr, char* character);
+
+
+void		LoadModifierAssets();
+
 
 
 namespace Hooks {