From 9212fd1fe4f318631e6b306cdd03c777b7286396 Mon Sep 17 00:00:00 2001 From: Hipposgrumm Date: Mon, 2 Dec 2024 22:46:10 -0700 Subject: [PATCH] Support for Eat My Dust Zombie Alert manager is stubbed. Added helpers to allow for weapon MMO. PlayerData for Eat My Dust --- src/CommandHandlers/EMDZombiesHandler.cs | 29 ++++++++++++++++++++ src/CommandHandlers/PublicMessageHandlers.cs | 10 +++++-- src/Data/PlayerData.cs | 6 +++- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 src/CommandHandlers/EMDZombiesHandler.cs diff --git a/src/CommandHandlers/EMDZombiesHandler.cs b/src/CommandHandlers/EMDZombiesHandler.cs new file mode 100644 index 0000000..418a11d --- /dev/null +++ b/src/CommandHandlers/EMDZombiesHandler.cs @@ -0,0 +1,29 @@ +using System.Globalization; +using sodoffmmo.Attributes; +using sodoffmmo.Core; +using sodoffmmo.Data; + +namespace sodoffmmo.CommandHandlers; + +// TODO: This is currently stubbed. Supposed to do something. +// Should probably be done by someone who actually played the game. +[ExtensionCommandHandler("SU")] +public class EMDZombiesUpdateHandler : CommandHandler { + public override Task Handle(Client client, NetworkObject receivedObject) { + return Task.CompletedTask; + } +} + +[ExtensionCommandHandler("EN")] +public class EMDZombiesEnterHandler : CommandHandler { + public override Task Handle(Client client, NetworkObject receivedObject) { + return Task.CompletedTask; + } +} + +[ExtensionCommandHandler("EX")] +public class EMDZombiesExitHandler : CommandHandler { + public override Task Handle(Client client, NetworkObject receivedObject) { + return Task.CompletedTask; + } +} diff --git a/src/CommandHandlers/PublicMessageHandlers.cs b/src/CommandHandlers/PublicMessageHandlers.cs index 3b6b657..7f3e055 100644 --- a/src/CommandHandlers/PublicMessageHandlers.cs +++ b/src/CommandHandlers/PublicMessageHandlers.cs @@ -14,9 +14,13 @@ class RacingPMHandler : CommandHandler NetworkObject p = new(); NetworkArray arr = new(); NetworkObject data = new(); - data.Add("M", new string[] { - receivedObject.Get("p").Get("M") - }); + string M = receivedObject.Get("p").Get("M"); + if (M.StartsWith("WF:") || M.StartsWith("WFWD:")) { + // When firing weapon in EMD, recieving clients expect userid, but the sending client sends its token instead. + string token = M.Split(':')[1]; + M = M.Replace(token, client.PlayerData.Uid); + } + data.Add("M", new string[] {M}); data.Add("MID", client.ClientID); arr.Add(data); p.Add("arr", arr); diff --git a/src/Data/PlayerData.cs b/src/Data/PlayerData.cs index 7b56583..13e8b8e 100644 --- a/src/Data/PlayerData.cs +++ b/src/Data/PlayerData.cs @@ -57,6 +57,9 @@ public class PlayerData { "P", // position vector (older games) "R", // rotation (older games - updated via SUV, not SPV) "F", // flags (older games - updated via SUV, not SPV) + "UTI", // group/clan + "SPM", // drive mode (Eat My Dust) + "H", // health }; // other variables (set and updated via SUV command) @@ -91,7 +94,8 @@ public class PlayerData { public void InitFromNetworkData(NetworkObject suvData) { // set initial state for SPV data - R = float.Parse(suvData.Get("R"), CultureInfo.InvariantCulture); + string? r = suvData.Get("R"); // in Eat My Dust, rotation is sent in R1, R2, R3 + if (r != null) R = float.Parse(r, CultureInfo.InvariantCulture); string? p1 = suvData.Get("P1"); if (p1 != null) { P1 = float.Parse(p1, CultureInfo.InvariantCulture);