Merge branch 'p2sr:master' into feat/ghost-voip

Author: aIIison

src/Features/Demo/GhostRenderer.cpp

@@ -180,7 +180,7 @@ CON_COMMAND(ghost_locator, "ghost_locator - Sends a coop-like ping to other ghos
 
 	Vector dir;
 	Math::AngleVectors(cam_ang, &dir);
-	dir *= 2048.0f;
+	dir *= 8192.0f;
 
 	CGameTrace tr;
 
@@ -197,5 +197,6 @@ CON_COMMAND(ghost_locator, "ghost_locator - Sends a coop-like ping to other ghos
 
 	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
 
+	client->ShowLocator(tr.endpos, tr.plane.normal, GhostEntity::set_color);
 	networkManager.NotifyLocator(tr.endpos, tr.plane.normal);
 }

src/Features/Demo/NetworkGhostPlayer.cpp

@@ -1027,11 +1027,10 @@ void NetworkManager::Treat(sf::Packet &packet, bool udp) {
 		packet >> position >> normal;
 		auto ghost = this->GetGhostByID(ID);
 		addToNetDump("recv-locator", Utils::ssprintf("%d;%.1f,%.1f,%.1f;%.1f,%.1f,%.1f", ID, position.x, position.y, position.z, normal.x, normal.y, normal.z).c_str());
-		if (ghost) {
+		if (ghost && engine->GetCurrentMapName() == ghost->currentMap) {
 			Scheduler::OnMainThread([=]() {
 				if (this->AcknowledgeGhost(ghost)) {
-					console->Print("Locator from %s: Position (%.1f, %.1f, %.1f), Normal (%.1f, %.1f, %.1f)\n", ghost->name.c_str(), position.x, position.y, position.z, normal.x, normal.y, normal.z);
-					// TODO: Ping animation
+					client->ShowLocator(position, normal, ghost->color.value_or(Color(255,255,255)));
 				}
 			});
 		}
@@ -1171,7 +1170,6 @@ void NetworkManager::NotifyTaunt(const std::string name) {
 void NetworkManager::NotifyLocator(Vector position, Vector normal) {
 	if (!this->isConnected) return;
 	addToNetDump("send-locator", Utils::ssprintf("%d;%.1f,%.1f,%.1f;%.1f,%.1f,%.1f", this->ID, position.x, position.y, position.z, normal.x, normal.y, normal.z).c_str());
-	console->Print("Locator: Position (%.1f, %.1f, %.1f), Normal (%.1f, %.1f, %.1f)\n", position.x, position.y, position.z, normal.x, normal.y, normal.z);
 	sf::Packet packet;
 	packet << HEADER::LOCATOR << this->ID << position << normal;
 	this->tcpSocket.send(packet);

src/Features/TwitchIntegration.cpp

@@ -1,4 +1,5 @@
 #include "Event.hpp"
+#include "Features/Demo/NetworkGhostPlayer.hpp"
 #include "Modules/Client.hpp"
 #include "Modules/Engine.hpp"
 #include "Utils/TwitchConnection.hpp"
@@ -26,17 +27,17 @@ ON_EVENT(PRE_TICK) {
     }
     auto twitchMsgs = twitchConnection.FetchNewMessages();
     for (auto msg : twitchMsgs) {
+        std::string message = msg.message;
+        std::string author = msg.username;
+        if (message.length() == 0 || author.length() == 0)
+            continue;
+        
         if (sar_twitch_chat_enabled.GetInt() == 2) {
-            std::string message = msg.message;
-            message.erase(remove_if(message.begin(), message.end(), [](char c) {
-                return c == '"' || c == '\n' || c == '\r' || c == '\0';
-            }), message.end());
-            std::string author = msg.username;
-            author.erase(remove_if(author.begin(), author.end(), [](char c) {
-                return c == '"' || c == '\n' || c == '\r' || c == '\0';
-            }), author.end());
             if (Utils::StartsWith(message.c_str(), "!spec ")) {
                 std::string specName = message.substr(6);
+                specName.erase(remove_if(specName.begin(), specName.end(), [](char c) {
+                    return c == '"' || c == '\n' || c == '\r' || c == '\0';
+                }), specName.end());
                 if (specName.length() > 0) {
                     specName = std::string("ghost_spec_pov \"") + specName.c_str() + "\"\n";
                     engine->ExecuteCommand(specName.c_str(), true);
@@ -56,7 +57,6 @@ ON_EVENT(PRE_TICK) {
                     // i promise i can be trusted :P
                     std::string command = message.substr(5);
                     if (command.length() > 0) {
-                        command = command + "\n";
                         engine->ExecuteCommand(command.c_str(), true);
                     }
                 } else {
@@ -65,16 +65,16 @@ ON_EVENT(PRE_TICK) {
             } else if (Utils::StartsWith(message.c_str(), "!") || Utils::ICompare(author, "nightbot") || Utils::ICompare(author, "streamelements")) {
                 // Ignore bots and bot commands
             } else if (Utils::ICompare(author, sar_twitch_chat_channel.GetString())) {
-                std::string out = std::string("ghost_message \"") + message + "\"\n";
-                engine->ExecuteCommand(out.c_str(), true);
+                networkManager.SendMessageToAll(message);
             } else {
-                std::string out = std::string("ghost_message \"(TTV) ") + author + ": " + message + "\"\n";
-                engine->ExecuteCommand(out.c_str(), true);
+                networkManager.SendMessageToAll("(TTV) " + author + ": " + message);
             }
         } else {
-            std::string message = msg.username + ": " + msg.message;
-            Color color = Utils::GetColor(sar_twitch_chat_color.GetString()).value_or(Color(255, 255, 255));
-            client->Chat(color, message.c_str());
+            if (!(Utils::StartsWith(message.c_str(), "!") || Utils::ICompare(author, "nightbot") || Utils::ICompare(author, "streamelements"))) {
+                std::string message = msg.username + ": " + msg.message;
+                Color color = Utils::GetColor(sar_twitch_chat_color.GetString()).value_or(Color(255, 255, 255));
+                client->Chat(color, message.c_str());
+            }
         }
     }
 }

src/Modules/Client.cpp

@@ -203,6 +203,19 @@ void Client::MultiColorChat(const std::vector<std::pair<Color, std::string>> &co
 	client->ChatPrintf(client->g_HudChat->ThisPtr(), 0, 0, fmt.c_str());
 }
 
+void Client::ShowLocator(Vector position, Vector normal, Color color) {
+	Vector colorAsVector = {(float)color.r, (float)color.g, (float)color.b};
+	QAngle angles;
+
+	Vector pseudoup = fabsf(normal.z) < 0.999f ? Vector{0, 0, 1} : Vector{1, 0, 0};
+
+	Math::VectorAngles(normal, pseudoup, &angles);
+	angles.x += 90.0f;
+
+	PrecacheParticleSystem("command_target_ping");
+	DispatchParticleEffect("command_target_ping", position, colorAsVector, angles, nullptr, 0, nullptr);
+}
+
 void Client::SetMouseActivated(bool state) {
 	if (state) {
 		this->IN_ActivateMouse(g_Input->ThisPtr());
@@ -983,6 +996,9 @@ bool Client::Init() {
 		this->GetAllClasses = this->g_ClientDLL->Original<_GetAllClasses>(Offsets::GetAllClasses, readJmp);
 		this->FrameStageNotify = this->g_ClientDLL->Original<_FrameStageNotify>(Offsets::GetAllClasses + 27);
 
+		Client::DispatchParticleEffect = (Client::_DispatchParticleEffect)Memory::Scan(this->Name(), Offsets::DispatchParticleEffect);
+		Client::PrecacheParticleSystem = (Client::_PrecacheParticleSystem)Memory::Scan(this->Name(), Offsets::PrecacheParticleSystem);
+
 		this->g_ClientDLL->Hook(Client::LevelInitPreEntity_Hook, Client::LevelInitPreEntity, Offsets::LevelInitPreEntity);
 
 		using _GetHud = void *(__cdecl *)(int unk);

src/Modules/Client.hpp

@@ -46,6 +46,9 @@ class Client : public Module {
 	using _IN_ActivateMouse = void (*)(void *thisptr);
 	using _IN_DeactivateMouse = void (*)(void *thisptr);
 	using _AddAvatarPanelItem = void(__cdecl *)(void *pLeaderboard, void *pStatLists, const PortalLeaderboardItem_t *pData, int nScore, int nType, int nPlayerType, int nAvatarIndex, int nHeight, int nSlot, bool bHUDElement);
+	using _PrecacheParticleSystem = int(__cdecl *)(const char *pszParticleName);
+	using _DispatchParticleEffect = void (__cdecl *)(const char *pszParticleName, Vector vecOrigin, Vector vecStart, QAngle vecAngles, void *pEntity, int nSplitScreenPlayerSlot, void *filter);
+
 
 	_GetClientEntity GetClientEntity = nullptr;
 	_KeyDown KeyDown = nullptr;
@@ -58,6 +61,8 @@ class Client : public Module {
 	_IN_ActivateMouse IN_ActivateMouse = nullptr;
 	_IN_DeactivateMouse IN_DeactivateMouse = nullptr;
 	_AddAvatarPanelItem AddAvatarPanelItem = nullptr;
+	_DispatchParticleEffect DispatchParticleEffect = nullptr;
+	_PrecacheParticleSystem PrecacheParticleSystem = nullptr;
 
 	ChapterContextData_t *g_ChapterContextNames;
 	ChapterContextData_t *g_ChapterMPContextNames;
@@ -76,6 +81,7 @@ class Client : public Module {
 	bool ShouldDrawCrosshair();
 	void Chat(Color col, const char *str);
 	void MultiColorChat(const std::vector<std::pair<Color, std::string>> &components);
+	void ShowLocator(Vector position, Vector normal, Color color);
 	void SetMouseActivated(bool state);
 	CMStatus GetChallengeStatus();
 	int GetSplitScreenPlayerSlot(void *entity);

src/Offsets/Portal 2 9568.hpp

@@ -436,6 +436,12 @@ SIGSCAN_DEFAULT(GetChapterProgress, "56 8B 35 ? ? ? ? 57 8B F9 FF D6 8B 10 8B C8
 SIGSCAN_DEFAULT(LoadingProgress__SetupControlStatesInstruction, "66 C7 86 ? ? ? ? ? ? EB", "66 89 83 ? ? ? ? E9 ? ? ? ? ? ? ? ? ? ? ? 85 F6") // "vgui/loading_screens/loadingscreen_coop" xref -> LoadingProgress::SetupControlStates -> m_bDrawProgress set to 0
 OFFSET_DEFAULT(LoadingProgress__SetupControlStatesBoolOffset, 7, 5)
 
+SIGSCAN_DEFAULT(PrecacheParticleSystem, "55 8B EC 8B 0D ? ? ? ? 8B 01 8B 50 ? 56 57",
+                                        "56 53 83 EC 10 A1 ? ? ? ? 8B 74 24 ? 8B 10 6A 00 6A FF") // "electrical_arc_01" xref -> obvious FUN(string) with others -> CParticleSystemMgr::PrecacheParticleSystem
+
+SIGSCAN_DEFAULT(DispatchParticleEffect, "55 8B EC 8B 45 ? 50 E8 ? ? ? ? 8B 4D ? 8B 55 ? F3 0F 7E 45 ? 83 C4 04 51 8B 4D ? 52 8B 55 ? 51 83 EC 0C 8B CC 66 0F D6 01 F3 0F 7E 45 ? 89 51 ? 8B 55 ? 83 EC 0C 8B CC 66 0F D6 01 F3 0F 7E 45",
+                                        "53 81 EC 84 00 00 00 8B 9C 24 ? ? ? ? FF B4 24 ? ? ? ? E8 ? ? ? ? 31 D2 F3 0F 10 84 24 ? ? ? ? C7 44 24 ? FF FF FF FF") // "projected_wall_impact" xref -> either usage same function -> DispatchParticleEffect
+
 // Engine
 SIGSCAN_DEFAULT(ParseSmoothingInfoSig, "55 8B EC 0F 57 C0 81 EC ? ? ? ? B9 ? ? ? ? 8D 85 ? ? ? ? EB", ""); // "cl_demosmootherpanel.cpp" xref -> CDemoSmootherPanel::ParseSmoothingInfo
 OFFSET_DEFAULT(ParseSmoothingInfoOff, 178, -1)