Updating DLL, Patcher and Documentation to v1.6. Minor re-structuring in the Repository.

Author: danielpereira

DLL/CheatFunctions.h

@@ -11,5 +11,5 @@ typedef enum RESOURCE_ID {
 	EXPORT
 } RESOURCE_ID;
 
-extern char(__thiscall *const CheatAddResource)(void* playerData, __int32 resourceID, float resourceAmount, __int8 unk);
-extern void(__cdecl *const CheatSpawnUnit)(void* playerData, char* protoUnitName);
+extern char(__thiscall * const CheatAddResource)(void* playerData, __int32 resourceID, float resourceAmount, __int8 unk);
+extern void(__cdecl * const CheatSpawnUnit)(void* playerData, char* protoUnitName);

DLL/Civs.asm

@@ -282,7 +282,7 @@ code_cave_begin 00461BD8h
     mov eax,[eax]
     
     bb_check:
-    invoke TableIDExists,5,eax
+    invoke TableIDExists,BIGBUTTON_CIVS,eax
     test eax,eax
     je bb_back
     
@@ -291,7 +291,7 @@ code_cave_begin 00461BD8h
     test eax,eax
     je_rel32 00695955_1
     mov eax,[eax+08h]
-    invoke TableIDExists,6,eax
+    invoke TableIDExists,NO_BIGBUTTON_BLDS,eax
     test eax,eax
     je_rel32 00695955_2
     
@@ -347,12 +347,17 @@ code_cave_end 0052B587h
 
 ; Native Civs Patch #4 
 code_cave_begin 00453D5Eh
-    mov edx,eax
+    cmp dword ptr ds:[esp+4], 0
+	je npatch4_check
+	cmp eax, dword ptr ds:[00C6FB5Ch]
+	je npatch4_end
+
+	npatch4_check:
     invoke TableIDExists, NATIVE, eax
     test eax, eax
     jne npatch4_end
-    cmp dword ptr ds:[esp+4], 0
-    jmp_rel32 00453D63
+	xor al,al
+	retn 4
     
     npatch4_end:
     mov al, 1
@@ -431,7 +436,6 @@ PatchNativeCivs proc
 	invoke PatchAddress, hProcess, loc_0052B588, 0052B588h, 1
 
 	patch_code_cave 00453D5Eh, 00453D62h
-	invoke PatchAddress, hProcess, loc_00453D63, 00453D63h, 1
 
 	patch_code_cave 004904B5h, 004904BAh
 	invoke PatchAddress, hProcess, loc_00679E66, 00679E66h, 1
@@ -487,7 +491,7 @@ code_cave_begin 008DABA3h
     invoke getCivIDs, NATIVE
     mov ecx, dword ptr ds:[00C66234h]
     mov ecx, [ecx+140h]
-    invoke getCivIDs, 5
+    invoke getCivIDs, BIGBUTTON_CIVS
     mov edx, dword ptr ds:[00C66234h]
     jmp_rel32 008DABA9
 code_cave_end 008DABA8h

DLL/Limits.asm

@@ -199,4 +199,13 @@ PatchTeamLimit proc
 	ret
 PatchTeamLimit endp
 
+; Fame Restriction Removal
+; Allows using the 'Fame' resource for ProtoActions, like AutoGather or ModifyGather
+
+public stdcall PatchFameRestriction
+PatchFameRestriction proc
+	invoke PatchAddress, hProcess, 0051B026h, 00BD62F8h, 0
+	ret
+PatchFameRestriction endp
+
 end

DLL/Patch.cpp

@@ -2,7 +2,7 @@
 #include "UHC.h"
 
 extern "C" BOOL __stdcall TableIDExists(DWORD dwTable, int id) {
-	if (dwTable < GROUP_COUNT)
+	if (dwTable >= TABLE_COUNT)
 		return FALSE;
 
 	UHCRefTable& table = pUHCInfo->Tables[dwTable];

DLL/UHC.cpp

@@ -181,6 +181,26 @@ UHCInfo::UHCInfo() {
 			}
 		}
 
+		else if (!lstrcmpiA(key.Name, "farmingRadius")) {
+			Enable |= ENABLE_FARM_RADIUS;
+
+			size_t i = 0;
+
+			while (i + 2 < key.Values.GetNumElements()) {
+				UHCFarmRadius aux;
+				aux.RefIndex = atoi(key.Values[i]);
+				aux.X = (float) atof(key.Values[++i]);
+				aux.Z = (float) atof(key.Values[++i]);
+				FarmRadiusInfo.PushBack(aux);
+			}
+
+		}
+
+		else if (!lstrcmpiA(key.Name, "tacticSwitching")) {
+			Enable |= ENABLE_TACTIC_SWITCHING;
+			SetRefTable(Tables[TacticSwitching], key);
+		}
+
 		else if (lstrcmpiA(key.Name, "basePop") == 0 && key.Values.GetNumElements() == 1) {
 			Enable |= ENABLE_POP_LIMIT;
 			BasePop = atoi(key.Values[0]);
@@ -213,6 +233,9 @@ UHCInfo::UHCInfo() {
 
 		else if (lstrcmpiA(key.Name, "enableAllTeams") == 0)
 			Enable |= ENABLE_TEAM_LIMIT;
+
+		else if (lstrcmpiA(key.Name, "removeFameRestriction") == 0)
+			Enable |= REMOVE_FAME_RESTRICTION;
 	}
 }
 
@@ -309,6 +332,12 @@ void APIENTRY UHCMain() {
 		if (enable & ENABLE_FARM_ANIM)
 			PatchFarmAnim();
 
+		if (enable & ENABLE_FARM_RADIUS)
+			PatchFarmRadius();
+
+		if (enable & ENABLE_TACTIC_SWITCHING)
+			PatchTacticSwitching();
+
 		if (enable & ENABLE_PATCH_MARKET)
 			PatchMarketUnits();
 
@@ -339,6 +368,9 @@ void APIENTRY UHCMain() {
 		if (enable & ENABLE_REGISTRY_PATH)
 			PatchRegistryPath();
 
+		if (enable & REMOVE_FAME_RESTRICTION)
+			PatchFameRestriction();
+
 		// Load .upl plugins
 		pUHCInfo->LoadPlugins();
 	}

DLL/UHC.h

@@ -9,14 +9,15 @@ struct UHCRefTable {
 	DWORD *RefIDs;
 };
 
-#define TABLE_COUNT 7
+#define TABLE_COUNT 8
 
 enum UHCTableName {
 	Farm,
 	RectFarm,
 	Market,
 	Asian,
 	Native,
+	TacticSwitching,
 	BigButtonCivs,
 	NoBigButtonBlds
 };
@@ -63,6 +64,11 @@ struct UHCCheat {
 	LPVOID FunctionPtr;
 };
 
+struct UHCFarmRadius {
+	DWORD RefIndex;
+	float X, Z;
+};
+
 #define ENABLE_AI_LIMIT 0x1
 #define ENABLE_CHEAT 0x2
 #define ENABLE_DECK_LIMIT 0x4
@@ -76,6 +82,9 @@ struct UHCCheat {
 #define ENABLE_NATIVE_CIVS 0x400
 #define ENABLE_ASIAN_CIVS 0x800
 #define ENABLE_BIGBUTTON 0x1000
+#define ENABLE_FARM_RADIUS 0x2000
+#define ENABLE_TACTIC_SWITCHING 0x4000
+#define REMOVE_FAME_RESTRICTION 0x8000
 
 class UHCInfo {
 public:
@@ -87,6 +96,7 @@ class UHCInfo {
 	TArray<LPWSTR> Personalities;
 	TArray<LPWSTR> AsianCivNames;
 	TArray<LPWSTR> NativeCivNames;
+	TArray<UHCFarmRadius> FarmRadiusInfo;
 
 	UHCInfo();
 	~UHCInfo();
@@ -126,6 +136,9 @@ extern "C" {
 	void __stdcall PatchAsianCivs();
 	void __stdcall PatchNativeCivs();
 	void __stdcall PatchBigButton();
+	void __stdcall PatchFarmRadius();
+	void __stdcall PatchTacticSwitching();
+	void __stdcall PatchFameRestriction();
 
 	//void __stdcall PatchDumpSyscall();
 }

DLL/UHC.inc

@@ -7,6 +7,9 @@ RECTFARM = 1
 MARKET = 2
 ASIAN = 3
 NATIVE = 4
+TACTIC_SWITCHING = 5
+BIGBUTTON_CIVS = 6
+NO_BIGBUTTON_BLDS = 7
 
 UHCRefTable struct
 	RefCount dd ?
@@ -27,7 +30,15 @@ UHCCheat ends
 
 UHCCheatPtr typedef ptr UHCCheat
 
-TABLE_COUNT = 7
+UHCFarmRadius struct
+	RefIndex dd ?
+	X dd ?
+	Z dd ?
+UHCFarmRadius ends
+
+UHCFarmRadiusPtr typedef ptr UHCFarmRadius
+
+TABLE_COUNT = 8
 GROUP_COUNT = 8
 
 UHCInfo struct
@@ -45,6 +56,8 @@ UHCInfo struct
 	AsianCivNames dd ?
 	NativeCivCount dd ?
 	NativeCivNames dd ?
+	FarmRadiusInfoCount dd ?
+	FarmRadiusInfo UHCFarmRadiusPtr ?
 UHCInfo ends
 
 UHCInfoPtr typedef ptr UHCInfo

DLL/UHC.vcxproj

@@ -79,7 +79,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>D:\Program Files (x86)\SteamLibrary\steamapps\common\Age Of Empires 3\bin</OutDir>
+    <OutDir>C:\Program Files (x86)\SteamLibrary\steamapps\common\Age Of Empires 3\bin</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>