Merge pull request #56 from RAGECOOP/dev-nightly

Add kill message

.github/workflows/nightly-build.yaml

@@ -28,8 +28,6 @@ jobs:
       run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r win-x64 -o bin/Release/Server/win-x64 -c Release
     - name: Build server linux-x64
       run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r linux-x64 -o bin/Release/Server/linux-x64 -c Release
-    - name: Build server linux-arm
-      run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r linux-arm -o bin/Release/Server/linux-arm -c Release
     - uses: vimtor/action-zip@v1
       with:
         files: bin/Release/Client
@@ -45,11 +43,6 @@ jobs:
         files: bin/Release/Server/linux-x64
         dest: RageCoop.Server-linux-x64.zip
 
-    - uses: vimtor/action-zip@v1
-      with:
-        files: bin/Release/Server/linux-arm
-        dest: RageCoop.Server-linux-arm.zip
-
     - uses: WebFreak001/deploy-nightly@v1.1.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions
@@ -82,17 +75,3 @@ jobs:
         asset_name: RageCoop.Server-linux-x64.zip
         asset_content_type: application/zip
         max_releases: 7
-
-
-    - uses: WebFreak001/deploy-nightly@v1.1.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions
-      with:
-        upload_url: https://uploads.github.com/repos/RAGECOOP/RAGECOOP-V/releases/70603992/assets{?name,label} 
-        release_id: 70603992 
-        asset_path: RageCoop.Server-linux-arm.zip
-        asset_name: RageCoop.Server-linux-arm.zip
-        asset_content_type: application/zip
-        max_releases: 7
-    - uses: actions/checkout@v2
-      

README.md

@@ -15,7 +15,7 @@ RAGECOOP brings multiplayer experience to the story mode, you can complete missi
 
 # 👁 Requirements
 - ScriptHookV
-- ScriptHookVDotNet 3.5.1 or later
+- ScriptHookVDotNet 3.6.0 or later
 - .NET Framework 4.8 Runtime or SDK
 
 # 📋 Building the project
