From 921802f44306cd55dbf9dfd723f48e18b41fd2eb Mon Sep 17 00:00:00 2001 From: Lolwutt Date: Mon, 4 Dec 2017 23:02:44 -0500 Subject: [PATCH] 1.02 - Now supports [p0] and similar as character name in /ms sendto --- release/plugins/MultiSend.dll | Bin 73728 -> 75264 bytes src/MultiSend/Commands.cpp | 6 ++++-- src/MultiSend/Main.cpp | 2 +- src/MultiSend/MultiSend.h | 1 + src/MultiSend/Substitute.cpp | 23 ++++++++++++++--------- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/release/plugins/MultiSend.dll b/release/plugins/MultiSend.dll index ce7845ec10cf41893400c014339a9cfc6a288f00..ca592d25ba09376b27cb9b2bb62f065ef9dca158 100644 GIT binary patch delta 12788 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 MHIv{e)x$>pU#=hj5C8xG diff --git a/src/MultiSend/Commands.cpp b/src/MultiSend/Commands.cpp index 65a50d4..0afcc37 100644 --- a/src/MultiSend/Commands.cpp +++ b/src/MultiSend/Commands.cpp @@ -32,6 +32,8 @@ bool MultiSend::HandleCommand(const char* command, int32_t type) com++; com += GetArg(com, &arg); + arg = SubValues(arg); + Claim(&(MMF_Pointer->Name.ProcessID), 0); for (int x = 0; x < 100; x++) { @@ -174,13 +176,13 @@ bool MultiSend::HandleCommand(const char* command, int32_t type) if (_stricmp(arg.c_str(), "on") == 0) { - IgnoreSelf = true; + _Debug = true; m_AshitaCore->GetChatManager()->Write("MultiSend: Debug prints enabled."); } else if (_stricmp(arg.c_str(), "off") == 0) { - IgnoreSelf = false; + _Debug = false; m_AshitaCore->GetChatManager()->Write("MultiSend: Debug prints disabled."); } diff --git a/src/MultiSend/Main.cpp b/src/MultiSend/Main.cpp index 65212d9..fbcc238 100644 --- a/src/MultiSend/Main.cpp +++ b/src/MultiSend/Main.cpp @@ -116,7 +116,7 @@ __declspec(dllexport) void __stdcall CreatePluginInfo(plugininfo_t* lpBuffer) strcpy_s(g_PluginInfo->Author, sizeof(g_PluginInfo->Author), "Thorny"); g_PluginInfo->InterfaceVersion = ASHITA_INTERFACE_VERSION; - g_PluginInfo->PluginVersion = 1.01f; + g_PluginInfo->PluginVersion = 1.02f; g_PluginInfo->Priority = 0; } diff --git a/src/MultiSend/MultiSend.h b/src/MultiSend/MultiSend.h index 32c025f..68d081d 100644 --- a/src/MultiSend/MultiSend.h +++ b/src/MultiSend/MultiSend.h @@ -91,6 +91,7 @@ public: bool ReadCommand(); void SetFollow(bool Active); void SendCommand(uint32_t ID, const char* Command); + std::string SubValues(std::string Input); void SubValues(char* Input); void UpdateName(std::string Name); void Claim(uint32_t* Target, uint32_t Mod); diff --git a/src/MultiSend/Substitute.cpp b/src/MultiSend/Substitute.cpp index 063210a..711020d 100644 --- a/src/MultiSend/Substitute.cpp +++ b/src/MultiSend/Substitute.cpp @@ -1,49 +1,49 @@ #include "MultiSend.h" -void MultiSend::SubValues(char* Input) +std::string MultiSend::SubValues(std::string Input) { - std::string Working(Input); + std::string Working = Input; size_t find = Working.find("[me]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(0))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0))); } find = Working.find("[p0]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(0))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0))); } find = Working.find("[p1]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(1))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(1))); } find = Working.find("[p2]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(2))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(2))); } find = Working.find("[p3]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(3))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(3))); } find = Working.find("[p4]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(4))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4))); } find = Working.find("[p5]"); if (find != string::npos) { - Working.replace(find, 4, std::to_string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberServerId(5))); + Working.replace(find, 4, std::string(m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(5))); } find = Working.find("[t]"); @@ -56,7 +56,12 @@ void MultiSend::SubValues(char* Input) } Working.replace(find, 3, std::to_string(m_AshitaCore->GetDataManager()->GetEntity()->GetServerId(TargetIndex))); } + return Working; +} +void MultiSend::SubValues(char* Input) +{ + std::string Working = SubValues(std::string(Input)); const char* base = Working.c_str(); memset(Input, 0, 248); memcpy(Input, base, strlen(base));