[Bots] Add spawnBot command
This commit is contained in:
parent
a830fcde97
commit
1d5df78692
@ -38,6 +38,40 @@ namespace Components
|
|||||||
strncpy_s(buffer, 0x400, Utils::String::VA(connectString, num, Bots::BotNames[botId++].data(), protocol, checksum, statVer, statStuff, port), 0x400);
|
strncpy_s(buffer, 0x400, Utils::String::VA(connectString, num, Bots::BotNames[botId++].data(), protocol, checksum, statVer, statStuff, port), 0x400);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned int Bots::Spawn(unsigned int count)
|
||||||
|
{
|
||||||
|
int error = 0;
|
||||||
|
std::vector<Game::gentity_t*> entRefs;
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
std::this_thread::sleep_for(10ms);
|
||||||
|
|
||||||
|
Game::gentity_t* entRef = Game::SV_AddTestClient();
|
||||||
|
if (entRef) entRefs.push_back(entRef);
|
||||||
|
else if (++error == 3) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto& entRef : entRefs)
|
||||||
|
{
|
||||||
|
Renderer::OnDelay([entRef]()
|
||||||
|
{
|
||||||
|
Game::Scr_AddString("autoassign");
|
||||||
|
Game::Scr_AddString("team_marinesopfor");
|
||||||
|
Game::Scr_Notify(entRef, Game::SL_GetString("menuresponse", 0), 2);
|
||||||
|
|
||||||
|
Renderer::OnDelay([entRef]()
|
||||||
|
{
|
||||||
|
Game::Scr_AddString(Utils::String::VA("class%d", Utils::Cryptography::Rand::GenerateInt() % 5));
|
||||||
|
Game::Scr_AddString("changeclass");
|
||||||
|
Game::Scr_Notify(entRef, Game::SL_GetString("menuresponse", 0), 2);
|
||||||
|
}, 1s);
|
||||||
|
}, 1s);
|
||||||
|
}
|
||||||
|
|
||||||
|
return entRefs.size();
|
||||||
|
}
|
||||||
|
|
||||||
Bots::Bots()
|
Bots::Bots()
|
||||||
{
|
{
|
||||||
// Replace connect string
|
// Replace connect string
|
||||||
@ -45,6 +79,36 @@ namespace Components
|
|||||||
|
|
||||||
// Intercept sprintf for the connect string
|
// Intercept sprintf for the connect string
|
||||||
Utils::Hook(0x48ADAB, Bots::BuildConnectString, HOOK_CALL).install()->quick();
|
Utils::Hook(0x48ADAB, Bots::BuildConnectString, HOOK_CALL).install()->quick();
|
||||||
|
|
||||||
|
Command::Add("spawnBot", [](Command::Params* params)
|
||||||
|
{
|
||||||
|
unsigned int count = 1;
|
||||||
|
|
||||||
|
if (params->length() > 1)
|
||||||
|
{
|
||||||
|
if (params->get(1) == "all"s) count = static_cast<unsigned int>(-1);
|
||||||
|
else count = atoi(params->get(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if ingame and host
|
||||||
|
if (!Game::SV_Loaded())
|
||||||
|
{
|
||||||
|
Toast::Show("cardicon_headshot", "^1Error", "You need to be host to spawn bots!", 3000);
|
||||||
|
Logger::Print("You need to be host to spawn bots!\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
count = Bots::Spawn(count);
|
||||||
|
if (count)
|
||||||
|
{
|
||||||
|
Toast::Show("cardicon_headshot", "^2Success", Utils::String::VA("%d %s spawned", count, (count == 1 ? "bot" : "bots")), 3000);
|
||||||
|
Logger::Print("%d %s spawned successfully!\n", count, (count == 1 ? "bot" : "bots"));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Toast::Show("cardicon_headshot", "^1Error", "Unable to spawn new bots!", 3000);
|
||||||
|
Logger::Print("Unable to spawn new bots!");
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Bots::~Bots()
|
Bots::~Bots()
|
||||||
|
@ -16,5 +16,7 @@ namespace Components
|
|||||||
static std::vector<std::string> BotNames;
|
static std::vector<std::string> BotNames;
|
||||||
|
|
||||||
static void BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port);
|
static void BuildConnectString(char* buffer, const char* connectString, int num, int, int protocol, int checksum, int statVer, int statStuff, int port);
|
||||||
|
|
||||||
|
static unsigned int Spawn(unsigned int count);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,8 @@ namespace Components
|
|||||||
Utils::Signal<Renderer::Callback> Renderer::EndRecoverDeviceSignal;
|
Utils::Signal<Renderer::Callback> Renderer::EndRecoverDeviceSignal;
|
||||||
Utils::Signal<Renderer::Callback> Renderer::BeginRecoverDeviceSignal;
|
Utils::Signal<Renderer::Callback> Renderer::BeginRecoverDeviceSignal;
|
||||||
|
|
||||||
|
std::vector<Renderer::DelayedSlot> Renderer::DelayedSlots;
|
||||||
|
|
||||||
__declspec(naked) void Renderer::FrameStub()
|
__declspec(naked) void Renderer::FrameStub()
|
||||||
{
|
{
|
||||||
__asm
|
__asm
|
||||||
@ -24,6 +26,7 @@ namespace Components
|
|||||||
|
|
||||||
void Renderer::FrameHandler()
|
void Renderer::FrameHandler()
|
||||||
{
|
{
|
||||||
|
Renderer::DelaySignal();
|
||||||
Renderer::FrameSignal();
|
Renderer::FrameSignal();
|
||||||
|
|
||||||
Utils::Signal<Renderer::Callback> copy(Renderer::FrameOnceSignal);
|
Utils::Signal<Renderer::Callback> copy(Renderer::FrameOnceSignal);
|
||||||
@ -84,6 +87,34 @@ namespace Components
|
|||||||
Renderer::BeginRecoverDeviceSignal.connect(callback);
|
Renderer::BeginRecoverDeviceSignal.connect(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Renderer::OnDelay(Utils::Slot<Renderer::Callback> callback, std::chrono::nanoseconds delay)
|
||||||
|
{
|
||||||
|
Renderer::DelayedSlot slot;
|
||||||
|
slot.callback = callback;
|
||||||
|
slot.delay = delay;
|
||||||
|
|
||||||
|
Renderer::DelayedSlots.push_back(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Renderer::DelaySignal()
|
||||||
|
{
|
||||||
|
Utils::Signal<Renderer::Callback> signal;
|
||||||
|
|
||||||
|
for(auto i = Renderer::DelayedSlots.begin(); i != Renderer::DelayedSlots.end();)
|
||||||
|
{
|
||||||
|
if(i->interval.elapsed(i->delay))
|
||||||
|
{
|
||||||
|
signal.connect(i->callback);
|
||||||
|
i = Renderer::DelayedSlots.erase(i);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
|
||||||
|
signal();
|
||||||
|
}
|
||||||
|
|
||||||
int Renderer::Width()
|
int Renderer::Width()
|
||||||
{
|
{
|
||||||
return Utils::Hook::Get<int>(0x66E1C68);
|
return Utils::Hook::Get<int>(0x66E1C68);
|
||||||
|
@ -21,17 +21,28 @@ namespace Components
|
|||||||
static void Once(Utils::Slot<Callback> callback);
|
static void Once(Utils::Slot<Callback> callback);
|
||||||
static void OnFrame(Utils::Slot<Callback> callback);
|
static void OnFrame(Utils::Slot<Callback> callback);
|
||||||
static void OnBackendFrame(Utils::Slot<BackendCallback> callback);
|
static void OnBackendFrame(Utils::Slot<BackendCallback> callback);
|
||||||
|
static void OnDelay(Utils::Slot<Callback> callback, std::chrono::nanoseconds delay);
|
||||||
|
|
||||||
static void OnDeviceRecoveryEnd(Utils::Slot<Callback> callback);
|
static void OnDeviceRecoveryEnd(Utils::Slot<Callback> callback);
|
||||||
static void OnDeviceRecoveryBegin(Utils::Slot<Callback> callback);
|
static void OnDeviceRecoveryBegin(Utils::Slot<Callback> callback);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
class DelayedSlot
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
std::chrono::nanoseconds delay;
|
||||||
|
Utils::Time::Interval interval;
|
||||||
|
Utils::Slot<Callback> callback;
|
||||||
|
};
|
||||||
|
|
||||||
static void FrameStub();
|
static void FrameStub();
|
||||||
static void FrameHandler();
|
static void FrameHandler();
|
||||||
|
|
||||||
static void BackendFrameStub();
|
static void BackendFrameStub();
|
||||||
static void BackendFrameHandler();
|
static void BackendFrameHandler();
|
||||||
|
|
||||||
|
static void DelaySignal();
|
||||||
|
|
||||||
static Utils::Signal<Callback> FrameSignal;
|
static Utils::Signal<Callback> FrameSignal;
|
||||||
static Utils::Signal<Callback> FrameOnceSignal;
|
static Utils::Signal<Callback> FrameOnceSignal;
|
||||||
|
|
||||||
@ -39,5 +50,7 @@ namespace Components
|
|||||||
static Utils::Signal<Callback> BeginRecoverDeviceSignal;
|
static Utils::Signal<Callback> BeginRecoverDeviceSignal;
|
||||||
|
|
||||||
static Utils::Signal<BackendCallback> BackendFrameSignal;
|
static Utils::Signal<BackendCallback> BackendFrameSignal;
|
||||||
|
|
||||||
|
static std::vector<DelayedSlot> DelayedSlots;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -212,6 +212,9 @@ namespace Game
|
|||||||
Scr_ExecThread_t Scr_ExecThread = Scr_ExecThread_t(0x4AD0B0);
|
Scr_ExecThread_t Scr_ExecThread = Scr_ExecThread_t(0x4AD0B0);
|
||||||
Scr_FreeThread_t Scr_FreeThread = Scr_FreeThread_t(0x4BD320);
|
Scr_FreeThread_t Scr_FreeThread = Scr_FreeThread_t(0x4BD320);
|
||||||
|
|
||||||
|
Scr_AddString_t Scr_AddString = Scr_AddString_t(0x412310);
|
||||||
|
Scr_Notify_t Scr_Notify = Scr_Notify_t(0x4A4750);
|
||||||
|
|
||||||
Scr_ShutdownAllocNode_t Scr_ShutdownAllocNode = Scr_ShutdownAllocNode_t(0x441650);
|
Scr_ShutdownAllocNode_t Scr_ShutdownAllocNode = Scr_ShutdownAllocNode_t(0x441650);
|
||||||
|
|
||||||
Script_Alloc_t Script_Alloc = Script_Alloc_t(0x422E70);
|
Script_Alloc_t Script_Alloc = Script_Alloc_t(0x422E70);
|
||||||
@ -238,12 +241,14 @@ namespace Game
|
|||||||
|
|
||||||
StringTable_Lookup_t StringTable_Lookup = StringTable_Lookup_t(0x42F0E0);
|
StringTable_Lookup_t StringTable_Lookup = StringTable_Lookup_t(0x42F0E0);
|
||||||
|
|
||||||
|
SV_AddTestClient_t SV_AddTestClient = SV_AddTestClient_t(0x48AD30);
|
||||||
SV_GameClientNum_Score_t SV_GameClientNum_Score = SV_GameClientNum_Score_t(0x469AC0);
|
SV_GameClientNum_Score_t SV_GameClientNum_Score = SV_GameClientNum_Score_t(0x469AC0);
|
||||||
SV_GameSendServerCommand_t SV_GameSendServerCommand = SV_GameSendServerCommand_t(0x4BC3A0);
|
SV_GameSendServerCommand_t SV_GameSendServerCommand = SV_GameSendServerCommand_t(0x4BC3A0);
|
||||||
SV_Cmd_TokenizeString_t SV_Cmd_TokenizeString = SV_Cmd_TokenizeString_t(0x4B5780);
|
SV_Cmd_TokenizeString_t SV_Cmd_TokenizeString = SV_Cmd_TokenizeString_t(0x4B5780);
|
||||||
SV_Cmd_EndTokenizedString_t SV_Cmd_EndTokenizedString = SV_Cmd_EndTokenizedString_t(0x464750);
|
SV_Cmd_EndTokenizedString_t SV_Cmd_EndTokenizedString = SV_Cmd_EndTokenizedString_t(0x464750);
|
||||||
SV_DirectConnect_t SV_DirectConnect = SV_DirectConnect_t(0x460480);
|
SV_DirectConnect_t SV_DirectConnect = SV_DirectConnect_t(0x460480);
|
||||||
SV_SetConfigstring_t SV_SetConfigstring = SV_SetConfigstring_t(0x4982E0);
|
SV_SetConfigstring_t SV_SetConfigstring = SV_SetConfigstring_t(0x4982E0);
|
||||||
|
SV_Loaded_t SV_Loaded = SV_Loaded_t(0x4EE3E0);
|
||||||
|
|
||||||
Sys_Error_t Sys_Error = Sys_Error_t(0x4E0200);
|
Sys_Error_t Sys_Error = Sys_Error_t(0x4E0200);
|
||||||
Sys_FreeFileList_t Sys_FreeFileList = Sys_FreeFileList_t(0x4D8580);
|
Sys_FreeFileList_t Sys_FreeFileList = Sys_FreeFileList_t(0x4D8580);
|
||||||
|
@ -508,6 +508,9 @@ namespace Game
|
|||||||
typedef GfxWorld*(__cdecl * R_SortWorldSurfaces_t)();
|
typedef GfxWorld*(__cdecl * R_SortWorldSurfaces_t)();
|
||||||
extern R_SortWorldSurfaces_t R_SortWorldSurfaces;
|
extern R_SortWorldSurfaces_t R_SortWorldSurfaces;
|
||||||
|
|
||||||
|
typedef void(__cdecl * Scr_AddString_t)(const char* str);
|
||||||
|
extern Scr_AddString_t Scr_AddString;
|
||||||
|
|
||||||
typedef void(__cdecl * Scr_ShutdownAllocNode_t)();
|
typedef void(__cdecl * Scr_ShutdownAllocNode_t)();
|
||||||
extern Scr_ShutdownAllocNode_t Scr_ShutdownAllocNode;
|
extern Scr_ShutdownAllocNode_t Scr_ShutdownAllocNode;
|
||||||
|
|
||||||
@ -532,6 +535,9 @@ namespace Game
|
|||||||
typedef int(__cdecl * Scr_FreeThread_t)(int);
|
typedef int(__cdecl * Scr_FreeThread_t)(int);
|
||||||
extern Scr_FreeThread_t Scr_FreeThread;
|
extern Scr_FreeThread_t Scr_FreeThread;
|
||||||
|
|
||||||
|
typedef void(__cdecl * Scr_Notify_t)(gentity_t *ent, unsigned __int16 stringValue, unsigned int paramcount);
|
||||||
|
extern Scr_Notify_t Scr_Notify;
|
||||||
|
|
||||||
typedef script_t* (__cdecl * Script_Alloc_t)(int length);
|
typedef script_t* (__cdecl * Script_Alloc_t)(int length);
|
||||||
extern Script_Alloc_t Script_Alloc;
|
extern Script_Alloc_t Script_Alloc;
|
||||||
|
|
||||||
@ -568,6 +574,9 @@ namespace Game
|
|||||||
typedef const char*(__cdecl * StringTable_Lookup_t)(StringTable *table, const int comparisonColumn, const char *value, const int valueColumn);
|
typedef const char*(__cdecl * StringTable_Lookup_t)(StringTable *table, const int comparisonColumn, const char *value, const int valueColumn);
|
||||||
extern StringTable_Lookup_t StringTable_Lookup;
|
extern StringTable_Lookup_t StringTable_Lookup;
|
||||||
|
|
||||||
|
typedef gentity_t*(__cdecl* SV_AddTestClient_t)();
|
||||||
|
extern SV_AddTestClient_t SV_AddTestClient;
|
||||||
|
|
||||||
typedef int(__cdecl* SV_GameClientNum_Score_t)(int clientID);
|
typedef int(__cdecl* SV_GameClientNum_Score_t)(int clientID);
|
||||||
extern SV_GameClientNum_Score_t SV_GameClientNum_Score;
|
extern SV_GameClientNum_Score_t SV_GameClientNum_Score;
|
||||||
|
|
||||||
@ -586,6 +595,9 @@ namespace Game
|
|||||||
typedef void(__cdecl * SV_DirectConnect_t)(netadr_t adr);
|
typedef void(__cdecl * SV_DirectConnect_t)(netadr_t adr);
|
||||||
extern SV_DirectConnect_t SV_DirectConnect;
|
extern SV_DirectConnect_t SV_DirectConnect;
|
||||||
|
|
||||||
|
typedef bool(__cdecl * SV_Loaded_t)();
|
||||||
|
extern SV_Loaded_t SV_Loaded;
|
||||||
|
|
||||||
typedef int(__cdecl * Sys_Error_t)(int, char *, ...);
|
typedef int(__cdecl * Sys_Error_t)(int, char *, ...);
|
||||||
extern Sys_Error_t Sys_Error;
|
extern Sys_Error_t Sys_Error;
|
||||||
|
|
||||||
|
@ -1194,7 +1194,8 @@ namespace Game
|
|||||||
|
|
||||||
typedef struct gentity_s
|
typedef struct gentity_s
|
||||||
{
|
{
|
||||||
unsigned char pad[312]; // 0
|
int number;
|
||||||
|
unsigned char pad[308]; // 4
|
||||||
float origin[3]; // 312
|
float origin[3]; // 312
|
||||||
float angles[3]; // 324
|
float angles[3]; // 324
|
||||||
char pad2[8];
|
char pad2[8];
|
||||||
|
Loading…
Reference in New Issue
Block a user