@@ -49,7 +49,7 @@ Then run `dotnet build` in the solution directory, built binaries are in the `bi
 5. Decent compatibility with other mods, set up a private modded server to have some fun!
 6. Weaponized vehicle sync(WIP).
 7. Optimization for high-Ping condition, play with friends around the world!
-8. Powerful scripting API and resource system, easily [add multiplayer functionality to your mod](HTTPS://docs.ragecoop.online).
+8. Powerful scripting API and resource system, easily [add multiplayer functionality to your mod](HTTPS://docs.ragecoop.com).
 
 # ⚠ Known issues
 

RageCoop.Client.Installer/MainWindow.xaml.cs

@@ -78,10 +78,10 @@ namespace RageCoop.Client.Installer
                 Environment.Exit(1);
             }
             var shvdnVer = GetVer(shvdnPath);
-            if (shvdnVer < new Version(3, 5, 1))
+            if (shvdnVer < new Version(3, 6, 0))
             {
                 MessageBox.Show("Please update ScriptHookVDotNet to latest version!" +
-                    $"\nCurrent version is {shvdnVer}, 3.5.1 or higher is required");
+                    $"\nCurrent version is {shvdnVer}, 3.6.0 or higher is required");
                 Environment.Exit(1);
             }
             if (File.Exists(lemonPath))

RageCoop.Client/Main.cs

@@ -141,7 +141,9 @@ namespace RageCoop.Client
             }
             catch (Exception ex)
             {
+#if DEBUG
                 Main.Logger.Error(ex);
+#endif
             }
 
             if (Networking.ShowNetworkInfo)
@@ -168,7 +170,7 @@ namespace RageCoop.Client
                         P.Health = 1;
                         Game.Player.WantedLevel = 0;
                         Main.Logger.Debug("Player died.");
-                        Scripting.API.Events.InvokePlayerDied();
+                        Scripting.API.Events.InvokePlayerDied(KillMessage());
                     }
                     GTA.UI.Screen.StopEffects();
                 }
@@ -179,7 +181,7 @@ namespace RageCoop.Client
             }
             else if (P.IsDead && !_lastDead)
             {
-                Scripting.API.Events.InvokePlayerDied();
+                Scripting.API.Events.InvokePlayerDied(KillMessage());
             }
 
             _lastDead = P.IsDead;
@@ -324,7 +326,8 @@ namespace RageCoop.Client
                 WorldThread.Traffic(true);
                 Function.Call(Hash.SET_ENABLE_VEHICLE_SLIPSTREAMING, false);
                 CoopMenu.DisconnectedMenuSetting();
-                GTA.UI.Notification.Show("~r~Disconnected: " + reason);
+                if (reason != "Abort")
+                    GTA.UI.Notification.Show("~r~Disconnected: " + reason);
                 LocalPlayerID = default;
             });
             Memory.RestorePatches();
@@ -347,7 +350,9 @@ namespace RageCoop.Client
                     }
                     catch (Exception ex)
                     {
+#if DEBUG
                         Logger.Error(ex);
+#endif
                         QueuedActions.Remove(action);
                     }
                 }
@@ -389,5 +394,15 @@ namespace RageCoop.Client
             });
         }
 
+        private string KillMessage()
+        {
+            if (P.Killer != null)
+            {
+                var killer = EntityPool.GetPedByHandle(P.Killer.Handle);
+                if (killer != null && killer.ID == killer.Owner.ID)
+                    return $"~h~{PlayerList.GetPlayer(LocalPlayerID).Username}~h~ was killed by ~h~{killer.Owner.Username}~h~ ({P.CauseOfDeath})";
+            }
+            return $"~h~{PlayerList.GetPlayer(LocalPlayerID).Username}~h~ died";
+        }
     }
 }

RageCoop.Client/Menus/CoopMenu.cs

@@ -50,7 +50,7 @@ namespace RageCoop.Client.Menus
         {
 
             Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
+            Menu.BannerText.Color = Color.FromArgb(255, 165, 0);
 
             _usernameItem.Activated += UsernameActivated;
             _passwordItem.Activated += _passwordActivated;
@@ -67,16 +67,18 @@ namespace RageCoop.Client.Menus
 
             Menu.AddSubMenu(SettingsMenu.Menu);
             Menu.AddSubMenu(DevToolMenu.Menu);
+#if DEBUG
             Menu.AddSubMenu(DebugMenu.Menu);
-            Menu.AddSubMenu(UpdateMenu.Menu);
+#endif
 
             MenuPool.Add(Menu);
             MenuPool.Add(SettingsMenu.Menu);
             MenuPool.Add(DevToolMenu.Menu);
+#if DEBUG
             MenuPool.Add(DebugMenu.Menu);
             MenuPool.Add(DebugMenu.DiagnosticMenu);
+#endif
             MenuPool.Add(ServersMenu.Menu);
-            MenuPool.Add(UpdateMenu.Menu);
             MenuPool.Add(PopUp);
 
             Menu.Add(_aboutItem);

RageCoop.Client/Menus/Sub/DebugMenu.cs

@@ -1,4 +1,5 @@
-using GTA;
+#if DEBUG
+using GTA;
 using LemonUI.Menus;
 using System;
 using System.Drawing;
@@ -24,7 +25,7 @@ namespace RageCoop.Client
         static DebugMenu()
         {
             Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
+            Menu.BannerText.Color = Color.FromArgb(255, 165, 0);
 
 
             DiagnosticMenu.Opening += (sender, e) =>
@@ -56,3 +57,4 @@ namespace RageCoop.Client
 
     }
 }
+#endif

RageCoop.Client/Menus/Sub/DevToolMenu.cs

@@ -22,7 +22,7 @@ namespace RageCoop.Client
         static DevToolMenu()
         {
             Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
+            Menu.BannerText.Color = Color.FromArgb(255, 165, 0);
 
             enableItem.Activated += enableItem_Activated;
             enableItem.Checked = false;

RageCoop.Client/Menus/Sub/ServersMenu.cs

@@ -30,7 +30,7 @@ namespace RageCoop.Client.Menus
         static ServersMenu()
         {
             Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
+            Menu.BannerText.Color = Color.FromArgb(255, 165, 0);
 
             Menu.Opening += (object sender, System.ComponentModel.CancelEventArgs e) =>
             {
@@ -76,7 +76,7 @@ namespace RageCoop.Client.Menus
                 foreach (ServerInfo server in serverList)
                 {
                     string address = $"{server.address}:{server.port}";
-                    NativeItem tmpItem = new NativeItem($"[{server.country}] {server.name}", $"~b~{address}~s~~n~~g~Version {server.version}.x~s~") { AltTitle = $"[{server.players}/{server.maxPlayers}]" };
+                    NativeItem tmpItem = new NativeItem($"[{server.country}] {server.name}", $"~b~{address}~s~~n~~g~Version {server.version}~s~") { AltTitle = $"[{server.players}/{server.maxPlayers}]" };
                     tmpItem.Activated += (object sender, EventArgs e) =>
                     {
                         try

RageCoop.Client/Menus/Sub/SettingsMenu.cs

@@ -17,6 +17,8 @@ namespace RageCoop.Client.Menus
         private static readonly NativeCheckboxItem _disableTrafficItem = new NativeCheckboxItem("Disable Traffic (NPCs/Vehicles)", "Local traffic only", Main.Settings.DisableTraffic);
         private static readonly NativeCheckboxItem _flipMenuItem = new NativeCheckboxItem("Flip menu", Main.Settings.FlipMenu);
         private static readonly NativeCheckboxItem _disablePauseAlt = new NativeCheckboxItem("Disable Alternate Pause", "Don't freeze game time when Esc pressed", Main.Settings.DisableAlternatePause);
+        private static readonly NativeCheckboxItem _showBlip = new NativeCheckboxItem("Show player blip", "Show other player's blip on map", Main.Settings.ShowPlayerBlip);
+        private static readonly NativeCheckboxItem _showNametag = new NativeCheckboxItem("Show player nametag", "Show other player's nametag on your screen", Main.Settings.ShowPlayerNameTag);
         private static readonly NativeCheckboxItem _disableVoice = new NativeCheckboxItem("Enable voice", "Check your GTA:V settings to find the right key on your keyboard for PushToTalk and talk to your friends", Main.Settings.Voice);
 
         private static readonly NativeItem _menuKey = new NativeItem("Menu Key", "The key to open menu", Main.Settings.MenuKey.ToString());
@@ -26,7 +28,7 @@ namespace RageCoop.Client.Menus
         static SettingsMenu()
         {
             Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
+            Menu.BannerText.Color = Color.FromArgb(255, 165, 0);
 
             _disableTrafficItem.CheckboxChanged += DisableTrafficCheckboxChanged;
             _disablePauseAlt.CheckboxChanged += DisablePauseAltCheckboxChanged;
@@ -35,6 +37,16 @@ namespace RageCoop.Client.Menus
             _menuKey.Activated += ChaneMenuKey;
             _passengerKey.Activated += ChangePassengerKey;
             _vehicleSoftLimit.Activated += VehicleSoftLimitActivated;
+            _showBlip.Activated += (s, e) =>
+            {
+                Main.Settings.ShowPlayerBlip = _showBlip.Checked;
+                Util.SaveSettings();
+            };
+            _showNametag.Activated += (s, e) =>
+            {
+                Main.Settings.ShowPlayerNameTag = _showNametag.Checked;
+                Util.SaveSettings();
+            };
 
             Menu.Add(_disableTrafficItem);
             Menu.Add(_disablePauseAlt);
@@ -43,6 +55,8 @@ namespace RageCoop.Client.Menus
             Menu.Add(_menuKey);
             Menu.Add(_passengerKey);
             Menu.Add(_vehicleSoftLimit);
+            Menu.Add(_showBlip);
+            Menu.Add(_showNametag);
         }
 
         private static void DisableVoiceCheckboxChanged(object sender, EventArgs e)

RageCoop.Client/Menus/Sub/UpdateMenu.cs

@@ -1,105 +0,0 @@
-using ICSharpCode.SharpZipLib.Zip;
-using LemonUI.Menus;
-using System;
-using System.Drawing;
-using System.IO;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace RageCoop.Client.Menus
-{
-    internal class UpdateMenu
-    {
-        public static bool IsUpdating { get; private set; } = false;
-        private static readonly NativeItem _updatingItem = new NativeItem("Updating...");
-        private static readonly NativeItem _downloadItem = new NativeItem("Download", "Download and update to latest nightly");
-
-        private static readonly string _downloadPath = Path.Combine(Main.Settings.DataDirectory, "RageCoop.Client.zip");
-        public static NativeMenu Menu = new NativeMenu("Update", "Update", "Download and install latest nightly build from GitHub")
-        {
-            UseMouse = false,
-            Alignment = Main.Settings.FlipMenu ? GTA.UI.Alignment.Right : GTA.UI.Alignment.Left
-        };
-        static UpdateMenu()
-        {
-            Menu.Banner.Color = Color.FromArgb(225, 0, 0, 0);
-            Menu.Title.Color = Color.FromArgb(255, 165, 0);
-            Menu.Opening += Opening;
-            _downloadItem.Activated += StartUpdate;
-        }
-
-        private static void StartUpdate(object sender, EventArgs e)
-        {
-            IsUpdating = true;
-            Menu.Clear();
-            Menu.Add(_updatingItem);
-            Task.Run(() =>
-            {
-                try
-                {
-                    if (File.Exists(_downloadPath)) { File.Delete(_downloadPath); }
-                    WebClient client = new WebClient();
-
-                    // TLS only
-                    ServicePointManager.Expect100Continue = true;
-                    ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12;
-                    ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
-
-                    client.DownloadProgressChanged += (s, e1) => { Main.QueueAction(() => { _updatingItem.AltTitle = $"{e1.ProgressPercentage}%"; }); };
-                    client.DownloadFileCompleted += (s, e2) => { Install(); };
-                    client.DownloadFileAsync(new Uri("https://github.com/RAGECOOP/RAGECOOP-V/releases/download/nightly/RageCoop.Client.zip"), _downloadPath);
-                }
-                catch (Exception ex)
-                {
-                    Main.Logger.Error(ex);
-                }
-            });
-        }
-
-        private static void Install()
-        {
-            try
-            {
-                Main.QueueAction(() =>
-                {
-                    _updatingItem.AltTitle = "Installing...";
-                });
-                Directory.CreateDirectory(@"Scripts\RageCoop");
-                foreach (var f in Directory.GetFiles(@"Scripts\RageCoop", "*.dll", SearchOption.AllDirectories))
-                {
-                    try { File.Delete(f); }
-                    catch { }
-                }
-                new FastZip().ExtractZip(_downloadPath, "Scripts", FastZip.Overwrite.Always, null, null, null, true);
-                try { File.Delete(_downloadPath); } catch { }
-                try { File.Delete(Path.Combine("Scripts", "RageCoop.Client.Installer.exe")); } catch { }
-                Main.QueueAction(() =>
-                {
-                    Util.Reload();
-                    IsUpdating = false;
-                });
-            }
-            catch (Exception ex)
-            {
-                Main.Logger.Error(ex);
-            }
-        }
-
-        private static void Opening(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            Menu.Clear();
-            if (Networking.IsOnServer)
-            {
-                Menu.Add(new NativeItem("Disconnect from the server first"));
-            }
-            else if (IsUpdating)
-            {
-                Menu.Add(_updatingItem);
-            }
-            else
-            {
-                Menu.Add(_downloadItem);
-            }
-        }
-    }
-}

RageCoop.Client/Networking/Networking.cs

@@ -30,16 +30,16 @@ namespace RageCoop.Client
         public static void ToggleConnection(string address, string username = null, string password = null, PublicKey publicKey = null)
         {
             Menus.CoopMenu.Menu.Visible = false;
-            Peer?.Shutdown("Bye");
+            if (IsConnecting)
-            if (IsOnServer)
-            {
-                // ?
-            }
-            else if (IsConnecting)
             {
                 _publicKeyReceived.Set();
                 IsConnecting = false;
-                Notification.Show("Connection has been canceled");
+                Main.QueueAction(() => Notification.Show("Connection has been canceled"));
+                Peer?.Shutdown("Bye");
+            }
+            else if (IsOnServer)
+            {
+                Peer?.Shutdown("Bye");
             }
             else
             {
@@ -53,13 +53,14 @@ namespace RageCoop.Client
                 NetPeerConfiguration config = new NetPeerConfiguration("623c92c287cc392406e7aaaac1c0f3b0")
                 {
                     AutoFlushSendQueue = false,
-                    SimulatedMinimumLatency = SimulatedLatency,
-                    SimulatedRandomLatency = 0,
                     AcceptIncomingConnections = true,
                     MaximumConnections = 32,
                     PingInterval = 5
                 };
-
+#if DEBUG
+                config.SimulatedMinimumLatency = SimulatedLatency;
+                config.SimulatedRandomLatency = 0;
+#endif
                 config.EnableMessageType(NetIncomingMessageType.UnconnectedData);
                 config.EnableMessageType(NetIncomingMessageType.NatIntroductionSuccess);
 
@@ -96,7 +97,12 @@ namespace RageCoop.Client
                         Peer.OnMessageReceived += (s, m) =>
                         {
                             try { ProcessMessage(m); }
-                            catch (Exception ex) { Main.Logger.Error(ex); }
+                            catch (Exception ex)
+                            {
+#if DEBUG
+                                Main.Logger.Error(ex);
+#endif
+                            }
                         };
                         Main.QueueAction(() => { Notification.Show($"~y~Trying to connect..."); });
                         Menus.CoopMenu._serverConnectItem.Enabled = false;

RageCoop.Client/Networking/Receive.cs

@@ -149,6 +149,7 @@ namespace RageCoop.Client
                         }
                         catch (Exception ex)
                         {
+#if DEBUG
                             Main.QueueAction(() =>
                             {
                                 GTA.UI.Notification.Show($"~r~~h~Packet Error {ex.Message}");
@@ -157,6 +158,8 @@ namespace RageCoop.Client
                             Main.Logger.Error($"[{packetType}] {ex.Message}");
                             Main.Logger.Error(ex);
                             Peer.Shutdown($"Packet Error [{packetType}]");
+#endif
+                            _recycle = false;
                         }
                         break;
                     }
@@ -291,7 +294,7 @@ namespace RageCoop.Client
                     {
                         recycle = false;
                         // Dispatch to script thread
-                        Main.QueueAction(() => { SyncEvents.HandleEvent(packetType, msg); Peer.Recycle(msg); return true; });
+                        Main.QueueAction(() => { SyncEvents.HandleEvent(packetType, msg); return true; });
                     }
                     break;
             }
@@ -303,7 +306,9 @@ namespace RageCoop.Client
             if (c == null)
             {
                 // Main.Logger.Debug($"Creating character for incoming sync:{packet.ID}");
-                EntityPool.ThreadSafe.Add(c = new SyncedPed(packet.ID));
+                if (EntityPool.allPeds.Length < Main.Settings.GlobalPedSoftLimit || PlayerList.Players.ContainsKey(packet.ID))
+                    EntityPool.ThreadSafe.Add(c = new SyncedPed(packet.ID));
+                else return;
             }
             PedDataFlags flags = packet.Flags;
             c.ID = packet.ID;
@@ -351,7 +356,9 @@ namespace RageCoop.Client
             SyncedVehicle v = EntityPool.GetVehicleByID(packet.ID);
             if (v == null)
             {
-                EntityPool.ThreadSafe.Add(v = new SyncedVehicle(packet.ID));
+                if (EntityPool.allVehicles.Length < Main.Settings.GlobalVehicleSoftLimit)
+                    EntityPool.ThreadSafe.Add(v = new SyncedVehicle(packet.ID));
+                else return;
             }
             if (v.IsLocal) { return; }
             v.ID = packet.ID;
@@ -391,7 +398,9 @@ namespace RageCoop.Client
             {
                 if (packet.Flags.HasProjDataFlag(ProjectileDataFlags.Exploded)) { return; }
                 // Main.Logger.Debug($"Creating new projectile: {(WeaponHash)packet.WeaponHash}");
-                EntityPool.ThreadSafe.Add(p = new SyncedProjectile(packet.ID));
+                if (EntityPool.allProjectiles.Length < Main.Settings.GlobalProjectileSoftLimit)
+                    EntityPool.ThreadSafe.Add(p = new SyncedProjectile(packet.ID));
+                else return;
             }
             p.Flags = packet.Flags;
             p.Position = packet.Position;

RageCoop.Client/Properties/AssemblyInfo.cs

@@ -15,8 +15,8 @@ using System.Resources;
 [assembly: AssemblyCulture("")]
 
 
-// Version informationr(
+// Version information
-[assembly: AssemblyVersion("1.5.4.3")]
+[assembly: AssemblyVersion("1.5.4.6")]
-[assembly: AssemblyFileVersion("1.5.4.3")]
+[assembly: AssemblyFileVersion("1.5.4.6")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

RageCoop.Client/RageCoop.Client.csproj

@@ -36,7 +36,6 @@
     <Compile Include="Menus\Sub\DevToolMenu.cs" />
     <Compile Include="Menus\Sub\ServersMenu.cs" />
     <Compile Include="Menus\Sub\SettingsMenu.cs" />
-    <Compile Include="Menus\Sub\UpdateMenu.cs" />
     <Compile Include="Networking\Chat.cs" />
     <Compile Include="Networking\DownloadManager.cs" />
     <Compile Include="Networking\HolePunch.cs" />
@@ -91,7 +90,7 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="LemonUI.SHVDN3, Version=1.7.0.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="LemonUI.SHVDN3, Version=1.10.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\libs\LemonUI.SHVDN3.dll</HintPath>
     </Reference>

RageCoop.Client/Scripting/API.cs

@@ -91,7 +91,7 @@ namespace RageCoop.Client.Scripting
             /// <summary>
             /// The local player is dead
             /// </summary>
-            public static event EmptyEvent OnPlayerDied;
+            public static event EventHandler<string> OnPlayerDied;
 
             /// <summary>
             /// A local vehicle is spawned
@@ -133,7 +133,7 @@ namespace RageCoop.Client.Scripting
             internal static void InvokeVehicleDeleted(SyncedVehicle v) { OnVehicleDeleted?.Invoke(null, v); }
             internal static void InvokePedSpawned(SyncedPed p) { OnPedSpawned?.Invoke(null, p); }
             internal static void InvokePedDeleted(SyncedPed p) { OnPedDeleted?.Invoke(null, p); }
-            internal static void InvokePlayerDied() { OnPlayerDied?.Invoke(); }
+            internal static void InvokePlayerDied(string m) { OnPlayerDied?.Invoke(null, m); }
             internal static void InvokeTick() { OnTick?.Invoke(); }
 
             internal static void InvokeKeyDown(object s, KeyEventArgs e) { OnKeyDown?.Invoke(s, e); }

RageCoop.Client/Scripting/BaseScript.cs

@@ -16,7 +16,7 @@ namespace RageCoop.Client.Scripting
         {
             API.Events.OnPedDeleted += (s, p) => { API.SendCustomEvent(CustomEvents.OnPedDeleted, p.ID); };
             API.Events.OnVehicleDeleted += (s, p) => { API.SendCustomEvent(CustomEvents.OnVehicleDeleted, p.ID); };
-            API.Events.OnPlayerDied += () => { API.SendCustomEvent(CustomEvents.OnPlayerDied); };
+            API.Events.OnPlayerDied += (s, m) => { API.SendCustomEvent(CustomEvents.OnPlayerDied, m); };
 
             API.RegisterCustomEventHandler(CustomEvents.SetAutoRespawn, SetAutoRespawn);
             API.RegisterCustomEventHandler(CustomEvents.SetDisplayNameTag, SetDisplayNameTag);
@@ -31,7 +31,7 @@ namespace RageCoop.Client.Scripting
             API.RegisterCustomEventHandler(CustomEvents.UpdatePedBlip, UpdatePedBlip);
             API.RegisterCustomEventHandler(CustomEvents.IsHost, (e) => { _isHost = (bool)e.Args[0]; });
             API.RegisterCustomEventHandler(CustomEvents.WeatherTimeSync, WeatherTimeSync);
-            API.RegisterCustomEventHandler(CustomEvents.OnPlayerDied, (e) => { GTA.UI.Notification.Show($"~h~{e.Args[0]}~h~ died."); });
+            API.RegisterCustomEventHandler(CustomEvents.OnPlayerDied, (e) => { GTA.UI.Notification.Show((string)e.Args[0]); });
             Task.Run(() =>
             {
                 while (true)
@@ -46,7 +46,7 @@ namespace RageCoop.Client.Scripting
                                 int weather1 = default(int);
                                 int weather2 = default(int);
                                 float percent2 = default(float);
-                                Function.Call(Hash._GET_WEATHER_TYPE_TRANSITION, &weather1, &weather2, &percent2);
+                                Function.Call(Hash.GET_CURR_WEATHER_STATE, &weather1, &weather2, &percent2);
                                 API.SendCustomEvent(CustomEvents.WeatherTimeSync, time.Hours, time.Minutes, time.Seconds, weather1, weather2, percent2);
                             }
                         });
@@ -60,7 +60,7 @@ namespace RageCoop.Client.Scripting
         private void WeatherTimeSync(CustomEventReceivedArgs e)
         {
             World.CurrentTimeOfDay = new TimeSpan((int)e.Args[0], (int)e.Args[1], (int)e.Args[2]);
-            Function.Call(Hash._SET_WEATHER_TYPE_TRANSITION, (int)e.Args[3], (int)e.Args[4], (float)e.Args[5]);
+            Function.Call(Hash.SET_CURR_WEATHER_STATE, (int)e.Args[3], (int)e.Args[4], (float)e.Args[5]);
         }
 
         private void SetDisplayNameTag(CustomEventReceivedArgs e)

RageCoop.Client/Settings.cs

@@ -22,7 +22,7 @@ namespace RageCoop.Client
         /// <summary>
         /// Don't use it!
         /// </summary>
-        public string MasterServer { get; set; } = "https://masterserver.ragecoop.online/";
+        public string MasterServer { get; set; } = "https://masterserver.ragecoop.com/";
         /// <summary>
         /// Don't use it!
         /// </summary>
@@ -51,7 +51,7 @@ namespace RageCoop.Client
         /// <summary>
         /// Disable world NPC traffic, mission entities won't be affected
         /// </summary>
-        public bool DisableTraffic { get; set; } = true;
+        public bool DisableTraffic { get; set; } = false;
 
         /// <summary>
         /// Bring up pause menu but don't freeze time when FrontEndPauseAlternate(Esc) is pressed.
@@ -67,6 +67,22 @@ namespace RageCoop.Client
         /// The game won't spawn more NPC traffic if the limit is exceeded. -1 for unlimited (not recommended).
         /// </summary>
         public int WorldPedSoftLimit { get; set; } = 30;
+
+        /// <summary>
+        /// The mod won't sync more vehicles if the limit is exceeded.
+        /// </summary>
+        public int GlobalVehicleSoftLimit { get; set; } = 100;
+
+        /// <summary>
+        /// The mod won't sync more peds if the limit is exceeded.
+        /// </summary>
+        public int GlobalPedSoftLimit { get; set; } = 100;
+
+        /// <summary>
+        /// The mod won't sync more projectiles if the limit is exceeded.
+        /// </summary>
+        public int GlobalProjectileSoftLimit { get; set; } = 100;
+
         /// <summary>
         /// The directory where log and resources downloaded from server will be placed.
         /// </summary>
@@ -76,5 +92,15 @@ namespace RageCoop.Client
         /// Show the owner name of the entity you're aiming at
         /// </summary>
         public bool ShowEntityOwnerName { get; set; } = false;
+
+        /// <summary>
+        ///     Show other player's nametag on your screen
+        /// </summary>
+        public bool ShowPlayerNameTag { get; set; } = true;
+
+        /// <summary>
+        ///     Show other player's blip on map
+        /// </summary>
+        public bool ShowPlayerBlip { get; set; } = true;
     }
 }

RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs

@@ -28,7 +28,7 @@ namespace RageCoop.Client
             MainPed = p;
             OwnerID = Main.LocalPlayerID;
 
-            Function.Call(Hash._SET_PED_CAN_PLAY_INJURED_ANIMS, false);
+            //Function.Call(Hash.SET_PED_IS_IGNORED_BY_AUTO_OPEN_DOORS, false);
             MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableHurt, true);
             // MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableMelee, true);
 
@@ -76,12 +76,13 @@ namespace RageCoop.Client
                     }
                 }
 
-                if (((byte)BlipColor == 255) && (PedBlip != null))
+                if (!Main.Settings.ShowPlayerBlip && (byte)BlipColor != 255) BlipColor = (BlipColor)255;
+                if ((byte)BlipColor == 255 && PedBlip != null)
                 {
                     PedBlip.Delete();
                     PedBlip = null;
                 }
-                else if (((byte)BlipColor != 255) && PedBlip == null)
+                else if ((byte)BlipColor != 255 && PedBlip == null)
                 {
                     PedBlip = MainPed.AddBlip();
 
@@ -170,7 +171,7 @@ namespace RageCoop.Client
 
         private void RenderNameTag()
         {
-            if (!Owner.DisplayNameTag || (MainPed == null) || !MainPed.IsVisible || !MainPed.IsInRange(Main.PlayerPosition, 40f))
+            if (!Owner.DisplayNameTag || !Main.Settings.ShowPlayerNameTag || MainPed == null || !MainPed.IsVisible || !MainPed.IsInRange(Main.PlayerPosition, 40f))
             {
                 return;
             }
@@ -235,7 +236,7 @@ namespace RageCoop.Client
             Function.Call(Hash.SET_PED_CAN_BE_TARGETTED_BY_PLAYER, MainPed.Handle, Game.Player, true);
             Function.Call(Hash.SET_PED_GET_OUT_UPSIDE_DOWN_VEHICLE, MainPed.Handle, false);
             Function.Call(Hash.SET_CAN_ATTACK_FRIENDLY, MainPed.Handle, true, true);
-            Function.Call(Hash._SET_PED_CAN_PLAY_INJURED_ANIMS, false);
+            Function.Call(Hash.SET_PED_IS_IGNORED_BY_AUTO_OPEN_DOORS, false);
             Function.Call(Hash.SET_PED_CAN_EVASIVE_DIVE, MainPed.Handle, false);
 
             MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DrownsInWater, false);
@@ -597,6 +598,8 @@ namespace RageCoop.Client
                         MainPed.Task.StandStill(2000);
                         LastMoving = false;
                     }
+
+                    if (MainPed.IsTaskActive(TaskType.CTaskDiveToGround)) MainPed.Task.ClearAll();
                     break;
             }
             SmoothTransition();
@@ -713,7 +716,7 @@ namespace RageCoop.Client
                 case 5:
                     if (MainPed.VehicleTryingToEnter != CurrentVehicle.MainVehicle || MainPed.GetSeatTryingToEnter() != Seat)
                     {
-                        MainPed.Task.EnterVehicle(CurrentVehicle.MainVehicle, Seat, -1, 5, EnterVehicleFlags.AllowJacking);
+                        MainPed.Task.EnterVehicle(CurrentVehicle.MainVehicle, Seat, -1, 5, EnterVehicleFlags.JackAnyone);
                     }
                     break;
                 case 6:

RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.cs

@@ -197,13 +197,13 @@ namespace RageCoop.Client
                         if (!_lastTransformed)
                         {
                             _lastTransformed = true;
-                            Function.Call(Hash._TRANSFORM_VEHICLE_TO_SUBMARINE, MainVehicle.Handle, false);
+                            Function.Call(Hash.TRANSFORM_TO_SUBMARINE, MainVehicle.Handle, false);
                         }
                     }
                     else if (_lastTransformed)
                     {
                         _lastTransformed = false;
-                        Function.Call(Hash._TRANSFORM_SUBMARINE_TO_VEHICLE, MainVehicle.Handle, false);
+                        Function.Call(Hash.TRANSFORM_TO_CAR, MainVehicle.Handle, false);
                     }
                 }
                 else if (IsDeluxo)
@@ -364,7 +364,7 @@ namespace RageCoop.Client
 
         private void StartPedalingAnim(bool fast)
         {
-            MainVehicle.Driver?.Task.PlayAnimation(PedalingAnimDict(), PedalingAnimName(fast), 8.0f, -8.0f, -1, AnimationFlags.Loop | AnimationFlags.AllowRotation, 1.0f);
+            MainVehicle.Driver?.Task.PlayAnimation(PedalingAnimDict(), PedalingAnimName(fast), 8.0f, -8.0f, -1, AnimationFlags.Loop | AnimationFlags.Secondary, 1.0f);
 
         }
 

RageCoop.Client/Sync/EntityPool.cs

@@ -43,7 +43,7 @@ namespace RageCoop.Client
         #endregion
         public static void Cleanup(bool keepPlayer = true, bool keepMine = true)
         {
-            foreach (var ped in PedsByID.Values)
+            foreach (var ped in PedsByID.Values.ToArray())
             {
                 if ((keepPlayer && (ped.ID == Main.LocalPlayerID)) || (keepMine && (ped.OwnerID == Main.LocalPlayerID))) { continue; }
                 RemovePed(ped.ID);
@@ -277,8 +277,8 @@ namespace RageCoop.Client
                     {
                         ProjectilesByHandle.Remove(p.Handle);
                     }
-                    Main.Logger.Debug($"Removing projectile {sp.ID}. Reason:{reason}");
+                    //Main.Logger.Debug($"Removing projectile {sp.ID}. Reason:{reason}");
-                    p.Explode();
+                    if (sp.Exploded) p.Explode();
                 }
                 ProjectilesByID.Remove(id);
             }
@@ -363,9 +363,10 @@ namespace RageCoop.Client
                 foreach (Ped p in allPeds)
                 {
                     SyncedPed c = GetPedByHandle(p.Handle);
-                    if (c == null && (p != Game.Player.Character))
+                    List<PedHash> mainCharacters = new List<PedHash> { PedHash.Michael, PedHash.Franklin, PedHash.Franklin02, PedHash.Trevor };
+                    if (c == null && p != Game.Player.Character && !mainCharacters.Contains((PedHash)p.Model.Hash))
                     {
-                        if (allPeds.Length > Main.Settings.WorldPedSoftLimit && p.PopulationType == EntityPopulationType.RandomAmbient)
+                        if (allPeds.Length > Main.Settings.WorldPedSoftLimit && p.PopulationType == EntityPopulationType.RandomAmbient && !p.IsInVehicle())
                         {
                             p.Delete();
                             continue;

RageCoop.Client/Sync/SyncEvents.cs

@@ -126,7 +126,7 @@ namespace RageCoop.Client
             }
 
             var p = EntityPool.GetPedByID(ownerID)?.MainPed;
-            if (p == null) { p = Game.Player.Character; Main.Logger.Warning("Failed to find owner for bullet"); }
+            if (p == null) { return; /* p = Game.Player.Character; Main.Logger.Warning("Failed to find owner for bullet"); */ }
             if (!CorePFXAsset.IsLoaded) { CorePFXAsset.Request(); }
             if (_lastWeaponHash != weaponHash)
             {

RageCoop.Client/Util/PedExtensions.cs

@@ -296,7 +296,7 @@ namespace RageCoop.Client
             {
                 result = true;
             }
-            else
+            else if (veh.GetPedOnSeat(seat) != null)
             {
 
                 bool isDead = veh.GetPedOnSeat(seat).IsDead;

RageCoop.Client/Util/VehicleExtensions.cs

@@ -50,7 +50,7 @@ namespace RageCoop.Client
                 flags |= VehicleDataFlags.IsHornActive;
             }
 
-            if (v.IsSubmarineCar && Function.Call<bool>(Hash._GET_IS_SUBMARINE_VEHICLE_TRANSFORMED, veh.Handle))
+            if (v.IsSubmarineCar && Function.Call<bool>(Hash.IS_VEHICLE_IN_SUBMARINE_MODE, veh.Handle))
             {
                 flags |= VehicleDataFlags.IsTransformed;
             }
@@ -89,7 +89,7 @@ namespace RageCoop.Client
         }
         public static bool IsRocketBoostActive(this Vehicle veh)
         {
-            return Function.Call<bool>(Hash._IS_VEHICLE_ROCKET_BOOST_ACTIVE, veh);
+            return Function.Call<bool>(Hash.IS_ROCKET_BOOST_ACTIVE, veh);
         }
         public static bool IsParachuteActive(this Vehicle veh)
         {
@@ -97,7 +97,7 @@ namespace RageCoop.Client
         }
         public static void SetRocketBoostActive(this Vehicle veh, bool toggle)
         {
-            Function.Call(Hash._SET_VEHICLE_ROCKET_BOOST_ACTIVE, veh, toggle);
+            Function.Call(Hash.SET_ROCKET_BOOST_ACTIVE, veh, toggle);
         }
         public static void SetParachuteActive(this Vehicle veh, bool toggle)
         {
@@ -242,7 +242,7 @@ namespace RageCoop.Client
 
         public static void SetDeluxoHoverState(this Vehicle deluxo, bool hover)
         {
-            Function.Call(Hash._SET_VEHICLE_HOVER_TRANSFORM_PERCENTAGE, deluxo, hover ? 1f : 0f);
+            Function.Call(Hash.SET_SPECIAL_FLIGHT_MODE_TARGET_RATIO, deluxo, hover ? 1f : 0f);
         }
         public static bool IsDeluxoHovering(this Vehicle deluxo)
         {
@@ -250,7 +250,7 @@ namespace RageCoop.Client
         }
         public static void SetDeluxoWingRatio(this Vehicle v, float ratio)
         {
-            Function.Call(Hash._SET_SPECIALFLIGHT_WING_RATIO, v, ratio);
+            Function.Call(Hash.SET_HOVER_MODE_WING_RATIO, v, ratio);
         }
         public static float GetDeluxoWingRatio(this Vehicle v)
         {
@@ -258,7 +258,7 @@ namespace RageCoop.Client
         }
         public static float GetNozzleAngel(this Vehicle plane)
         {
-            return Function.Call<float>(Hash._GET_VEHICLE_FLIGHT_NOZZLE_POSITION, plane);
+            return Function.Call<float>(Hash.GET_VEHICLE_FLIGHT_NOZZLE_POSITION, plane);
         }
         public static bool HasNozzle(this Vehicle v)
         {

RageCoop.Server/Networking/Server.Background.cs

@@ -81,7 +81,7 @@ namespace RageCoop.Server
             }
             if (!CanAnnounce)
             {
-                var existing = JsonConvert.DeserializeObject<List<ServerInfo>>(HttpHelper.DownloadString(Util.GetFinalRedirect(Settings.MasterServer))).Where(x => x.address == IpInfo.Address).FirstOrDefault();
+                var existing = JsonConvert.DeserializeObject<List<ServerInfo>>(HttpHelper.DownloadString(Util.GetFinalRedirect(Settings.MasterServer))).Where(x => x.address == IpInfo.Address && x.port == Settings.Port.ToString()).FirstOrDefault();
                 if(existing != null)
                 {
                     Logger.Warning("Server info already present in master server, waiting for 10 seconds...");

RageCoop.Server/Properties/AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Resources;
 [assembly: AssemblyCulture("")]
 
 // Version information
-[assembly: AssemblyVersion("1.5.4.2")]
+[assembly: AssemblyVersion("1.5.4.5")]
-[assembly: AssemblyFileVersion("1.5.4.2")]
+[assembly: AssemblyFileVersion("1.5.4.5")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

RageCoop.Server/RageCoop.Server.csproj

@@ -49,12 +49,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Fody" Version="6.6.3">
+    <PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.8" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.9" />
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="SharpZipLib" Version="1.4.2" />
   </ItemGroup>
 
   <ItemGroup>

RageCoop.Server/Scripting/BaseScript.cs

@@ -38,7 +38,7 @@ namespace RageCoop.Server.Scripting
             });
             API.RegisterCustomEventHandler(CustomEvents.OnPlayerDied, (e) =>
             {
-                API.SendCustomEventQueued(API.GetAllClients().Values.Where(x => x != e.Client).ToList(), CustomEvents.OnPlayerDied, e.Client.Username);
+                API.SendCustomEventQueued(API.GetAllClients().Values.Where(x => x != e.Client).ToList(), CustomEvents.OnPlayerDied, e.Args);
             });
             API.Events.OnChatMessage += (s, e) =>
               Server.Logger?.Info((e.Client?.Username ?? e.ClaimedSender ?? "Unknown") + ": " + e.Message);

RageCoop.Server/Settings.cs

@@ -28,7 +28,7 @@
         /// <summary>
         /// The website address to be shown on master server
         /// </summary>
-        public string Website { get; set; } = "https://ragecoop.online/";
+        public string Website { get; set; } = "https://ragecoop.com/";
 
         /// <summary>
         /// The description to be shown on master server
@@ -58,7 +58,7 @@
         /// <summary>
         /// Master server address, mostly doesn't need to be changed.
         /// </summary>
-        public string MasterServer { get; set; } = "https://masterserver.ragecoop.online/";
+        public string MasterServer { get; set; } = "https://masterserver.ragecoop.com/";
 
         /// <summary>
         /// See <see cref="Core.Logger.LogLevel"/>.