From c034cd8aa9c8c82854d3c1f0c7f684d479623004 Mon Sep 17 00:00:00 2001 From: sardelka9515 Date: Mon, 22 Aug 2022 10:01:09 +0800 Subject: [PATCH] Fix traffic --- RageCoop.Client/Main.cs | 1 + RageCoop.Client/Menus/Sub/ServersMenu.cs | 2 +- RageCoop.Client/Menus/Sub/SettingsMenu.cs | 4 +-- RageCoop.Client/Properties/AssemblyInfo.cs | 4 +-- RageCoop.Client/Sync/EntityPool.cs | 2 +- RageCoop.Client/WorldThread.cs | 37 ++++------------------ RageCoop.Server/Properties/AssemblyInfo.cs | 4 +-- 7 files changed, 15 insertions(+), 39 deletions(-) diff --git a/RageCoop.Client/Main.cs b/RageCoop.Client/Main.cs index 996d53a..0038c8a 100644 --- a/RageCoop.Client/Main.cs +++ b/RageCoop.Client/Main.cs @@ -138,6 +138,7 @@ namespace RageCoop.Client { #if !NON_INTERACTIVE GTA.UI.Notification.Show(GTA.UI.NotificationIcon.AllPlayersConf, "RAGECOOP", "Welcome!", $"Press ~g~{Main.Settings.MenuKey}~s~ to open the menu."); + WorldThread.Traffic(!Settings.DisableTraffic); #endif } diff --git a/RageCoop.Client/Menus/Sub/ServersMenu.cs b/RageCoop.Client/Menus/Sub/ServersMenu.cs index e619746..ae4e4c5 100644 --- a/RageCoop.Client/Menus/Sub/ServersMenu.cs +++ b/RageCoop.Client/Menus/Sub/ServersMenu.cs @@ -85,7 +85,7 @@ namespace RageCoop.Client.Menus if (server.useZT) { address=$"{server.ztAddress}:{server.port}"; - Main.QueueAction(() => { Notification.Show($"~y~Joining ZeroTier network... {server.ztID}"); }); + Notification.Show($"~y~Joining ZeroTier network... {server.ztID}"); if (ZeroTierHelper.Join(server.ztID)==null) { throw new Exception("Failed to obtain ZeroTier network IP"); diff --git a/RageCoop.Client/Menus/Sub/SettingsMenu.cs b/RageCoop.Client/Menus/Sub/SettingsMenu.cs index 744d820..dc626ae 100644 --- a/RageCoop.Client/Menus/Sub/SettingsMenu.cs +++ b/RageCoop.Client/Menus/Sub/SettingsMenu.cs @@ -16,7 +16,7 @@ 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.DisableTraffic); + 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 _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 NativeItem _menuKey = new NativeItem("Menu Key", "The key to open menu", Main.Settings.MenuKey.ToString()); @@ -108,7 +108,7 @@ namespace RageCoop.Client.Menus public static void DisableTrafficCheckboxChanged(object a, System.EventArgs b) { - Main.Settings.DisableTraffic = _disableTrafficItem.Checked; + WorldThread.Traffic(!_disableTrafficItem.Checked); Util.SaveSettings(); } diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs index c3f49ee..09ad2ee 100644 --- a/RageCoop.Client/Properties/AssemblyInfo.cs +++ b/RageCoop.Client/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Resources; // Version informationr( -[assembly: AssemblyVersion("1.5.2.64")] -[assembly: AssemblyFileVersion("1.5.2.64")] +[assembly: AssemblyVersion("1.5.2.73")] +[assembly: AssemblyFileVersion("1.5.2.73")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/RageCoop.Client/Sync/EntityPool.cs b/RageCoop.Client/Sync/EntityPool.cs index 73b77a0..ec62b87 100644 --- a/RageCoop.Client/Sync/EntityPool.cs +++ b/RageCoop.Client/Sync/EntityPool.cs @@ -450,7 +450,7 @@ namespace RageCoop.Client { if (!VehiclesByHandle.ContainsKey(veh.Handle)) { - if (allVehicles.Length>Main.Settings.WorldVehicleSoftLimit || World.GetNearbyVehicles(veh.Position,2).Length>0) + if (allVehicles.Length>Main.Settings.WorldVehicleSoftLimit) { var type = veh.PopulationType; if (type==EntityPopulationType.RandomAmbient || type==EntityPopulationType.RandomParked) diff --git a/RageCoop.Client/WorldThread.cs b/RageCoop.Client/WorldThread.cs index b43c66d..43ada70 100644 --- a/RageCoop.Client/WorldThread.cs +++ b/RageCoop.Client/WorldThread.cs @@ -39,48 +39,23 @@ namespace RageCoop.Client { Game.DisableControlThisFrame(Control.FrontendPauseAlternate); } - var P = Game.Player.Character; // Sets a value that determines how aggressive the ocean waves will be. // Values of 2.0 or more make for very aggressive waves like you see during a thunderstorm. Function.Call(Hash.SET_DEEP_OCEAN_SCALER, 0.0f); // Works only ~200 meters around the player - - // Function.Call(Hash.SET_CAN_ATTACK_FRIENDLY, Game.Player.Character.Handle, true, false); - if (Main.Settings==null) { return; } - if (Main.Settings.DisableTraffic) - { - if (!_lastDisableTraffic) - { - Traffic(false); - } - - Function.Call(Hash.SET_VEHICLE_POPULATION_BUDGET, 0); - Function.Call(Hash.SET_PED_POPULATION_BUDGET, 0); - Function.Call(Hash.SET_VEHICLE_DENSITY_MULTIPLIER_THIS_FRAME, 0f); - Function.Call(Hash.SET_RANDOM_VEHICLE_DENSITY_MULTIPLIER_THIS_FRAME, 0f); - Function.Call(Hash.SET_PARKED_VEHICLE_DENSITY_MULTIPLIER_THIS_FRAME, 0f); - Function.Call(Hash.SUPPRESS_SHOCKING_EVENTS_NEXT_FRAME); - Function.Call(Hash.SUPPRESS_AGITATION_EVENTS_NEXT_FRAME); - } - else if (_lastDisableTraffic) - { - Traffic(true); - } - - _lastDisableTraffic = Main.Settings.DisableTraffic; } public static void Traffic(bool enable) { if (enable) { - Function.Call(Hash.REMOVE_SCENARIO_BLOCKING_AREAS); + // Function.Call(Hash.REMOVE_SCENARIO_BLOCKING_AREAS); Function.Call(Hash.SET_CREATE_RANDOM_COPS, true); Function.Call(Hash.SET_RANDOM_TRAINS, true); Function.Call(Hash.SET_RANDOM_BOATS, true); Function.Call(Hash.SET_GARBAGE_TRUCKS, true); - Function.Call(Hash.SET_PED_POPULATION_BUDGET, 1); // 0 - 3 - Function.Call(Hash.SET_VEHICLE_POPULATION_BUDGET, 1); // 0 - 3 + Function.Call(Hash.SET_PED_POPULATION_BUDGET, 3); // 0 - 3 + Function.Call(Hash.SET_VEHICLE_POPULATION_BUDGET, 3); // 0 - 3 Function.Call(Hash.SET_ALL_VEHICLE_GENERATORS_ACTIVE); Function.Call(Hash.SET_ALL_LOW_PRIORITY_VEHICLE_GENERATORS_ACTIVE, true); Function.Call(Hash.SET_NUMBER_OF_PARKED_VEHICLES, -1); @@ -89,14 +64,14 @@ namespace RageCoop.Client } else { - Function.Call(Hash.ADD_SCENARIO_BLOCKING_AREA, -10000.0f, -10000.0f, -1000.0f, 10000.0f, 10000.0f, 1000.0f, 0, 1, 1, 1); + // Function.Call(Hash.ADD_SCENARIO_BLOCKING_AREA, -10000.0f, -10000.0f, -1000.0f, 10000.0f, 10000.0f, 1000.0f, 0, 1, 1, 1); Function.Call(Hash.SET_CREATE_RANDOM_COPS, false); Function.Call(Hash.SET_RANDOM_TRAINS, false); Function.Call(Hash.SET_RANDOM_BOATS, false); Function.Call(Hash.SET_GARBAGE_TRUCKS, false); Function.Call(Hash.DELETE_ALL_TRAINS); - Function.Call(Hash.SET_PED_POPULATION_BUDGET, 3); - Function.Call(Hash.SET_VEHICLE_POPULATION_BUDGET, 3); + Function.Call(Hash.SET_PED_POPULATION_BUDGET, 0); + Function.Call(Hash.SET_VEHICLE_POPULATION_BUDGET, 0); Function.Call(Hash.SET_ALL_LOW_PRIORITY_VEHICLE_GENERATORS_ACTIVE, false); Function.Call(Hash.SET_FAR_DRAW_VEHICLES, false); Function.Call(Hash.SET_NUMBER_OF_PARKED_VEHICLES, 0); diff --git a/RageCoop.Server/Properties/AssemblyInfo.cs b/RageCoop.Server/Properties/AssemblyInfo.cs index 0516a7a..d72b694 100644 --- a/RageCoop.Server/Properties/AssemblyInfo.cs +++ b/RageCoop.Server/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.5.2.78")] -[assembly: AssemblyFileVersion("1.5.2.78")] +[assembly: AssemblyVersion("1.5.2.79")] +[assembly: AssemblyFileVersion("1.5.2.79")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )]