From 6880e74ec8b1f5bc06c4b14b48478b71d000a409 Mon Sep 17 00:00:00 2001 From: MrDave1999 Date: Mon, 20 Jan 2025 13:15:31 -0500 Subject: [PATCH 01/15] docs: update download link for GTA SA --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2da4e80..0679b39 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ These concepts have been applied to this project: ## Requirements to play - You must have **DirectX 9** installed on your local machine. -- You must download [Grand Theft Auto: San Andreas](https://mega.nz/file/yFMjSLZA#8Amh1xyauAKO9Ff1lsbXHZIWHqPC4qEg2McfqhqoHTc) on your local machine. +- You must download [Grand Theft Auto: San Andreas](https://mega.nz/file/mIlnjKQK#ZuqNUB3xqB6_pul917dmwUQaohGuYVcN7YwbXHqn-v4) on your local machine. - You must download [open.mp launcher](https://github.com/openmultiplayer/launcher/releases/latest) to connect to the servers. ## Deployment without Docker From 94775b75901584f252289c6e8a4e4716f3890c01 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:04:12 -0500 Subject: [PATCH 02/15] feat: implement anti-C-Bug mechanism for Desert Eagle (#304) --- .../Players/AntiCBug/AntiCBugSystem.cs | 48 +++++++++++++++++++ .../AntiCBug/LastFiredTimeComponent.cs | 10 ++++ 2 files changed, 58 insertions(+) create mode 100644 src/Application/Players/AntiCBug/AntiCBugSystem.cs create mode 100644 src/Application/Players/AntiCBug/LastFiredTimeComponent.cs diff --git a/src/Application/Players/AntiCBug/AntiCBugSystem.cs b/src/Application/Players/AntiCBug/AntiCBugSystem.cs new file mode 100644 index 0000000..e3ac850 --- /dev/null +++ b/src/Application/Players/AntiCBug/AntiCBugSystem.cs @@ -0,0 +1,48 @@ +namespace CTF.Application.Players.AntiCBug; + +public class AntiCBugSystem(UnixTimeSeconds unixTimeSeconds) : ISystem +{ + [Event] + public void OnPlayerConnect(Player player) + { + player.AddComponent(); + } + + [Event] + public void OnPlayerKeyStateChange(Player player, Keys newKeys, Keys oldKeys) + { + if (player.State != PlayerState.OnFoot) + return; + + var lastFiredTimeComponent = player.GetComponent(); + if (player.SpecialAction != SpecialAction.Duck && + KeyUtils.HasPressed(newKeys, oldKeys, Keys.Fire)) + { + lastFiredTimeComponent.Value = player.Weapon switch + { + Weapon.Deagle => unixTimeSeconds.Value, + _ => default + }; + } + else if (KeyUtils.HasPressed(newKeys, oldKeys, Keys.Crouch)) + { + long currentTime = unixTimeSeconds.Value; + long elapsedTime = currentTime - lastFiredTimeComponent.Value; + if (elapsedTime < 1) + { + player.GameText("~r~~h~DON'T C-BUG!", 3000, 4); + player.ApplyAnimation( + animationLibrary: "PED", + animationName: "getup", + fDelta: 4.1f, + loop: false, + lockX: false, + lockY: false, + freeze: false, + time: 0, + forceSync: false + ); + } + } + } +} diff --git a/src/Application/Players/AntiCBug/LastFiredTimeComponent.cs b/src/Application/Players/AntiCBug/LastFiredTimeComponent.cs new file mode 100644 index 0000000..0153fa5 --- /dev/null +++ b/src/Application/Players/AntiCBug/LastFiredTimeComponent.cs @@ -0,0 +1,10 @@ +namespace CTF.Application.Players.AntiCBug; + +/// +/// Represents a component that stores the last shot time and +/// is used to detect rapid shooting techniques such as C-Bug. +/// +public class LastFiredTimeComponent : Component +{ + public long Value { get; set; } +} From b8fb9d728cadc8c1fd91abefd89c9831e5fee9b1 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:38:53 -0500 Subject: [PATCH 03/15] feat: add option to disable anti-C-Bug via configuration file (#305) --- .env.example | 2 ++ src/Application/Players/AntiCBug/AntiCBugSettings.cs | 6 ++++++ src/Application/Players/AntiCBug/AntiCBugSystem.cs | 7 ++++++- src/Host/Extensions/AppSettingsExtensions.cs | 7 ++++++- src/Host/Usings.cs | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 src/Application/Players/AntiCBug/AntiCBugSettings.cs diff --git a/.env.example b/.env.example index c17d8fe..7267df3 100644 --- a/.env.example +++ b/.env.example @@ -24,6 +24,8 @@ CommandCooldowns__Coins=3 TopPlayers__RequiredTotalKills=150 TopPlayers__RequiredMaxKillingSpree=10 +AntiCBug__Disabled=false + MariaDB__Server=mariadb MariaDB__Port=3306 MariaDB__Database=gamemode diff --git a/src/Application/Players/AntiCBug/AntiCBugSettings.cs b/src/Application/Players/AntiCBug/AntiCBugSettings.cs new file mode 100644 index 0000000..01c49ec --- /dev/null +++ b/src/Application/Players/AntiCBug/AntiCBugSettings.cs @@ -0,0 +1,6 @@ +namespace CTF.Application.Players.AntiCBug; + +public class AntiCBugSettings +{ + public bool Disabled { get; set; } = false; +} diff --git a/src/Application/Players/AntiCBug/AntiCBugSystem.cs b/src/Application/Players/AntiCBug/AntiCBugSystem.cs index e3ac850..a9dbfca 100644 --- a/src/Application/Players/AntiCBug/AntiCBugSystem.cs +++ b/src/Application/Players/AntiCBug/AntiCBugSystem.cs @@ -1,6 +1,8 @@ namespace CTF.Application.Players.AntiCBug; -public class AntiCBugSystem(UnixTimeSeconds unixTimeSeconds) : ISystem +public class AntiCBugSystem( + UnixTimeSeconds unixTimeSeconds, + AntiCBugSettings antiCBugSettings) : ISystem { [Event] public void OnPlayerConnect(Player player) @@ -11,6 +13,9 @@ public void OnPlayerConnect(Player player) [Event] public void OnPlayerKeyStateChange(Player player, Keys newKeys, Keys oldKeys) { + if (antiCBugSettings.Disabled) + return; + if (player.State != PlayerState.OnFoot) return; diff --git a/src/Host/Extensions/AppSettingsExtensions.cs b/src/Host/Extensions/AppSettingsExtensions.cs index a056b03..4ddc336 100644 --- a/src/Host/Extensions/AppSettingsExtensions.cs +++ b/src/Host/Extensions/AppSettingsExtensions.cs @@ -26,12 +26,17 @@ public static IServiceCollection AddSettings( .GetRequiredSection("FlagCarrier") .Get(); + var antiCBugSettings = configuration + .GetRequiredSection("AntiCBug") + .Get(); + services .AddSingleton(serverSettings) .AddSingleton(commandCooldowns) .AddSingleton(topPlayersSettings) .AddSingleton(serverOwnerSettings) - .AddSingleton(flagCarrierSettings); + .AddSingleton(flagCarrierSettings) + .AddSingleton(antiCBugSettings); return services; } diff --git a/src/Host/Usings.cs b/src/Host/Usings.cs index 07d0e0f..3b3cb1c 100644 --- a/src/Host/Usings.cs +++ b/src/Host/Usings.cs @@ -15,6 +15,7 @@ global using CTF.Application.Players.Accounts; global using CTF.Application.Players.AFK; global using CTF.Application.Players.Combos; +global using CTF.Application.Players.AntiCBug; global using CTF.Application.Players.TopPlayers.Models; global using CTF.Application.Teams.Flags; global using CTF.Application.Teams.Flags.Systems; From 8cb1153121b8ea28508eac808c8859b57c375289 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:03:44 -0500 Subject: [PATCH 04/15] feat: allow admins to disable anti-C-Bug via commands (#306) --- .../Common/Resources/Messages.Designer.cs | 18 ++++++++++ .../Common/Resources/Messages.resx | 6 ++++ .../Players/AntiCBug/AntiCBugCommands.cs | 34 +++++++++++++++++++ .../Resources/DetailedCommandInfo.resx | 2 ++ 4 files changed, 60 insertions(+) create mode 100644 src/Application/Players/AntiCBug/AntiCBugCommands.cs diff --git a/src/Application/Common/Resources/Messages.Designer.cs b/src/Application/Common/Resources/Messages.Designer.cs index 0220b31..87213e0 100644 --- a/src/Application/Common/Resources/Messages.Designer.cs +++ b/src/Application/Common/Resources/Messages.Designer.cs @@ -258,6 +258,15 @@ internal static string DemotedToRole { } } + /// + /// Looks up a localized string similar to {PlayerName} has disabled the AntiCBug. + /// + internal static string DisableAntiCBug { + get { + return ResourceManager.GetString("DisableAntiCBug", resourceCulture); + } + } + /// /// Looks up a localized string similar to {PlayerName} has disabled the Rocket Launcher(RPG). /// @@ -276,6 +285,15 @@ internal static string EmptyWeaponPackage { } } + /// + /// Looks up a localized string similar to {PlayerName} has enabled the AntiCBug. + /// + internal static string EnableAntiCBug { + get { + return ResourceManager.GetString("EnableAntiCBug", resourceCulture); + } + } + /// /// Looks up a localized string similar to {PlayerName} has enabled the Rocket Launcher(RPG). Use /combos or NUM 4 key. /// diff --git a/src/Application/Common/Resources/Messages.resx b/src/Application/Common/Resources/Messages.resx index 2c401ae..e604781 100644 --- a/src/Application/Common/Resources/Messages.resx +++ b/src/Application/Common/Resources/Messages.resx @@ -183,12 +183,18 @@ Demoted to {RoleName} role + + {PlayerName} has disabled the AntiCBug + {PlayerName} has disabled the Rocket Launcher(RPG) You have no items in your weapon package + + {PlayerName} has enabled the AntiCBug + {PlayerName} has enabled the Rocket Launcher(RPG). Use /combos or NUM 4 key diff --git a/src/Application/Players/AntiCBug/AntiCBugCommands.cs b/src/Application/Players/AntiCBug/AntiCBugCommands.cs new file mode 100644 index 0000000..390cc23 --- /dev/null +++ b/src/Application/Players/AntiCBug/AntiCBugCommands.cs @@ -0,0 +1,34 @@ +namespace CTF.Application.Players.AntiCBug; + +public class AntiCBugCommands( + IWorldService worldService, + AntiCBugSettings antiCBugSettings) : ISystem +{ + [PlayerCommand("anticbugoff")] + public void Disable(Player player) + { + if (player.HasLowerRoleThan(RoleId.Admin)) + return; + + var message = Smart.Format(Messages.DisableAntiCBug, new + { + PlayerName = player.Name + }); + worldService.SendClientMessage(Color.Yellow, message); + antiCBugSettings.Disabled = true; + } + + [PlayerCommand("anticbugon")] + public void Enable(Player player) + { + if (player.HasLowerRoleThan(RoleId.Admin)) + return; + + var message = Smart.Format(Messages.EnableAntiCBug, new + { + PlayerName = player.Name + }); + worldService.SendClientMessage(Color.Yellow, message); + antiCBugSettings.Disabled = false; + } +} diff --git a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx index a74ab37..876c424 100644 --- a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx +++ b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx @@ -131,6 +131,8 @@ {Color1}/ban: {Color2}Ban a player from the server. {Color1}/unban: {Color2}Remove a ban from a player, allowing them back on the server. {Color1}/bannedips: {Color2}View a list of IP addresses that are currently banned. +{Color1}/anticbugoff: {Color2}Disables the AntiCBug system. +{Color1}/anticbugon: {Color2}Enables the AntiCBug system. {Color1}Use the '#' symbol at the start of your message to access the private admin chat. From 0cc948178110f6228c38287e6475fc4de566c2c7 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:41:31 -0500 Subject: [PATCH 05/15] feat: add usage instructions for weapons (#307) --- .../Common/Resources/Messages.Designer.cs | 18 ++++++++++++++++++ src/Application/Common/Resources/Messages.resx | 6 ++++++ .../Players/Weapons/WeaponSystem.cs | 2 ++ 3 files changed, 26 insertions(+) diff --git a/src/Application/Common/Resources/Messages.Designer.cs b/src/Application/Common/Resources/Messages.Designer.cs index 87213e0..1764957 100644 --- a/src/Application/Common/Resources/Messages.Designer.cs +++ b/src/Application/Common/Resources/Messages.Designer.cs @@ -1203,6 +1203,15 @@ internal static string WeaponAlreadyExists { } } + /// + /// Looks up a localized string similar to Press Y to show the available weapons. + /// + internal static string WeaponListUsage { + get { + return ResourceManager.GetString("WeaponListUsage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Weapon has not been found. /// @@ -1212,6 +1221,15 @@ internal static string WeaponNotFound { } } + /// + /// Looks up a localized string similar to Press H to show your current weapon package. + /// + internal static string WeaponPackUsage { + get { + return ResourceManager.GetString("WeaponPackUsage", resourceCulture); + } + } + /// /// Looks up a localized string similar to {Name} was added to your weapon package. /// diff --git a/src/Application/Common/Resources/Messages.resx b/src/Application/Common/Resources/Messages.resx index e604781..47b24f1 100644 --- a/src/Application/Common/Resources/Messages.resx +++ b/src/Application/Common/Resources/Messages.resx @@ -498,9 +498,15 @@ {Name} is already in the weapon package + + Press Y to show the available weapons + Weapon has not been found + + Press H to show your current weapon package + {Name} was added to your weapon package diff --git a/src/Application/Players/Weapons/WeaponSystem.cs b/src/Application/Players/Weapons/WeaponSystem.cs index 618bd21..3480ae2 100644 --- a/src/Application/Players/Weapons/WeaponSystem.cs +++ b/src/Application/Players/Weapons/WeaponSystem.cs @@ -23,6 +23,8 @@ public void OnPlayerConnect(Player player) public void OnPlayerRequestSpawn(Player player) { ShowWeapons(player); + player.SendClientMessage(Color.Orange, Messages.WeaponListUsage); + player.SendClientMessage(Color.Orange, Messages.WeaponPackUsage); } [Event] From 99fc6684e77c1d5a4f60369e06040c865b97486a Mon Sep 17 00:00:00 2001 From: MrDave1999 Date: Wed, 22 Jan 2025 15:18:10 -0500 Subject: [PATCH 06/15] chore: remove '-d' flag from docker compose to show server logs in terminal --- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/deploy-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 298d58d..6471a01 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -20,6 +20,6 @@ jobs: cd ctf-prod git pull origin main git status - sudo docker compose up --build -d + sudo docker compose up --build sudo docker builder prune -f -a sudo docker image prune -f -a \ No newline at end of file diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml index 73647c5..b5ab691 100644 --- a/.github/workflows/deploy-test.yml +++ b/.github/workflows/deploy-test.yml @@ -20,6 +20,6 @@ jobs: cd ctf-test git pull origin dev git status - sudo docker compose up --build -d + sudo docker compose up --build sudo docker builder prune -f -a sudo docker image prune -f -a \ No newline at end of file From 3db328a860f27d0144c458a6cd17d4b662872c1e Mon Sep 17 00:00:00 2001 From: MrDave1999 Date: Wed, 22 Jan 2025 15:28:43 -0500 Subject: [PATCH 07/15] chore: update deploy-test.yml --- .github/workflows/deploy-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml index b5ab691..73647c5 100644 --- a/.github/workflows/deploy-test.yml +++ b/.github/workflows/deploy-test.yml @@ -20,6 +20,6 @@ jobs: cd ctf-test git pull origin dev git status - sudo docker compose up --build + sudo docker compose up --build -d sudo docker builder prune -f -a sudo docker image prune -f -a \ No newline at end of file From 36c47e666b322276e17b9fb028411ff102e7a4ae Mon Sep 17 00:00:00 2001 From: MrDave1999 Date: Wed, 22 Jan 2025 15:28:54 -0500 Subject: [PATCH 08/15] chore: update deploy-prod.yml --- .github/workflows/deploy-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 6471a01..298d58d 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -20,6 +20,6 @@ jobs: cd ctf-prod git pull origin main git status - sudo docker compose up --build + sudo docker compose up --build -d sudo docker builder prune -f -a sudo docker image prune -f -a \ No newline at end of file From 0983e323a0d0191c4941f5ef2745cfdbd3b76792 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:34:15 -0500 Subject: [PATCH 09/15] feat: add new map (cs_train) with integrated objects (#308) --- filterscripts/cs_train.amx | Bin 0 -> 17724 bytes filterscripts/cs_train.pwn | 306 ++++++++++++++++++++++++ src/Application/Maps/Files/cs_train.ini | 29 +++ 3 files changed, 335 insertions(+) create mode 100644 filterscripts/cs_train.amx create mode 100644 filterscripts/cs_train.pwn create mode 100644 src/Application/Maps/Files/cs_train.ini diff --git a/filterscripts/cs_train.amx b/filterscripts/cs_train.amx new file mode 100644 index 0000000000000000000000000000000000000000..268863663ca2f2d80391e251f23137bc8f074b32 GIT binary patch literal 17724 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 literal 0 HcmV?d00001 diff --git a/filterscripts/cs_train.pwn b/filterscripts/cs_train.pwn new file mode 100644 index 0000000..00bf924 --- /dev/null +++ b/filterscripts/cs_train.pwn @@ -0,0 +1,306 @@ +#include +#define FILTER_SCRIPT_NAME "cs_train" +#include "objects" + +public OnFilterScriptInit() +{ + CreateObject(5169, 177.19920, 372.90030, 224.39990, 0.00000, 0.00000, 177.98950); + CreateObject(11305, 180.50000, 391.40030, 229.00000, 0.00000, 0.00000, 267.99490); + CreateObject(8625, 180.62691, 317.38470, 220.12500, 0.00000, 0.00000, 87.91800); + CreateObject(10830, 127.00000, 365.40030, 227.82491, 0.00000, 0.00000, 43.73100); + CreateObject(4639, 169.19920, 371.30069, 224.19991, 0.00000, 0.00000, 176.99519); + CreateObject(4639, 186.19991, 370.59991, 224.19991, 0.00000, 0.00000, 177.48959); + CreateObject(4639, 202.89990, 369.79999, 224.19991, 0.00000, 0.00000, 177.48959); + CreateObject(2775, 184.69991, 382.79999, 227.80000, 0.00000, 0.00000, 0.00000); + CreateObject(2775, 195.60001, 382.50000, 227.80000, 0.00000, 0.00000, 0.00000); + CreateObject(2775, 173.80000, 383.19989, 227.80000, 0.00000, 0.00000, 357.25000); + CreateObject(2775, 163.00000, 383.50000, 227.80000, 0.00000, 0.00000, 357.24789); + CreateObject(2792, 169.19991, 370.19989, 225.60001, 0.00000, 0.00000, 357.75000); + CreateObject(2792, 169.19991, 372.39999, 225.60001, 0.00000, 0.00000, 357.74780); + CreateObject(2793, 186.19991, 369.50000, 225.60001, 0.00000, 0.00000, 357.24789); + CreateObject(2793, 186.30000, 371.69989, 225.60001, 0.00000, 0.00000, 357.74780); + CreateObject(2794, 202.89990, 368.69989, 225.50000, 0.00000, 0.00000, 356.99521); + CreateObject(2794, 202.89990, 370.89999, 225.50000, 0.00000, 0.00000, 357.49509); + CreateObject(2797, 193.50000, 374.69989, 226.69991, 0.00000, 0.00000, 359.25000); + CreateObject(2797, 193.50000, 375.29999, 226.69991, 0.00000, 0.00000, 359.74731); + CreateObject(2789, 184.50000, 384.29999, 227.89990, 0.00000, 0.00000, 177.75000); + CreateObject(2790, 173.80000, 384.59991, 227.89990, 0.00000, 0.00000, 178.00000); + CreateObject(2791, 195.19920, 383.80069, 234.89990, 0.00000, 0.00000, 358.49481); + CreateObject(3462, 200.19920, 392.20010, 225.30000, 0.00000, 0.00000, 357.98950); + CreateObject(3471, 195.60001, 381.50000, 225.10001, 0.00000, 0.00000, 266.00000); + CreateObject(983, 154.89990, 367.69989, 223.10001, 0.00000, 0.00000, 88.00000); + CreateObject(983, 163.89940, 367.40030, 223.10001, 0.00000, 0.00000, 87.98950); + CreateObject(983, 173.10001, 367.09991, 223.10001, 0.00000, 0.00000, 87.99490); + CreateObject(983, 182.19991, 366.79999, 223.10001, 0.00000, 0.00000, 87.99490); + CreateObject(983, 191.29980, 366.60049, 223.10001, 0.00000, 0.00000, 87.98950); + CreateObject(983, 200.50000, 366.20010, 223.10001, 0.00000, 0.00000, 87.98950); + CreateObject(10830, 230.82390, 370.85089, 227.89990, 0.00000, 0.00000, 223.74750); + CreateObject(3089, 178.32001, 402.65991, 225.10001, 0.00000, 0.00000, 356.00000); + CreateObject(3089, 181.30000, 402.50000, 225.10001, 0.00000, 0.00000, 177.99541); + CreateObject(3036, 182.10001, 402.00000, 224.60001, 0.00000, 0.00000, 178.00000); + CreateObject(5020, 184.39990, 402.39999, 224.80000, 0.00000, 0.00000, 88.00000); + CreateObject(5020, 175.19991, 402.79999, 224.80000, 0.00000, 0.00000, 87.99490); + CreateObject(2791, 162.69920, 385.00000, 234.89990, 0.00000, 0.00000, 357.98950); + CreateObject(3920, 160.39990, 384.89999, 231.19991, 0.00000, 0.00000, 358.00000); + CreateObject(3920, 172.59959, 384.50000, 231.30000, 0.00000, 0.00000, 357.98950); + CreateObject(3920, 185.50000, 384.10049, 231.39990, 0.00000, 0.00000, 357.98950); + CreateObject(3920, 198.10001, 383.59991, 231.39990, 0.00000, 0.00000, 357.99490); + CreateObject(638, 184.19991, 384.69989, 224.50000, 0.00000, 0.00000, 267.74750); + CreateObject(638, 173.50000, 385.00000, 224.50000, 0.00000, 0.00000, 267.74231); + CreateObject(638, 162.69991, 385.39999, 224.50000, 0.00000, 0.00000, 267.74231); + CreateObject(638, 195.19991, 384.29999, 224.50000, 0.00000, 0.00000, 267.74231); + CreateObject(949, 154.60001, 385.79999, 224.50000, 0.00000, 0.00000, 0.00000); + CreateObject(949, 203.69991, 384.09991, 224.50000, 0.00000, 0.00000, 0.00000); + CreateObject(18014, 196.00000, 401.00000, 224.30000, 0.00000, 0.00000, 87.50000); + CreateObject(18014, 184.89940, 401.40030, 224.30000, 0.00000, 0.00000, 87.99490); + CreateObject(18014, 163.39990, 402.19989, 224.30000, 0.00000, 0.00000, 87.49510); + CreateObject(18014, 166.32780, 311.08600, 220.48891, 0.00000, 0.00000, 87.73130); + CreateObject(3810, 155.69991, 384.59991, 228.60001, 0.00000, 0.00000, 0.00000); + CreateObject(3810, 166.39990, 384.39999, 228.60001, 0.00000, 0.00000, 0.00000); + CreateObject(3810, 188.19991, 383.59991, 228.60001, 0.00000, 0.00000, 0.00000); + CreateObject(3810, 177.29980, 384.00000, 228.60001, 0.00000, 0.00000, 0.00000); + CreateObject(3810, 169.80000, 384.19989, 228.60001, 0.00000, 0.00000, 180.00000); + CreateObject(3810, 191.50000, 383.40030, 228.60001, 0.00000, 0.00000, 179.99451); + CreateObject(3810, 180.69920, 383.80069, 228.60001, 0.00000, 0.00000, 179.99451); + CreateObject(1364, 168.00000, 392.20010, 224.60001, 0.00000, 0.00000, 357.99490); + CreateObject(1364, 174.59959, 391.90030, 224.60001, 0.00000, 0.00000, 357.98950); + CreateObject(1364, 181.19991, 391.69989, 224.60001, 0.00000, 0.00000, 357.98950); + CreateObject(1364, 194.19991, 391.19989, 224.60001, 0.00000, 0.00000, 357.99490); + CreateObject(1364, 187.79980, 391.50000, 224.60001, 0.00000, 0.00000, 357.99490); + CreateObject(1808, 154.39940, 390.80069, 223.80000, 0.00000, 0.00000, 87.99490); + CreateObject(11324, 179.19920, 392.10049, 231.80000, 0.00000, 0.00000, 266.98969); + CreateObject(11352, 177.89940, 395.00000, 228.00000, 0.00000, 0.00000, 266.99521); + CreateObject(1364, 174.69991, 394.09991, 224.60001, 0.00000, 0.00000, 177.98950); + CreateObject(1364, 168.10001, 394.39999, 224.60001, 0.00000, 0.00000, 177.98950); + CreateObject(1364, 181.30000, 393.89999, 224.60001, 0.00000, 0.00000, 177.98950); + CreateObject(1364, 187.89990, 393.69989, 224.60001, 0.00000, 0.00000, 177.98950); + CreateObject(1364, 194.39990, 393.50000, 224.60001, 0.00000, 0.00000, 177.98950); + CreateObject(3471, 184.69920, 381.70010, 225.10001, 0.00000, 0.00000, 265.99539); + CreateObject(3471, 173.89990, 382.00000, 225.10001, 0.00000, 0.00000, 267.99539); + CreateObject(3471, 162.89990, 382.39999, 225.10001, 0.00000, 0.00000, 267.99490); + CreateObject(7313, 199.60001, 391.29999, 230.89990, 0.00000, 0.00000, 266.75000); + CreateObject(7313, 158.69991, 393.29999, 230.89990, 0.00000, 0.00000, 86.74800); + CreateObject(1231, 177.80000, 371.00000, 225.19991, 0.00000, 0.00000, 0.00000); + CreateObject(1231, 196.00000, 370.09991, 225.19991, 0.00000, 0.00000, 0.00000); + CreateObject(1231, 159.50000, 371.70010, 225.19991, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 194.50000, 366.50000, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 176.29980, 367.00000, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 179.00000, 366.90030, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 185.39940, 366.70010, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 188.09959, 366.70010, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 169.89990, 367.19989, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 197.29980, 366.30069, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 203.69920, 366.10049, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 160.69991, 367.50000, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 167.09959, 367.30069, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1319, 158.09959, 367.60049, 223.00000, 0.00000, 0.00000, 0.00000); + CreateObject(1367, 154.60001, 388.69989, 224.50000, 0.00000, 0.00000, 88.00000); + CreateObject(1367, 154.60001, 387.89999, 224.50000, 0.00000, 0.00000, 87.99490); + CreateObject(1367, 154.60001, 387.09991, 224.50000, 0.00000, 0.00000, 87.99490); + CreateObject(7619, 205.02580, 290.09491, 199.10001, 0.00000, 270.00000, 267.98950); + CreateObject(16779, 172.80000, 393.29999, 232.19991, 0.00000, 0.00000, 0.00000); + CreateObject(16779, 185.29980, 391.90030, 232.19991, 0.00000, 0.00000, 0.00000); + CreateObject(1216, 204.00000, 388.29999, 224.50000, 0.00000, 0.00000, 267.99490); + CreateObject(1216, 204.00000, 389.19989, 224.50000, 0.00000, 0.00000, 267.99490); + CreateObject(1216, 203.95990, 387.39999, 224.50000, 0.00000, 0.00000, 267.99490); + CreateObject(1216, 203.93990, 386.51001, 224.50000, 0.00000, 0.00000, 267.99490); + CreateObject(16032, 104.85590, 361.65289, 220.28290, 0.00000, 0.00000, 268.25000); + CreateObject(16033, 211.40500, 359.11401, 219.82001, 0.00000, 0.00000, 268.25000); + CreateObject(16033, 211.08099, 348.08389, 219.82001, 0.00000, 0.00000, 268.24210); + CreateObject(16032, 104.53020, 350.63281, 220.28290, 0.00000, 0.00000, 268.24210); + CreateObject(16033, 210.74699, 337.08890, 219.82001, 0.00000, 0.00000, 268.24759); + CreateObject(16033, 210.42599, 326.10199, 219.81790, 0.00000, 0.00000, 268.24759); + CreateObject(16032, 104.19330, 339.60541, 220.28391, 0.00000, 0.00000, 268.24210); + CreateObject(16032, 103.84690, 328.65900, 220.28391, 0.00000, 0.00000, 268.24759); + CreateObject(10830, 126.01360, 318.08099, 227.82491, 0.00000, 0.00000, 43.98370); + CreateObject(10830, 229.83299, 323.42499, 227.89990, 0.00000, 0.00000, 223.74750); + CreateObject(16033, 210.06490, 315.07800, 219.82001, 0.00000, 0.00000, 268.24759); + CreateObject(16032, 103.52580, 317.62589, 220.28391, 0.00000, 0.00000, 268.24759); + CreateObject(11305, 177.94920, 298.42569, 225.19991, 0.00000, 0.00000, 267.99490); + CreateObject(5169, 168.56830, 341.10349, 220.40390, 0.00000, 0.00000, 177.98950); + CreateObject(5169, 169.97940, 334.97549, 220.50391, 0.00000, 0.00000, 357.98950); + CreateObject(7619, 157.82590, 291.73090, 199.10001, 0.00000, 270.00000, 267.98950); + CreateObject(7619, 164.58200, 403.12689, 203.60400, 0.00000, 270.00000, 267.99481); + CreateObject(7619, 219.54289, 401.19891, 203.60400, 0.00000, 270.00000, 267.98950); + CreateObject(11352, 175.32610, 302.44141, 224.16290, 0.00000, 0.00000, 267.99490); + CreateObject(18014, 174.29980, 401.80069, 224.30000, 0.00000, 0.00000, 87.73680); + CreateObject(18014, 155.42300, 311.29001, 220.48891, 0.00000, 0.00000, 88.23680); + CreateObject(18014, 155.43600, 311.41391, 220.48891, 0.00000, 0.00000, 88.23660); + CreateObject(18014, 187.95799, 310.38669, 220.48891, 0.00000, 0.00000, 88.23660); + CreateObject(18014, 198.82100, 309.95990, 220.48891, 0.00000, 0.00000, 88.23660); + CreateObject(5130, 177.77240, 321.84079, 222.61090, 0.00000, 0.00000, 223.24760); + CreateObject(5130, 178.42281, 353.93451, 222.61090, 0.00000, 0.00000, 42.99490); + CreateObject(8625, 175.51950, 358.44821, 220.10001, 0.00000, 0.00000, 267.92349); + CreateObject(3585, 157.22650, 325.41501, 221.44200, 0.00000, 0.00000, 179.24741); + CreateObject(3564, 165.55811, 318.25800, 221.38690, 0.00000, 0.00000, 358.00000); + CreateObject(3564, 187.80200, 313.63000, 221.46201, 0.00000, 0.00000, 179.98950); + CreateObject(3585, 197.93840, 317.56540, 221.44200, 0.00000, 0.00000, 359.24191); + CreateObject(3585, 194.62199, 328.59891, 221.44200, 0.00000, 0.00000, 359.24741); + CreateObject(3585, 164.44400, 339.98199, 221.44200, 0.00000, 0.00000, 359.24741); + CreateObject(3585, 194.48511, 346.40189, 221.44200, 0.00000, 0.00000, 179.24190); + CreateObject(3585, 157.62981, 358.38760, 221.46700, 0.00000, 0.00000, 179.23640); + CreateObject(3564, 198.94920, 357.28220, 221.39799, 0.00000, 0.00000, 357.98950); + CreateObject(3564, 163.43840, 351.31149, 221.45799, 0.00000, 0.00000, 177.98950); + CreateObject(3564, 179.71989, 335.84201, 221.55791, 0.00000, 0.00000, 357.98950); + CreateObject(3015, 171.81290, 331.65790, 219.92700, 0.00000, 0.00000, 0.00000); + CreateObject(3015, 171.83780, 332.82599, 219.92700, 0.00000, 0.00000, 0.00000); + CreateObject(3013, 172.43401, 332.22089, 220.07491, 0.00000, 0.00000, 0.00000); + CreateObject(2969, 171.31590, 332.19391, 220.02789, 0.00000, 0.00000, 260.50000); + CreateObject(964, 159.31290, 325.50400, 220.66100, 0.00000, 0.00000, 274.00000); + CreateObject(3013, 158.37981, 324.74591, 220.80791, 0.00000, 0.00000, 316.00000); + CreateObject(930, 166.58200, 340.63190, 221.13690, 0.00000, 0.00000, 0.00000); + CreateObject(930, 190.72990, 343.69391, 220.19400, 0.00000, 0.00000, 0.00000); + CreateObject(1431, 175.12790, 354.77789, 220.47690, 0.00000, 0.00000, 0.00000); + CreateObject(2359, 175.69991, 353.28290, 220.17400, 0.00000, 0.00000, 0.00000); + CreateObject(2359, 175.10690, 355.64291, 220.13989, 0.00000, 0.00000, 0.00000); + CreateObject(1229, 193.08099, 320.88400, 221.27789, 0.00000, 0.00000, 273.99899); + CreateObject(1233, 155.11880, 354.79391, 221.28790, 0.00000, 0.00000, 90.00000); + CreateObject(1234, 166.41690, 331.98090, 221.30400, 0.00000, 0.00000, 0.00000); + CreateObject(1320, 164.56200, 321.81201, 221.22099, 0.00000, 0.00000, 0.00000); + CreateObject(1321, 200.26089, 331.86490, 221.20300, 0.00000, 0.00000, 180.00000); + CreateObject(1322, 194.88980, 353.84698, 221.20300, 0.00000, 0.00000, 180.00000); + CreateObject(1323, 158.37590, 344.39001, 221.22000, 0.00000, 0.00000, 0.00000); + CreateObject(1444, 152.09689, 297.51590, 220.82491, 0.00000, 0.00000, 88.75000); + CreateObject(2665, 151.82201, 299.42889, 224.03391, 0.00000, 0.00000, 87.50000); + CreateObject(2685, 201.98090, 298.70700, 221.73190, 0.00000, 0.00000, 269.50000); + CreateObject(2789, 171.61200, 309.20700, 223.74890, 0.00000, 0.00000, 0.00000); + CreateObject(2790, 182.71770, 308.81830, 223.77090, 0.00000, 0.00000, 0.00000); + CreateObject(7306, 210.71800, 341.31989, 234.66200, 0.00000, 0.00000, 313.98920); + CreateObject(7307, 146.73090, 344.83099, 234.51489, 0.00000, 0.00000, 44.00000); + CreateObject(2773, 159.71091, 382.64789, 224.33791, 0.00000, 0.00000, 358.25000); + CreateObject(2773, 176.44141, 382.27139, 224.33791, 0.00000, 0.00000, 0.00000); + CreateObject(2773, 181.46381, 381.96280, 224.34390, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 187.20599, 381.73630, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 192.23730, 381.49210, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 198.11130, 381.39349, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 203.12010, 381.22260, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 170.48430, 382.31339, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 165.49510, 382.41891, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(2773, 154.72411, 382.91791, 224.33791, 0.00000, 0.00000, 358.24759); + CreateObject(3666, 179.64890, 310.52899, 220.57001, 0.00000, 0.00000, 0.00000); + CreateObject(3666, 174.64200, 310.64590, 220.57001, 0.00000, 0.00000, 0.00000); + CreateObject(2984, 151.22800, 311.78290, 221.40100, 0.00000, 0.00000, 0.00000); + CreateObject(2961, 174.74091, 309.09698, 221.35400, 0.00000, 0.00000, 0.00000); + CreateObject(2942, 201.85001, 303.61490, 220.66991, 0.00000, 0.00000, 267.25000); + CreateObject(2942, 201.83000, 302.61401, 220.66991, 0.00000, 0.00000, 267.24789); + CreateObject(2942, 201.78580, 301.61401, 220.66991, 0.00000, 0.00000, 267.24789); + CreateObject(1572, 196.91209, 294.58301, 220.59700, 0.00000, 0.00000, 40.00000); + CreateObject(1572, 188.36011, 294.33801, 220.59100, 0.00000, 0.00000, 319.99570); + CreateObject(1572, 157.79289, 308.10989, 220.59700, 0.00000, 0.00000, 239.99139); + CreateObject(1572, 158.79880, 293.82999, 220.59100, 0.00000, 0.00000, 19.98960); + CreateObject(1572, 163.22990, 308.28690, 220.59700, 0.00000, 0.00000, 169.99139); + CreateObject(1572, 187.01390, 306.79001, 220.59700, 0.00000, 0.00000, 239.99139); + CreateObject(1572, 160.79900, 322.10199, 220.30791, 0.00000, 0.00000, 209.99080); + CreateObject(1572, 199.41890, 321.40329, 220.28700, 0.00000, 0.00000, 49.98770); + CreateObject(1572, 185.46091, 331.77631, 220.43491, 0.00000, 0.00000, 209.98900); + CreateObject(1572, 154.28900, 343.41101, 220.30000, 0.00000, 0.00000, 269.98709); + CreateObject(1572, 155.02530, 333.00000, 220.30791, 0.00000, 0.00000, 209.98711); + CreateObject(1572, 155.66991, 365.35590, 220.60190, 0.00000, 0.00000, 269.98349); + CreateObject(1572, 173.65520, 343.52631, 220.50000, 0.00000, 0.00000, 269.98349); + CreateObject(1572, 181.46190, 354.61301, 220.49200, 0.00000, 0.00000, 69.98350); + CreateObject(1572, 181.46190, 354.61319, 220.49200, 0.00000, 0.00000, 69.98290); + CreateObject(1572, 196.56810, 332.30289, 220.28900, 0.00000, 0.00000, 299.98770); + CreateObject(1572, 201.70700, 353.75580, 220.28900, 0.00000, 0.00000, 119.98160); + CreateObject(638, 169.60690, 343.58389, 220.46700, 0.00000, 0.00000, 88.00000); + CreateObject(638, 187.59081, 331.73431, 220.41499, 0.00000, 0.00000, 87.99490); + CreateObject(638, 187.69530, 343.07031, 220.43800, 0.00000, 0.00000, 87.99490); + CreateObject(638, 169.09200, 332.31790, 220.45799, 0.00000, 0.00000, 87.99490); + CreateObject(17114, 231.79581, 472.66690, 280.99289, 0.00000, 0.00000, 338.00000); + CreateObject(17114, 57.48090, 393.60300, 291.35291, 0.00000, 0.00000, 69.99980); + CreateObject(17114, 160.88181, 219.84470, 303.13290, 0.00000, 0.00000, 169.99690); + CreateObject(17114, 290.01849, 278.27139, 303.13290, 0.00000, 0.00000, 247.99429); + CreateObject(1235, 155.23090, 400.38589, 224.33000, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 197.37100, 327.90601, 221.06700, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 191.90331, 345.87979, 221.06700, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 195.00700, 318.24689, 221.06700, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 167.04190, 339.34201, 221.06700, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 154.34860, 326.08490, 221.06700, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 185.35590, 331.84299, 225.30890, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 205.10300, 342.54291, 225.20889, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 151.94090, 332.86899, 225.30890, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 171.09959, 343.78320, 225.20889, 0.00000, 0.00000, 0.00000); + CreateObject(7392, 131.21410, 343.86490, 242.51300, 0.00000, 0.00000, 0.00000); + CreateObject(7073, 224.10300, 334.49091, 251.66290, 0.00000, 0.00000, 0.00000); + CreateObject(1256, 193.75090, 301.70490, 220.67990, 0.00000, 0.00000, 268.00000); + CreateObject(1256, 183.07690, 302.10400, 220.67990, 0.00000, 0.00000, 267.99490); + CreateObject(1256, 188.33000, 301.93790, 220.67990, 0.00000, 0.00000, 267.99490); + CreateObject(1256, 166.38110, 302.67001, 220.67990, 0.00000, 0.00000, 267.99490); + CreateObject(1256, 171.61490, 302.53000, 220.67990, 0.00000, 0.00000, 267.99490); + CreateObject(1256, 161.25700, 302.88400, 220.67990, 0.00000, 0.00000, 267.99490); + CreateObject(1256, 182.95500, 297.73199, 220.67990, 0.00000, 0.00000, 87.99490); + CreateObject(1360, 171.53900, 300.31100, 220.79190, 0.00000, 0.00000, 267.50000); + CreateObject(1360, 188.25900, 299.90601, 220.79190, 0.00000, 0.00000, 267.49509); + CreateObject(1360, 193.68500, 299.67700, 220.79190, 0.00000, 0.00000, 267.49509); + CreateObject(1256, 188.29390, 297.57990, 220.67990, 0.00000, 0.00000, 87.98950); + CreateObject(1256, 193.67599, 297.46100, 220.67990, 0.00000, 0.00000, 87.98950); + CreateObject(1361, 180.00391, 308.34799, 220.76401, 0.00000, 0.00000, 0.00000); + CreateObject(1361, 174.03999, 308.39401, 220.76401, 0.00000, 0.00000, 0.00000); + CreateObject(1360, 182.95799, 299.98529, 220.79190, 0.00000, 0.00000, 267.49509); + CreateObject(1256, 171.35690, 298.16190, 220.67990, 0.00000, 0.00000, 87.99490); + CreateObject(1360, 166.36301, 300.52789, 220.79190, 0.00000, 0.00000, 267.49509); + CreateObject(1256, 166.25999, 298.35699, 220.67990, 0.00000, 0.00000, 87.98950); + CreateObject(1360, 161.22900, 300.66599, 220.79190, 0.00000, 0.00000, 267.49509); + CreateObject(1256, 161.27490, 298.53891, 220.67990, 0.00000, 0.00000, 87.98950); + CreateObject(16779, 163.65691, 300.01401, 228.43201, 0.00000, 0.00000, 0.00000); + CreateObject(16779, 177.30811, 299.65790, 228.43201, 0.00000, 0.00000, 0.00000); + CreateObject(16779, 190.10001, 299.32800, 228.43201, 0.00000, 0.00000, 0.00000); + CreateObject(1359, 173.32910, 300.20889, 220.71890, 0.00000, 0.00000, 0.00000); + CreateObject(1359, 195.64400, 299.61401, 220.71890, 0.00000, 0.00000, 0.00000); + CreateObject(1359, 181.14110, 300.00089, 220.71890, 0.00000, 0.00000, 0.00000); + CreateObject(1359, 159.39500, 300.68100, 220.71890, 0.00000, 0.00000, 0.00000); + CreateObject(1291, 160.57001, 292.44989, 220.50999, 0.00000, 0.00000, 179.50000); + CreateObject(1291, 171.03580, 292.04889, 220.45990, 0.00000, 0.00000, 179.49460); + CreateObject(1291, 192.72701, 291.32990, 220.50999, 0.00000, 0.00000, 179.49460); + CreateObject(1291, 182.01900, 291.76001, 220.48500, 0.00000, 0.00000, 179.49460); + CreateObject(2670, 161.20990, 304.00690, 220.09390, 0.00000, 0.00000, 30.00000); + CreateObject(2670, 192.76559, 293.83099, 220.11189, 0.00000, 0.00000, 0.00000); + CreateObject(2670, 188.64990, 302.88501, 220.11900, 0.00000, 0.00000, 147.99690); + CreateObject(2671, 171.95799, 307.60590, 220.02699, 0.00000, 0.00000, 0.00000); + CreateObject(2674, 165.76089, 296.78290, 220.04190, 0.00000, 0.00000, 330.00000); + CreateObject(2670, 180.71091, 298.92789, 220.11189, 0.00000, 0.00000, 0.00000); + CreateObject(19325, 199.70410, 308.75089, 227.16499, 0.00000, 0.00000, 88.00000); + CreateObject(19325, 176.64990, 309.58099, 224.72900, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 187.96091, 309.18890, 227.25290, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 187.96091, 309.18939, 223.12790, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 176.64990, 309.58099, 228.85400, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 166.82201, 309.94891, 223.12790, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 166.82100, 309.94891, 227.25290, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 155.90401, 310.33890, 223.12790, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 155.90300, 310.33990, 227.25290, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 155.90230, 310.34079, 227.25290, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 199.70410, 308.75089, 223.03999, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 179.48380, 402.56100, 228.60500, 0.00000, 0.00000, 87.99490); + CreateObject(19325, 179.48380, 402.56100, 232.73000, 0.00000, 0.00000, 87.99490); + CreateObject(1525, 190.59000, 328.54001, 221.79800, 0.00000, 0.00000, 0.00000); + CreateObject(1526, 201.48900, 355.89999, 221.82401, 0.00000, 0.00000, 88.00000); + CreateObject(1527, 195.51390, 316.30389, 221.77400, 0.00000, 0.00000, 89.50000); + CreateObject(1528, 196.91080, 347.66690, 221.80299, 0.00000, 0.00000, 269.25000); + CreateObject(1530, 159.39110, 351.43790, 221.84790, 0.00000, 0.00000, 358.25000); + CreateObject(1531, 160.05099, 359.66290, 221.91600, 0.00000, 0.00000, 269.50000); + CreateObject(1526, 162.08200, 338.71970, 221.78391, 0.00000, 0.00000, 89.49460); + CreateObject(2714, 177.63300, 313.42389, 222.55890, 0.00000, 0.00000, 178.75000); + CreateObject(13831, 175.48090, 414.57889, 259.08389, 0.00000, 0.00000, 0.00000); + CreateObject(2775, 176.97900, 309.14691, 223.44290, 0.00000, 0.00000, 0.00000); + CreateObject(16776, 224.45410, 353.15399, 233.10190, 0.00000, 0.00000, 0.00000); + CreateObject(16778, 176.97800, 306.61990, 228.64490, 0.00000, 0.00000, 266.00000); + CreateObject(9833, 177.43179, 386.83990, 236.04800, 0.00000, 0.00000, 8.00000); + CreateObject(2780, 177.11490, 303.22900, 231.15100, 0.00000, 0.00000, 0.00000); + CreateObject(2690, 152.03999, 307.65790, 221.78700, 0.00000, 0.00000, 270.00000); + CreateObject(2690, 201.40421, 368.75391, 224.02991, 0.00000, 0.00000, 0.00000); + CreateObject(2690, 184.70799, 369.52631, 224.07800, 0.00000, 0.00000, 0.00000); + CreateObject(2690, 167.67770, 370.24020, 224.00900, 0.00000, 0.00000, 0.00000); + CreateObject(3350, 168.10490, 375.95990, 228.62390, 0.00000, 0.00000, 0.00000); + CreateObject(3350, 187.74699, 375.19791, 228.62390, 0.00000, 0.00000, 0.00000); + CreateObject(3350, 162.77190, 344.01901, 224.65289, 0.00000, 0.00000, 179.25000); + CreateObject(3350, 202.08200, 374.61230, 228.62390, 0.00000, 0.00000, 0.00000); + CreateObject(3350, 178.59000, 343.44601, 224.65289, 0.00000, 0.00000, 179.24741); + CreateObject(3350, 198.15080, 342.70990, 224.65289, 0.00000, 0.00000, 179.24741); + CreateObject(3350, 197.20500, 331.30499, 224.70300, 0.00000, 0.00000, 358.49741); + CreateObject(3350, 178.01610, 332.00690, 224.70300, 0.00000, 0.00000, 358.49481); + CreateObject(3350, 159.19600, 332.57599, 224.70300, 0.00000, 0.00000, 358.49481); + CreateObject(2712, 173.92081, 291.85901, 220.58990, 0.00000, 0.00000, 260.00000); + CreateObject(11245, 182.55490, 311.19290, 229.37390, 0.00000, 0.00000, 68.00000); + CreateObject(11245, 172.08299, 311.36090, 229.37390, 0.00000, 0.00000, 107.99990); + CreateObject(955, 193.18159, 308.04980, 220.40199, 0.00000, 0.00000, 0.00000); + return 1; +} \ No newline at end of file diff --git a/src/Application/Maps/Files/cs_train.ini b/src/Application/Maps/Files/cs_train.ini new file mode 100644 index 0000000..edc7cb7 --- /dev/null +++ b/src/Application/Maps/Files/cs_train.ini @@ -0,0 +1,29 @@ +[AlphaTeamLocations] +162.1316,389.5034,224.8203,180.8277 +173.2011,388.8099,224.8203,182.7077 +184.1211,388.8022,224.8269,180.5144 +195.3332,388.0174,224.8203,180.8277 +195.4957,398.1380,224.8269,176.4409 +187.8033,398.4112,224.8269,177.0676 +181.2552,398.6656,224.8203,177.3809 +174.5689,398.5701,224.8269,177.6943 +168.3547,399.1626,224.8269,177.6943 +160.0609,398.9536,224.8203,198.0611 + +[BetaTeamLocations] +195.3405,294.2137,221.0268,357.8867 +186.4849,294.3228,221.0202,358.8266 +179.4173,294.8835,221.0202,358.8266 +171.9456,295.4364,221.0202,358.8266 +163.7477,296.3074,221.0202,358.8266 +157.9138,296.0314,221.0202,358.8266 +158.0709,303.6998,221.0202,358.8266 +164.1997,305.4629,221.0268,358.8266 +171.3388,304.5282,221.0268,355.3799 +192.5048,303.2542,221.0268,11.3600 + +[RedFlagLocation] +178.8353,382.9575,224.8203 + +[BlueFlagLocation] +177.3801,310.3964,221.0567 \ No newline at end of file From def9eaa8cf28a5ec3efe069620b41e5bd958ab8e Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:00:33 -0500 Subject: [PATCH 10/15] feat: add new map (cs_opposition) with integrated objects (#309) --- filterscripts/cs_opposition.amx | Bin 0 -> 8773 bytes filterscripts/cs_opposition.pwn | 130 +++++++++++++++++++ src/Application/Maps/Files/cs_opposition.ini | 29 +++++ 3 files changed, 159 insertions(+) create mode 100644 filterscripts/cs_opposition.amx create mode 100644 filterscripts/cs_opposition.pwn create mode 100644 src/Application/Maps/Files/cs_opposition.ini diff --git a/filterscripts/cs_opposition.amx b/filterscripts/cs_opposition.amx new file mode 100644 index 0000000000000000000000000000000000000000..b20cada81b5b9466e564817e1f7baa11b59e004c GIT binary patch literal 8773 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 M%CpQAKJA770RoRz;{X5v literal 0 HcmV?d00001 diff --git a/filterscripts/cs_opposition.pwn b/filterscripts/cs_opposition.pwn new file mode 100644 index 0000000..8ca8350 --- /dev/null +++ b/filterscripts/cs_opposition.pwn @@ -0,0 +1,130 @@ +#include +#define FILTER_SCRIPT_NAME "cs_opposition" +#include "objects" + +public OnFilterScriptInit() +{ + CreateObject(16409, 500.89999, -1010.79999, 295.29999, 0.00000, 0.00000, 0.00000); + CreateObject(1660, 441.89999, -1021.20001, 294.39999, 0.00000, 0.00000, 270.00000); + CreateObject(6052, 478.29999, -1003.79999, 297.89999, 0.00000, 0.00000, 279.98657); + CreateObject(13648, 438.39941, -1008.79980, 293.20001, 0.00000, 0.00000, 0.00000); + CreateObject(3445, 472.59961, -1000.59961, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 464.59961, -1000.59961, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 472.59961, -1018.00000, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 464.59961, -1018.00000, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 456.09961, -1018.00000, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 456.09961, -1000.59961, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 447.60001, -1000.59998, 292.60001, 0.00000, 338.59863, 0.00000); + CreateObject(3445, 447.60001, -1018.00000, 292.60001, 0.00000, 338.59863, 0.00000); + CreateObject(3445, 439.60001, -1018.00000, 292.60001, 0.00000, 338.59863, 0.00000); + CreateObject(3445, 439.59961, -1000.59961, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(7033, 429.79980, -1004.19922, 291.29999, 333.88550, 0.00000, 270.00000); + CreateObject(7033, 429.79999, -1030.19995, 291.29999, 333.89539, 0.00000, 270.00000); + CreateObject(7033, 423.09961, -1012.09961, 291.29999, 333.98987, 0.00000, 270.00000); + CreateObject(7033, 423.10001, -985.59998, 291.29999, 333.99536, 0.00000, 270.00000); + CreateObject(7033, 416.39941, -1004.19922, 291.29999, 333.89099, 0.00000, 270.00000); + CreateObject(7033, 416.39999, -1030.69995, 291.29999, 333.89539, 0.00000, 270.00000); + CreateObject(7033, 409.70001, -1012.09998, 291.29999, 333.89532, 0.00000, 270.00000); + CreateObject(7033, 409.70001, -985.59998, 291.29999, 333.89539, 0.00000, 270.00000); + CreateObject(7033, 403.00000, -1004.20001, 291.29999, 333.89099, 0.00000, 270.00000); + CreateObject(16409, 376.09961, -1006.79980, 295.29999, 0.00000, 0.00000, 179.99451); + CreateObject(6052, 395.69922, -1012.89941, 297.79999, 0.00000, 0.00000, 99.99207); + CreateObject(7033, 403.09961, -1030.69922, 291.29999, 333.88550, 0.00000, 270.24719); + CreateObject(1660, 418.39999, -995.00000, 294.39999, 0.00000, 0.00000, 90.00000); + CreateObject(16010, 388.60001, -1033.59998, 299.50000, 90.00000, 0.00000, 179.74731); + CreateObject(16010, 440.39999, -1033.69995, 299.50000, 90.00000, 0.00000, 179.99451); + CreateObject(16010, 462.29980, -982.69922, 299.50000, 90.00000, 0.00000, 359.98352); + CreateObject(16010, 410.09961, -982.69922, 299.50000, 90.00000, 179.99451, 179.97253); + CreateObject(10826, 310.59961, -999.50000, 300.39999, 0.00000, 0.00000, 0.00000); + CreateObject(10826, 567.29999, -1005.50000, 300.50000, 0.00000, 0.00000, 179.99451); + CreateObject(10826, 310.50000, -1012.19922, 300.50000, 0.00000, 0.00000, 0.00000); + CreateObject(10826, 567.20001, -1018.09998, 300.50000, 0.00000, 0.00000, 179.99451); + CreateObject(1660, 453.70001, -994.40002, 294.39999, 0.00000, 0.00000, 90.00000); + CreateObject(1660, 404.10001, -1021.50000, 294.39999, 0.00000, 0.00000, 270.00000); + CreateObject(11472, 505.60001, -1009.50000, 293.89999, 0.00000, 0.00000, 0.00000); + CreateObject(3261, 448.50000, -1021.00000, 298.70001, 0.00000, 0.00000, 270.00000); + CreateObject(3261, 408.89999, -995.20001, 298.79999, 0.00000, 0.00000, 270.00000); + CreateObject(3261, 444.09961, -994.69922, 298.89999, 0.00000, 0.00000, 270.00000); + CreateObject(3261, 410.50000, -1021.29999, 298.70001, 0.00000, 0.00000, 270.00000); + CreateObject(1225, 416.60001, -991.90002, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 449.39999, -1024.40002, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 380.39999, -1024.50000, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 444.39999, -1024.50000, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 463.89999, -992.09998, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 495.79999, -1023.70001, 295.89999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 406.70001, -1024.50000, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 415.29999, -1017.70001, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 449.60001, -1017.59998, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 483.89999, -1020.90002, 303.50000, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 442.50000, -997.79999, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(2780, 445.79999, -994.40002, 295.50000, 0.00000, 0.00000, 0.00000); + CreateObject(2780, 450.20001, -1020.90002, 295.50000, 0.00000, 0.00000, 0.00000); + CreateObject(2780, 412.00000, -1021.29999, 295.39999, 0.00000, 0.00000, 0.00000); + CreateObject(2780, 410.60001, -995.00000, 295.50000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 484.70001, -1019.70001, 295.39999, 0.00000, 0.00000, 358.00000); + CreateObject(7033, 396.29999, -1012.59998, 291.29999, 333.88550, 0.00000, 270.24719); + CreateObject(7033, 396.20001, -986.70001, 291.29999, 333.88550, 0.00000, 269.99719); + CreateObject(7033, 389.59961, -1004.19922, 291.29999, 333.88550, 0.00000, 270.48889); + CreateObject(7033, 389.79999, -1030.19995, 291.29999, 333.88550, 0.00000, 270.49438); + CreateObject(7033, 382.79999, -999.20001, 291.29999, 333.88550, 0.00000, 270.49438); + CreateObject(7033, 383.00000, -1025.09998, 291.29999, 333.88550, 0.00000, 270.49438); + CreateObject(13648, 431.39999, -1005.59998, 293.00000, 0.00000, 0.00000, 180.00000); + CreateObject(1225, 434.60001, -1022.20001, 292.29999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 434.60001, -991.79999, 292.29999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 434.59961, -1017.09961, 292.39999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 434.69922, -1009.59961, 292.39999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 434.39941, -1000.50000, 292.39999, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 390.50000, -995.90002, 295.39999, 0.00000, 0.00000, 270.00000); + CreateObject(1225, 381.59961, -992.09961, 295.79999, 0.00000, 0.00000, 0.00000); + CreateObject(1225, 389.50000, -994.89941, 303.50000, 0.00000, 0.00000, 0.00000); + CreateObject(8154, 416.39941, -1003.19922, 320.50000, 0.00000, 0.00000, 269.99451); + CreateObject(8154, 461.89999, -1013.09998, 320.60001, 0.00000, 0.00000, 89.99451); + CreateObject(11472, 371.39999, -1008.09998, 294.10001, 0.00000, 0.00000, 180.25000); + CreateObject(5056, 384.10001, -1005.79999, 299.20001, 0.00000, 300.00000, 0.00000); + CreateObject(5056, 493.00000, -1011.79999, 299.29999, 0.00000, 299.99268, 179.99451); + CreateObject(2909, 502.20001, -1011.79999, 302.10001, 0.00000, 0.00000, 0.00000); + CreateObject(2909, 375.60001, -1005.90002, 302.20001, 0.00000, 0.00000, 0.00000); + CreateObject(3502, 460.09961, -1020.50000, 314.10001, 0.00000, 0.00000, 90.00000); + CreateObject(3502, 397.60001, -995.90002, 314.10001, 0.00000, 0.00000, 270.00000); + CreateObject(8154, 476.50000, -988.29999, 320.60001, 0.00000, 0.00000, 0.00000); + CreateObject(8154, 401.39999, -1028.09998, 320.60001, 0.00000, 0.00000, 180.00000); + CreateObject(3502, 406.10001, -995.90002, 314.10001, 0.00000, 0.00000, 270.00000); + CreateObject(3502, 414.60001, -995.90002, 314.10001, 0.00000, 0.00000, 270.00000); + CreateObject(3502, 423.10001, -995.90002, 314.10001, 0.00000, 0.00000, 270.00000); + CreateObject(16645, 428.60001, -1002.70001, 312.60001, 0.00000, 0.00000, 90.00000); + CreateObject(16645, 429.29999, -1017.50000, 312.60001, 0.00000, 0.00000, 270.00000); + CreateObject(16645, 431.79999, -1017.79999, 312.60001, 0.00000, 0.00000, 270.00000); + CreateObject(16645, 434.39999, -1017.70001, 312.60001, 0.00000, 0.00000, 270.00000); + CreateObject(16645, 436.89999, -1017.70001, 312.60001, 0.00000, 0.00000, 270.00000); + CreateObject(3502, 451.00000, -1020.50000, 314.10001, 0.00000, 0.00000, 90.00000); + CreateObject(3502, 442.39999, -1020.50000, 314.10001, 0.00000, 0.00000, 90.00000); + CreateObject(16645, 433.70001, -1002.70001, 312.60001, 0.00000, 0.00000, 90.00000); + CreateObject(16645, 431.20001, -1002.70001, 312.60001, 0.00000, 0.00000, 90.00000); + CreateObject(16645, 436.29999, -1002.70001, 312.60001, 0.00000, 0.00000, 90.00000); + CreateObject(13011, 432.70001, -1023.79999, 314.00000, 0.00000, 0.00000, 271.74731); + CreateObject(13011, 433.79980, -992.69922, 314.29999, 0.00000, 0.00000, 89.74731); + CreateObject(923, 436.00000, -996.50000, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 433.89999, -1001.09998, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 429.70001, -998.50000, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 430.50000, -1004.09998, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 436.29999, -1005.40002, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 430.39999, -1016.00000, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 433.10001, -1013.50000, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 435.89999, -1017.00000, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(923, 429.50000, -1019.90002, 313.50000, 0.00000, 0.00000, 0.00000); + CreateObject(2991, 429.89999, -1009.00000, 313.10001, 0.00000, 0.00000, 0.00000); + CreateObject(2991, 435.89999, -1009.00000, 313.10001, 0.00000, 0.00000, 0.00000); + CreateObject(3445, 481.10001, -989.50000, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 489.70001, -989.40002, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 489.70001, -1024.40002, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 481.20001, -1024.40002, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 489.70001, -1006.90002, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 481.10001, -1006.90002, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(16010, 493.20001, -1033.69995, 299.50000, 90.00000, 0.00000, 179.99451); + CreateObject(16010, 499.79999, -982.70001, 299.50000, 90.00000, 0.00000, 359.98352); + CreateObject(3502, 469.20001, -1020.50000, 314.10001, 0.00000, 0.00000, 90.00000); + CreateObject(3502, 478.10001, -1020.50000, 314.10001, 0.00000, 0.00000, 90.00000); + CreateObject(3445, 493.39999, -998.70001, 292.60001, 0.00000, 338.59314, 0.00000); + CreateObject(3445, 494.70001, -1027.90002, 292.60001, 0.00000, 338.59314, 0.00000); + return 1; +} \ No newline at end of file diff --git a/src/Application/Maps/Files/cs_opposition.ini b/src/Application/Maps/Files/cs_opposition.ini new file mode 100644 index 0000000..5f58b5c --- /dev/null +++ b/src/Application/Maps/Files/cs_opposition.ini @@ -0,0 +1,29 @@ +[AlphaTeamLocations] +494.2592,-993.1752,296.4408,88.9877 +493.9672,-998.0331,296.4297,86.7943 +492.8661,-1003.9078,296.4174,87.7343 +491.3204,-1017.4899,296.4001,92.1210 +485.8677,-1020.7223,312.4781,79.8540 +479.0522,-1012.5952,296.4619,91.1343 +478.4160,-1008.0851,296.4548,93.0143 +478.0932,-1002.7944,296.4512,93.3276 +483.2748,-1000.2612,296.4063,95.5210 +487.2763,-997.0790,296.4588,109.6211 + +[BetaTeamLocations] +381.6761,-1023.3847,296.3539,272.6353 +383.9510,-1015.0923,296.3559,278.2753 +383.1362,-996.0195,296.3553,221.5615 +388.6155,-995.0250,312.4781,223.3946 +397.9606,-1003.5080,296.3565,271.9853 +398.5331,-1008.8009,296.3506,271.9853 +394.5486,-1014.4089,296.3535,271.9853 +388.4528,-1016.2011,296.3539,277.9386 +386.6037,-1021.7629,296.3523,300.8122 +395.3244,-994.1252,296.3542,236.5783 + +[RedFlagLocation] +502.3857,-1011.4183,296.3312 + +[BlueFlagLocation] +375.0225,-1005.9839,296.3312 \ No newline at end of file From 6da90da77c209fccabd6af7c924c8255c007bd4a Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:32:40 -0500 Subject: [PATCH 11/15] feat: add new map (fy_iceworld) with better objects (#310) --- filterscripts/fy_iceworld.amx | Bin 3852 -> 10374 bytes filterscripts/fy_iceworld.pwn | 231 ++++++++++++++------- src/Application/Maps/Files/fy_iceworld.ini | 47 ++--- 3 files changed, 175 insertions(+), 103 deletions(-) diff --git a/filterscripts/fy_iceworld.amx b/filterscripts/fy_iceworld.amx index 157ff895626206580a8ceb6b1f968c3968b917d9..f7e6b8de1c42cbc0c90cd9935a29bf0af91f153c 100644 GIT binary patch literal 10374 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 YFL==Kg)=*o?$Qk;tSFv})J4D#bCT}s=Om(hj( zaUYcOt1VkV1c7Q?GM2GqI5qJPP4o}R+#k!fMu&z!h$i~i;*XdtS+?l8?>$)i+PnGp zve&$K?tAZi&iCGP?(Kb+JVLhq5(G05h~GrWKYI!B@58g3kbm*0A%wKz*@x#mp6Bpf zV{P=kgqAViq5TH!23mI9(hRwyTLIs(;~CxV(=F&$)NQ41Ytfp~|Db-~igp(v_CBR? z%fn}@$5|fkyoPMzdWnGz3oz30FqTuoFxIz>$HsrX`!?!+c<&9&|Gh6>gr!3%)gQ&$ z$P8uEEUo<5WgVTnw4b5tPZ&@SjM_6$Eo174QRns?zcCA{g^$!L_kRu0Ds# zOPf}#_U92VR=X=jdb|(D>(m*LvFuphSH90fc;+fDnZ)T&YYgy&2or=4UtT?+D%awe z|G4p_5%$A`gAYf3Zg_z5WHn3*d|2!DZ1MzC{$-Crc`^u-O?+7EHV>YvgDEQ?*0MdD zbY{(Vl)zLQA71&2Ele)#fM_8fzWh=C1K^kd(GEVWWt%tVSQEsG`LNdQrA@4JmKhee zLadh$Yu)Be&v+Ze%lNR?ZB;qT44W>5xQ7pGlY|R*z;rnu)|8iT?ajI{P8Gwn%!f5) zF5C;J*h;HR-wCx{L|fDA7f)cV=jqEVT3f6|r$p>|j5NBI1N8SC&1<(wG?&M=%Gp;e^-wqMrV Date: Thu, 23 Jan 2025 13:02:01 -0500 Subject: [PATCH 12/15] feat: add new map (de_dust2x5) with integrated objects (#311) --- filterscripts/de_dust2x5.amx | Bin 0 -> 20939 bytes filterscripts/de_dust2x5.pwn | 363 ++++++++++++++++++ src/Application/Maps/Files/de_dust2x5.ini | 29 ++ .../Maps/MapCollectionTests.cs | 1 + 4 files changed, 393 insertions(+) create mode 100644 filterscripts/de_dust2x5.amx create mode 100644 filterscripts/de_dust2x5.pwn create mode 100644 src/Application/Maps/Files/de_dust2x5.ini diff --git a/filterscripts/de_dust2x5.amx b/filterscripts/de_dust2x5.amx new file mode 100644 index 0000000000000000000000000000000000000000..a1f615e5de16f7de7631112e9ea4e837b873a717 GIT binary patch literal 20939 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 F{{Zio+8Y1> literal 0 HcmV?d00001 diff --git a/filterscripts/de_dust2x5.pwn b/filterscripts/de_dust2x5.pwn new file mode 100644 index 0000000..cd3f125 --- /dev/null +++ b/filterscripts/de_dust2x5.pwn @@ -0,0 +1,363 @@ +#include +#define FILTER_SCRIPT_NAME "de_dust2x5" +#include "objects" + +public OnFilterScriptInit() +{ + CreateObject(16684, -1.09180, 2221.45996, 228.89101, 0.00000, 0.00000, 179.71436); + CreateObject(16684, -81.06348, 2171.57617, 232.34000, 359.59351, 0.00000, 179.71436); + CreateObject(16684, 175.67200, 2227.19604, 190.87601, 359.09998, 17.00000, 0.00000); + CreateObject(16684, -45.41211, 2136.61133, 232.34000, 0.00000, 0.00000, 179.71436); + CreateObject(16684, 216.80176, 2145.16992, 228.78999, 359.59351, 0.00000, 0.19775); + CreateObject(16684, 289.21484, 2091.90918, 228.64101, 0.00000, 0.00000, 359.70886); + CreateObject(16684, 218.08887, 2173.40234, 228.89101, 0.00000, 0.00000, 359.70886); + CreateObject(16684, 10.75391, 2088.23047, 196.86600, 359.29688, 12.99683, 179.99451); + CreateObject(16684, 275.55078, 2224.49902, 189.94099, 359.29138, 15.99060, 359.74731); + CreateObject(16684, 72.99023, 2059.55664, 197.49200, 0.00000, 12.99683, 269.69238); + CreateObject(16684, 51.75488, 2233.75684, 225.61501, 0.00000, 0.00000, 89.71436); + CreateObject(16684, -100.29300, 2223.28906, 232.19991, 0.00000, 0.00000, 179.99451); + CreateObject(16684, 27.89844, 2220.53711, 223.26601, 0.00000, 0.00000, 179.71436); + CreateObject(16684, 172.70215, 2091.94727, 223.30099, 0.00000, 0.00000, 359.70886); + CreateObject(7191, 126.19100, 2116.47412, 228.13699, 0.00000, 0.00000, 270.00000); + CreateObject(16010, 83.13281, 2181.65820, 224.37199, 0.00000, 270.00000, 0.00000); + CreateObject(16010, 54.45996, 2225.72852, 237.59700, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 111.85300, 2226.14600, 237.59700, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 146.67676, 2230.85254, 237.59700, 0.00000, 269.98901, 90.24719); + CreateObject(16010, 172.11914, 2204.89941, 237.59700, 0.00000, 270.00000, 0.00000); + CreateObject(16010, 103.75400, 2195.38403, 224.37199, 0.00000, 269.98901, 270.00000); + CreateObject(16010, 116.69238, 2183.64258, 224.37199, 0.00000, 269.98901, 179.99451); + CreateObject(16010, 136.00781, 2166.69336, 224.37199, 0.00000, 269.98901, 270.00000); + CreateObject(16010, 84.09375, 2230.48633, 237.59700, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 98.39160, 2170.09961, 224.37000, 0.00000, 270.00000, 90.00000); + CreateObject(16010, 124.93700, 2144.10889, 224.37199, 0.00000, 270.00000, 0.00000); + CreateObject(16010, 141.45313, 2132.51953, 224.37199, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 170.87500, 2149.52441, 224.37199, 0.00000, 269.98901, 179.99451); + CreateObject(16010, 158.23340, 2166.69141, 224.36501, 0.00000, 269.98901, 270.00000); + CreateObject(16010, 184.82324, 2193.32715, 237.59700, 0.00000, 270.00000, 90.00000); + CreateObject(16010, 206.59961, 2185.22461, 237.59700, 0.00000, 269.98901, 0.00000); + CreateObject(16010, 226.17101, 2148.35498, 237.59700, 0.00000, 269.98901, 0.00000); + CreateObject(16010, 24.77400, 2206.10889, 237.59700, 0.00000, 269.98901, 179.99451); + CreateObject(16010, 30.80400, 2172.97192, 237.59700, 0.00000, 269.98901, 179.99451); + CreateObject(16010, 51.41504, 2146.51660, 237.59700, 0.00000, 269.98901, 270.00000); + CreateObject(16010, 87.51660, 2146.52051, 237.59700, 0.00000, 269.98901, 270.00000); + CreateObject(16010, 158.78320, 2132.57227, 224.37199, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 101.52539, 2134.56250, 237.62199, 0.00000, 270.00000, 179.99451); + CreateObject(16010, 101.52100, 2104.52808, 237.62199, 0.00000, 270.00000, 179.99451); + CreateObject(16010, 127.02539, 2098.10449, 237.62199, 0.00000, 270.00000, 269.98901); + CreateObject(16010, 163.35742, 2098.08789, 237.62199, 0.00000, 270.00000, 269.98901); + CreateObject(16010, 199.70313, 2098.08398, 237.62199, 0.00000, 270.00000, 269.98901); + CreateObject(16010, 226.20996, 2112.21680, 237.62199, 0.00000, 270.00000, 0.00000); + CreateObject(7191, 125.47852, 2116.18555, 228.13699, 0.00000, 0.00000, 90.00000); + CreateObject(7191, 125.47900, 2116.18604, 224.18700, 0.00000, 0.00000, 90.00000); + CreateObject(7191, 162.07401, 2197.94092, 228.36900, 0.00000, 0.00000, 90.00000); + CreateObject(7191, 67.63500, 2142.94189, 227.47900, 0.00000, 0.00000, 342.74597); + CreateObject(7191, 162.07001, 2198.13989, 224.44400, 0.00000, 0.00000, 270.00000); + CreateObject(7191, 162.07031, 2198.13965, 228.36900, 0.00000, 0.00000, 270.00000); + CreateObject(14394, 134.20410, 2216.52246, 229.39799, 0.00000, 0.00000, 89.99451); + CreateObject(14394, 96.77100, 2157.83105, 231.42000, 0.00000, 0.00000, 179.99451); + CreateObject(7191, 82.04590, 2164.49121, 231.45399, 0.00000, 0.00000, 269.74182); + CreateObject(7191, 59.93262, 2176.69336, 230.22900, 0.00000, 0.00000, 179.74731); + CreateObject(7191, 59.93262, 2176.69336, 226.30400, 0.00000, 0.00000, 179.74731); + CreateObject(16010, 219.78900, 2173.49805, 237.59700, 0.00000, 269.98901, 90.00000); + CreateObject(16684, 229.45300, 2260.45898, 196.24600, 0.00000, 15.50000, 89.95703); + CreateObject(16684, 234.65039, 1983.57910, 234.24001, 0.00000, 0.00000, 270.20874); + CreateObject(7191, 37.68652, 2199.38379, 230.45399, 0.00000, 0.00000, 269.74182); + CreateObject(7191, 205.62100, 2121.52588, 228.82899, 0.00000, 0.00000, 0.49731); + CreateObject(7191, 205.67999, 2114.78589, 230.55499, 0.00000, 0.00000, 0.49438); + CreateObject(7191, 205.73828, 2109.45703, 232.20500, 0.00000, 0.00000, 0.49438); + CreateObject(7191, 205.80469, 2102.48145, 233.80499, 0.00000, 0.00000, 0.49438); + CreateObject(7191, 55.76200, 2162.60791, 229.52901, 0.00000, 270.00000, 270.00000); + CreateObject(7191, 55.76100, 2158.76294, 229.52901, 0.00000, 269.99451, 270.00000); + CreateObject(7191, 55.66400, 2154.87305, 229.52901, 0.00000, 269.99451, 270.00000); + CreateObject(7191, 81.33800, 2164.25610, 231.45399, 0.00000, 0.00000, 89.74731); + CreateObject(7191, 151.82100, 2217.46606, 225.24400, 0.00000, 0.00000, 90.00000); + CreateObject(16008, 324.31601, 2513.07007, 26.66300, 0.00000, 0.00000, 0.99976); + CreateObject(6514, 167.83887, 2188.31543, 230.52200, 0.00000, 0.00000, 83.99597); + CreateObject(7191, 174.31500, 2186.55591, 232.56400, 10.59998, 269.00000, 178.24219); + CreateObject(7191, 174.53799, 2186.52808, 234.38901, 8.60001, 270.00000, 358.23669); + CreateObject(7191, 169.02901, 2186.16504, 235.08900, 10.59631, 270.00000, 359.98669); + CreateObject(7191, 168.67500, 2187.23096, 232.51401, 8.59680, 270.00000, 180.23669); + CreateObject(7191, 170.62700, 2186.26904, 234.63901, 8.59680, 279.00000, 358.23669); + CreateObject(7191, 172.57001, 2187.03491, 232.61400, 8.59680, 272.00000, 180.23621); + CreateObject(7191, 166.74023, 2186.27539, 238.29401, 0.00000, 0.00000, 359.24194); + CreateObject(7191, 166.89700, 2196.71411, 240.89400, 0.00000, 0.00000, 359.24744); + CreateObject(7191, 176.19727, 2174.11133, 237.96899, 0.00000, 0.00000, 179.24744); + CreateObject(7191, 176.14799, 2174.09912, 240.89400, 0.00000, 0.00000, 179.24744); + CreateObject(7191, 168.84399, 2196.70801, 242.79401, 0.00000, 90.00000, 179.24744); + CreateObject(7191, 174.51900, 2196.62207, 242.76900, 0.00000, 90.00000, 359.24194); + CreateObject(7191, 171.52200, 2196.47607, 242.79401, 0.00000, 90.00000, 359.24194); + CreateObject(16010, 18.95500, 2225.79004, 237.59700, 0.00000, 269.98901, 90.00000); + CreateObject(16010, 94.71484, 2195.29688, 224.37199, 0.00000, 269.98901, 270.00000); + CreateObject(7191, 160.81200, 2217.74390, 229.19400, 0.00000, 0.00000, 270.00000); + CreateObject(7191, 160.11230, 2217.46582, 229.19400, 0.00000, 0.00000, 90.00000); + CreateObject(8674, 59.91895, 2169.43359, 232.00800, 0.00000, 0.00000, 270.00000); + CreateObject(944, 50.49300, 2198.53589, 233.34300, 0.00000, 0.00000, 0.00000); + CreateObject(923, 82.50195, 2160.82031, 234.58800, 0.00000, 0.00000, 0.00000); + CreateObject(710, 75.57500, 2220.46899, 244.39200, 0.00000, 0.00000, 0.00000); + CreateObject(8674, 54.91992, 2199.31348, 232.04800, 0.00000, 0.00000, 0.00000); + CreateObject(8674, 59.97300, 2179.76489, 232.00800, 0.00000, 0.00000, 269.49463); + CreateObject(8674, 60.01100, 2190.11206, 232.03300, 0.00000, 0.00000, 269.99451); + CreateObject(8674, 60.03223, 2194.16211, 232.03300, 0.00000, 0.00000, 269.98901); + CreateObject(8674, 46.09473, 2199.36426, 232.04800, 0.00000, 0.00000, 359.24194); + CreateObject(944, 58.53400, 2195.17212, 233.33701, 0.00000, 0.00000, 89.75000); + CreateObject(944, 57.20215, 2194.00781, 233.33701, 0.00000, 0.00000, 89.74731); + CreateObject(944, 58.62200, 2192.27588, 233.33701, 0.00000, 0.00000, 89.74731); + CreateObject(944, 58.50000, 2193.70410, 234.78300, 0.00000, 0.00000, 89.74731); + CreateObject(944, 57.66406, 2200.26758, 229.98000, 0.00000, 0.00000, 0.00000); + CreateObject(710, 110.72168, 2196.67969, 247.62100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 99.97700, 2173.33594, 247.62100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 85.18164, 2186.45215, 244.12100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 129.52499, 2155.74292, 247.87100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 137.17599, 2137.69092, 251.37100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 162.91299, 2154.27100, 249.62100, 0.00000, 0.00000, 0.00000); + CreateObject(710, 215.99707, 2162.93750, 241.65500, 0.00000, 0.00000, 0.00000); + CreateObject(710, 244.84700, 2131.40308, 261.79099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 193.14600, 2085.73999, 261.54099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 140.72301, 2096.13306, 262.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 98.08300, 2127.14600, 262.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 8.33900, 2197.71997, 259.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 26.09000, 2238.24512, 260.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 135.74300, 2237.25488, 260.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 176.32600, 2214.90503, 263.29099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 68.08600, 2143.40796, 261.29099, 0.00000, 0.00000, 0.00000); + CreateObject(988, 166.77800, 2181.14111, 229.52200, 0.00000, 0.00000, 271.99951); + CreateObject(988, 176.21201, 2178.88989, 229.34700, 0.00000, 0.00000, 88.24951); + CreateObject(2048, 166.47600, 2179.40991, 234.89999, 0.00000, 0.00000, 269.25000); + CreateObject(2047, 176.48500, 2180.72510, 234.84599, 0.00000, 0.00000, 89.00000); + CreateObject(11245, 75.14453, 2202.83789, 240.48199, 0.00000, 352.99622, 147.99683); + CreateObject(11245, 75.31900, 2162.61206, 240.62000, 0.00000, 352.99622, 241.99683); + CreateObject(944, 111.58203, 2129.07910, 229.69901, 0.00000, 0.00000, 179.74731); + CreateObject(923, 160.06799, 2188.59302, 231.32300, 0.00000, 0.00000, 179.99451); + CreateObject(944, 82.66504, 2160.72852, 233.14700, 0.00000, 0.00000, 179.74731); + CreateObject(944, 115.79100, 2159.12500, 229.69000, 0.00000, 0.00000, 89.74731); + CreateObject(944, 113.61328, 2160.96777, 229.69200, 0.00000, 0.00000, 179.74731); + CreateObject(710, 211.95996, 2181.93750, 257.04099, 0.00000, 0.00000, 0.00000); + CreateObject(944, 168.95300, 2184.15601, 229.81000, 0.00000, 0.00000, 359.75000); + CreateObject(944, 162.04201, 2188.57007, 229.88300, 0.00000, 0.00000, 359.74731); + CreateObject(710, 126.44531, 2176.42773, 244.26700, 0.00000, 0.00000, 57.99683); + CreateObject(944, 115.07100, 2160.11011, 231.09200, 0.00000, 0.00000, 137.74728); + CreateObject(923, 110.97700, 2129.15088, 231.11501, 0.00000, 0.00000, 0.00000); + CreateObject(944, 115.72168, 2143.03711, 229.60100, 0.00000, 0.00000, 89.74731); + CreateObject(944, 114.69922, 2114.58496, 224.41400, 0.00000, 0.00000, 269.74182); + CreateObject(3066, 209.15820, 2163.14746, 229.84300, 0.00000, 0.00000, 87.99500); + CreateObject(944, 114.69900, 2114.58496, 225.83900, 0.00000, 0.00000, 89.74182); + CreateObject(931, 216.66699, 2158.54395, 229.86700, 0.00000, 0.00000, 270.00000); + CreateObject(1431, 169.02299, 2184.24194, 230.91901, 0.00000, 0.00000, 0.00000); + CreateObject(2359, 206.55273, 2114.31055, 234.37199, 0.00000, 0.00000, 69.99390); + CreateObject(1431, 114.79004, 2114.63379, 226.94800, 0.00000, 0.00000, 90.00000); + CreateObject(2358, 206.54492, 2112.59180, 235.37601, 0.00000, 0.00000, 90.00000); + CreateObject(2042, 206.53000, 2111.03711, 234.23399, 0.00000, 0.00000, 0.00000); + CreateObject(2041, 207.11301, 2112.23291, 234.36700, 0.00000, 0.00000, 160.00000); + CreateObject(16601, 181.74300, 2163.68311, 233.58600, 0.00000, 0.00000, 0.00000); + CreateObject(11444, 183.28400, 2145.01001, 228.67999, 0.00000, 0.00000, 89.99451); + CreateObject(11440, 196.14258, 2122.39063, 228.26500, 0.00000, 0.00000, 179.99451); + CreateObject(944, 186.54500, 2141.13208, 229.61600, 0.00000, 0.00000, 269.74182); + CreateObject(944, 186.62199, 2148.98608, 229.69000, 0.00000, 0.00000, 269.74182); + CreateObject(1431, 206.49707, 2112.54590, 234.70200, 0.00000, 0.00000, 90.00000); + CreateObject(1431, 194.42578, 2114.37305, 234.89200, 0.00000, 0.00000, 90.00000); + CreateObject(1431, 186.84500, 2141.34302, 230.72501, 0.00000, 0.00000, 90.00000); + CreateObject(1431, 73.08500, 2165.58691, 227.52299, 0.00000, 0.00000, 0.00000); + CreateObject(6514, 175.04395, 2171.76172, 230.34700, 0.00000, 0.00000, 263.49060); + CreateObject(710, 203.46289, 2125.38672, 244.37900, 0.00000, 0.00000, 49.99878); + CreateObject(3066, 126.39355, 2188.20410, 230.03799, 0.00000, 0.00000, 357.98950); + CreateObject(944, 174.07715, 2175.84961, 229.69000, 0.00000, 0.00000, 359.74731); + CreateObject(944, 159.17000, 2188.58398, 229.88200, 0.00000, 0.00000, 179.74731); + CreateObject(923, 50.48926, 2198.41504, 234.78400, 0.00000, 0.00000, 179.99451); + CreateObject(1431, 163.30600, 2220.62500, 230.76401, 0.00000, 0.00000, 270.00000); + CreateObject(710, 41.33700, 2157.09790, 247.83099, 0.00000, 0.00000, 0.00000); + CreateObject(710, 14.73400, 2164.23901, 269.57101, 0.00000, 0.00000, 0.00000); + CreateObject(11245, 124.15300, 2202.87109, 240.56100, 0.00000, 352.99622, 60.49683); + CreateObject(11245, 177.97200, 2124.74805, 239.47200, 0.00000, 352.99072, 328.49622); + CreateObject(11245, 198.77299, 2165.64697, 242.06100, 0.00000, 352.98523, 242.49573); + CreateObject(11245, 117.17400, 2124.71899, 241.07201, 0.00000, 352.98523, 248.49121); + CreateObject(3066, 86.24900, 2220.58594, 229.85899, 0.00000, 0.00000, 269.98950); + CreateObject(3066, 40.65039, 2164.79102, 233.31599, 0.00000, 0.00000, 180.48889); + CreateObject(944, 61.43900, 2167.69092, 226.41400, 0.00000, 0.00000, 359.74731); + CreateObject(944, 73.19400, 2165.32593, 226.41400, 0.00000, 0.00000, 359.74731); + CreateObject(944, 61.44500, 2167.71509, 227.83900, 0.00000, 0.00000, 179.74731); + CreateObject(1431, 58.53027, 2198.81836, 233.00800, 0.00000, 0.00000, 0.00000); + CreateObject(2359, 71.48145, 2165.28906, 225.73900, 0.00000, 0.00000, 265.99548); + CreateObject(2358, 63.30762, 2167.52539, 225.64600, 0.00000, 0.00000, 90.00000); + CreateObject(2358, 62.02100, 2167.37500, 228.51700, 0.00000, 0.00000, 0.00000); + CreateObject(14394, 101.22200, 2158.23511, 228.22000, 0.00000, 0.00000, 179.99451); + CreateObject(14394, 98.99609, 2158.15527, 229.82001, 0.00000, 0.00000, 179.99451); + CreateObject(7017, 165.82324, 2218.58887, 230.15500, 270.00000, 0.00000, 0.00000); + CreateObject(2960, 140.98599, 2217.58594, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 145.56100, 2217.58496, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 150.14700, 2217.58521, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 154.72200, 2217.58496, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 159.32800, 2217.58594, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 163.92900, 2217.58521, 231.10899, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 142.16400, 2198.02588, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 146.76401, 2198.02588, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 151.36501, 2198.02490, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 145.31700, 2116.29810, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 160.56599, 2198.02588, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 165.16600, 2198.02515, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 155.96387, 2198.02441, 230.28400, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 62.18500, 2164.45996, 233.37601, 0.00000, 0.00000, 359.75000); + CreateObject(2960, 66.76200, 2164.43506, 233.37601, 0.00000, 0.00000, 359.75000); + CreateObject(2960, 71.38000, 2164.41089, 233.37601, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 136.16600, 2116.29712, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 140.74121, 2116.28711, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 131.58501, 2116.28906, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 127.01000, 2116.30493, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 122.41000, 2116.29590, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 117.80500, 2116.28809, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(2960, 113.21400, 2116.27808, 230.05200, 0.00000, 0.00000, 0.00000); + CreateObject(1411, 72.97600, 2164.25391, 234.86900, 0.00000, 0.00000, 180.00000); + CreateObject(1411, 67.76900, 2164.26294, 234.86900, 0.00000, 0.00000, 179.99451); + CreateObject(1411, 62.57400, 2164.25195, 234.86900, 0.00000, 0.00000, 179.99451); + CreateObject(1411, 90.80200, 2217.21094, 230.44000, 0.00000, 0.00000, 358.74451); + CreateObject(1411, 158.09700, 2198.28394, 231.91901, 0.00000, 0.00000, 359.98962); + CreateObject(1411, 75.39355, 2216.62207, 230.42599, 0.00000, 0.00000, 357.48962); + CreateObject(1411, 152.94501, 2198.29395, 231.91901, 0.00000, 0.00000, 359.98901); + CreateObject(1411, 147.76500, 2198.27905, 231.91901, 0.00000, 0.00000, 359.98901); + CreateObject(1411, 142.58299, 2198.28491, 231.91901, 0.00000, 0.00000, 359.98901); + CreateObject(1411, 163.25900, 2198.26807, 231.91901, 0.00000, 0.00000, 359.98901); + CreateObject(1411, 141.34200, 2217.38599, 232.79401, 0.00000, 0.00000, 179.98901); + CreateObject(1411, 146.51700, 2217.38501, 232.79401, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 151.71700, 2217.38403, 232.79401, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 156.89200, 2217.38306, 232.79401, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 162.06700, 2217.38208, 232.79401, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 194.53101, 2167.42700, 230.46300, 0.00000, 0.00000, 359.98901); + CreateObject(1411, 131.18848, 2177.80469, 230.28600, 0.00000, 0.00000, 89.98901); + CreateObject(1411, 215.11523, 2155.04199, 230.41400, 0.00000, 0.00000, 359.97803); + CreateObject(1411, 113.60700, 2116.14795, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1459, 138.36700, 2211.46802, 229.61600, 0.00000, 0.00000, 276.25000); + CreateObject(1459, 149.22461, 2111.60840, 229.40700, 0.00000, 0.00000, 106.24878); + CreateObject(1411, 41.82700, 2172.26709, 233.87199, 0.00000, 0.00000, 179.99451); + CreateObject(1411, 45.07700, 2157.55591, 233.87199, 0.00000, 0.00000, 88.99451); + CreateObject(1411, 118.77600, 2116.12500, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 123.97000, 2116.10205, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 144.95399, 2116.06592, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 139.73599, 2116.05908, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 134.51801, 2116.05396, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1411, 129.23801, 2116.08911, 231.73700, 0.00000, 0.00000, 179.98352); + CreateObject(1446, 181.60352, 2136.55957, 229.57001, 0.00000, 0.00000, 0.00000); + CreateObject(1446, 186.25400, 2136.56006, 229.57100, 0.00000, 0.00000, 0.00000); + CreateObject(3920, 176.16800, 2179.82593, 235.61501, 0.00000, 0.00000, 269.00000); + CreateObject(3920, 166.73700, 2180.13696, 235.76500, 0.00000, 0.00000, 88.99475); + CreateObject(3920, 53.31700, 2199.23511, 231.48500, 0.00000, 0.00000, 359.73926); + CreateObject(3920, 78.15300, 2164.39111, 232.40500, 0.00000, 0.00000, 358.98914); + CreateObject(3920, 66.55762, 2164.48145, 232.40500, 0.00000, 0.00000, 359.48914); + CreateObject(3920, 59.89800, 2192.48608, 231.25999, 0.00000, 0.00000, 269.73633); + CreateObject(3920, 205.81738, 2118.16699, 234.71800, 0.00000, 0.00000, 90.47791); + CreateObject(3920, 59.81700, 2167.12402, 231.16000, 0.00000, 0.00000, 269.98083); + CreateObject(3920, 59.83789, 2179.79199, 231.25999, 0.00000, 0.00000, 269.73083); + CreateObject(3920, 205.88901, 2105.51489, 234.71800, 0.00000, 0.00000, 90.47791); + CreateObject(3920, 144.74200, 2217.56812, 230.14600, 0.00000, 0.00000, 179.97791); + CreateObject(3920, 157.30099, 2217.51807, 230.14600, 0.00000, 0.00000, 179.97253); + CreateObject(3920, 146.29900, 2198.00000, 229.34599, 0.00000, 0.00000, 0.22253); + CreateObject(3920, 158.95500, 2198.00293, 229.34599, 0.00000, 0.00000, 0.21973); + CreateObject(1459, 138.81100, 2204.55005, 229.61600, 0.00000, 0.00000, 266.24573); + CreateObject(701, 174.73100, 2112.37988, 229.41800, 0.00000, 0.00000, 0.00000); + CreateObject(701, 54.34200, 2173.44702, 232.70300, 0.00000, 0.00000, 0.00000); + CreateObject(759, 180.93401, 2141.39404, 228.67999, 0.00000, 0.00000, 0.00000); + CreateObject(760, 204.92500, 2107.22510, 228.68800, 0.00000, 0.00000, 0.00000); + CreateObject(761, 217.08099, 2161.74194, 228.80499, 0.00000, 0.00000, 0.00000); + CreateObject(761, 214.87199, 2163.54004, 228.80499, 0.00000, 0.00000, 354.00000); + CreateObject(801, 196.84300, 2183.38696, 228.55200, 0.00000, 0.00000, 0.00000); + CreateObject(809, 126.63600, 2178.70898, 227.97701, 0.00000, 0.00000, 0.00000); + CreateObject(809, 128.76401, 2176.35303, 228.20200, 0.00000, 0.00000, 321.00000); + CreateObject(810, 91.75800, 2219.05396, 228.80499, 0.00000, 0.00000, 290.00000); + CreateObject(864, 77.76000, 2220.65503, 228.67900, 0.00000, 0.00000, 0.00000); + CreateObject(866, 191.64400, 2116.38306, 228.86099, 0.00000, 0.00000, 338.50000); + CreateObject(866, 42.93848, 2156.40820, 232.36400, 0.00000, 0.00000, 0.00000); + CreateObject(866, 110.80859, 2118.08203, 228.89700, 0.00000, 0.00000, 338.49976); + CreateObject(864, 180.18700, 2148.68701, 228.80499, 0.00000, 0.00000, 90.00000); + CreateObject(866, 162.39200, 2196.12207, 229.04800, 0.00000, 0.00000, 270.00000); + CreateObject(859, 111.51300, 2204.30908, 229.03700, 0.00000, 0.00000, 0.00000); + CreateObject(859, 116.09200, 2127.30200, 228.82700, 0.00000, 0.00000, 300.00000); + CreateObject(859, 78.00781, 2204.21484, 229.01700, 0.00000, 0.00000, 0.00000); + CreateObject(859, 94.97949, 2217.23535, 228.83099, 0.00000, 0.00000, 299.99817); + CreateObject(859, 95.42383, 2161.21289, 232.21201, 0.00000, 0.00000, 299.99817); + CreateObject(944, 34.04300, 2194.47607, 233.30499, 0.00000, 0.00000, 89.74731); + CreateObject(923, 35.82520, 2193.53906, 233.29401, 0.00000, 0.00000, 179.99451); + CreateObject(866, 131.50800, 2217.97607, 228.37000, 0.00000, 0.00000, 337.75000); + CreateObject(866, 136.74300, 2217.49902, 228.37000, 0.00000, 0.00000, 337.74719); + CreateObject(3058, 135.12500, 2217.37988, 227.32201, 180.00000, 0.00000, 335.00000); + CreateObject(3058, 132.67900, 2217.42798, 227.32201, 179.99451, 0.00000, 334.99512); + CreateObject(761, 74.13300, 2198.04199, 228.98900, 0.00000, 0.00000, 190.00000); + CreateObject(944, 34.69000, 2216.46509, 233.09500, 0.00000, 0.00000, 357.74731); + CreateObject(944, 34.68900, 2216.46509, 234.54500, 0.00000, 0.00000, 357.74231); + CreateObject(923, 34.77400, 2216.45508, 235.98599, 0.00000, 0.00000, 179.99451); + CreateObject(1299, 159.99100, 2215.75098, 223.67400, 0.00000, 0.00000, 0.00000); + CreateObject(1299, 160.60400, 2199.98096, 223.94400, 0.00000, 0.00000, 182.25000); + CreateObject(1558, 140.53300, 2197.28101, 229.70200, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 179.95100, 2161.31812, 229.39200, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 181.04800, 2161.36792, 229.39200, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 180.32201, 2161.35498, 230.41701, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 181.61600, 2161.36499, 230.41701, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 182.09399, 2161.44897, 229.39200, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 194.93600, 2184.42993, 229.52100, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 182.11301, 2108.08301, 229.34200, 0.00000, 0.00000, 180.00000); + CreateObject(1558, 181.05200, 2108.08398, 229.34200, 0.00000, 0.00000, 0.00000); + CreateObject(1558, 181.05800, 2109.19702, 229.34200, 0.00000, 0.00000, 270.00000); + CreateObject(1558, 182.06900, 2109.20093, 229.34200, 0.00000, 0.00000, 180.00000); + CreateObject(1558, 181.57700, 2108.66602, 230.36700, 0.00000, 0.00000, 200.00000); + CreateObject(1558, 115.58200, 2107.21411, 223.98300, 0.00000, 0.00000, 199.99512); + CreateObject(1558, 93.38900, 2155.59399, 232.82800, 0.00000, 0.00000, 179.99512); + CreateObject(1558, 115.58008, 2107.21387, 225.00800, 0.00000, 0.00000, 159.99390); + CreateObject(1558, 93.38900, 2155.59399, 233.85300, 0.00000, 0.00000, 179.99451); + CreateObject(1558, 93.38900, 2155.59399, 234.87801, 0.00000, 0.00000, 179.99451); + CreateObject(1558, 92.28800, 2155.56909, 232.85400, 0.00000, 0.00000, 269.99451); + CreateObject(1558, 92.28700, 2155.56812, 233.90401, 0.00000, 0.00000, 269.98901); + CreateObject(1449, 143.41901, 2222.24805, 230.97501, 0.00000, 0.00000, 0.00000); + CreateObject(1448, 138.90199, 2220.85205, 230.52000, 0.00000, 0.00000, 320.00000); + CreateObject(1219, 140.29800, 2218.14111, 231.54100, 0.00000, 80.00000, 90.00000); + CreateObject(1219, 150.51601, 2220.46289, 230.14101, 0.00000, 0.00000, 330.00000); + CreateObject(1219, 143.94099, 2218.08203, 231.54100, 0.00000, 79.99695, 86.25000); + CreateObject(1449, 155.40500, 2222.12988, 230.97501, 0.00000, 0.00000, 0.00000); + CreateObject(1448, 158.98801, 2219.86011, 230.52000, 0.00000, 0.00000, 319.99878); + CreateObject(1219, 147.95500, 2218.14600, 231.54100, 0.00000, 79.99146, 86.24817); + CreateObject(1219, 154.01900, 2218.13794, 231.54100, 0.00000, 79.99146, 92.24817); + CreateObject(1219, 160.91000, 2218.12109, 231.54100, 0.00000, 79.99146, 92.24670); + CreateObject(960, 159.34801, 2196.25610, 229.50301, 0.00000, 0.00000, 40.00000); + CreateObject(960, 129.90500, 2179.70703, 229.24001, 0.00000, 0.00000, 320.00000); + CreateObject(1450, 125.73700, 2181.64893, 229.49001, 0.00000, 0.00000, 100.00000); + CreateObject(2359, 174.00900, 2175.92505, 230.46100, 0.00000, 0.00000, 179.99390); + CreateObject(2358, 206.18945, 2115.21387, 234.27100, 0.00000, 0.00000, 90.00000); + CreateObject(2359, 62.38400, 2166.63208, 225.73900, 0.00000, 0.00000, 335.99548); + CreateObject(2359, 60.80900, 2166.59106, 225.73900, 0.00000, 0.00000, 25.99487); + CreateObject(3052, 72.62800, 2164.99194, 227.10100, 0.00000, 0.00000, 0.00000); + CreateObject(3015, 73.94300, 2164.90991, 226.97501, 0.00000, 0.00000, 0.00000); + CreateObject(3013, 206.33000, 2116.08691, 234.30901, 0.00000, 0.00000, 270.00000); + CreateObject(3013, 206.29500, 2116.46094, 234.30901, 0.00000, 0.00000, 270.00000); + CreateObject(3013, 206.30800, 2116.86401, 234.30901, 0.00000, 0.00000, 270.00000); + CreateObject(3013, 206.29800, 2116.71094, 234.55901, 0.00000, 0.00000, 270.00000); + CreateObject(3013, 206.29300, 2116.28394, 234.55901, 0.00000, 0.00000, 276.00000); + CreateObject(3013, 206.26900, 2116.50610, 234.80901, 0.00000, 0.00000, 275.99854); + CreateObject(3920, 205.73100, 2130.41699, 231.54300, 0.00000, 0.00000, 90.72791); + CreateObject(3920, 205.69400, 2125.15503, 233.14301, 0.00000, 0.00000, 90.72510); + CreateObject(3920, 205.62399, 2137.24609, 229.76801, 0.00000, 0.00000, 90.72510); + CreateObject(1411, 205.98199, 2106.39502, 237.27901, 0.00000, 0.00000, 270.22803); + CreateObject(1411, 205.77000, 2127.20508, 235.73100, 0.00000, 0.00000, 270.22522); + CreateObject(1411, 205.85001, 2116.74512, 237.27901, 0.00000, 0.00000, 270.22522); + CreateObject(1411, 205.92101, 2111.59692, 237.27901, 0.00000, 0.00000, 270.22522); + CreateObject(1411, 205.82715, 2121.97168, 237.27901, 0.00000, 0.00000, 270.22522); + CreateObject(1411, 205.71800, 2134.31909, 234.13100, 0.00000, 0.00000, 270.22522); + CreateObject(1411, 205.67400, 2139.56909, 232.30600, 0.00000, 0.00000, 270.22522); + CreateObject(3380, 138.93201, 2198.17212, 229.13100, 0.00000, 0.00000, 272.00000); + CreateObject(3380, 205.34766, 2143.90430, 228.57800, 0.00000, 0.00000, 205.99915); + CreateObject(3380, 148.89600, 2116.16211, 228.88901, 1.00000, 3.00000, 81.99951); + CreateObject(17969, 149.21100, 2222.39404, 232.14799, 0.00000, 0.00000, 90.00000); + CreateObject(17969, 187.53400, 2184.84692, 230.81799, 0.00000, 0.00000, 89.75000); + CreateObject(17969, 150.44600, 2124.06299, 230.94901, 0.00000, 0.00000, 89.74731); + CreateObject(17969, 89.21400, 2161.64502, 234.06400, 0.00000, 0.00000, 89.74731); + CreateObject(1530, 116.50600, 2138.03101, 230.90700, 0.00000, 0.00000, 0.00000); + CreateObject(1530, 205.63200, 2109.07007, 230.51100, 0.00000, 0.00000, 0.00000); + CreateObject(1530, 198.17101, 2174.82910, 230.37900, 0.00000, 0.00000, 0.00000); + CreateObject(1530, 163.68900, 2215.85205, 224.84300, 0.00000, 0.00000, 0.00000); + CreateObject(1529, 39.23200, 2158.34204, 234.27699, 0.00000, 0.00000, 180.00000); + CreateObject(1529, 125.12500, 2194.85645, 230.32401, 0.00000, 0.00000, 179.99451); + CreateObject(1529, 179.30469, 2138.56152, 230.16701, 0.00000, 0.00000, 179.99451); + CreateObject(1529, 109.95117, 2114.48438, 224.85201, 0.00000, 0.00000, 179.99451); + CreateObject(1528, 33.20400, 2214.61206, 234.22600, 0.00000, 0.00000, 180.00000); + CreateObject(1528, 109.95500, 2126.98804, 230.77299, 0.00000, 0.00000, 179.99451); + CreateObject(1528, 60.00100, 2170.04907, 226.98801, 0.00000, 0.00000, 179.99451); + CreateObject(1526, 214.81400, 2165.06909, 230.35699, 0.00000, 0.00000, 90.00000); + CreateObject(1526, 78.69727, 2222.05664, 230.62199, 0.00000, 0.00000, 90.00000); + CreateObject(1526, 173.51700, 2124.14111, 230.35699, 0.00000, 0.00000, 90.00000); + return 1; +} \ No newline at end of file diff --git a/src/Application/Maps/Files/de_dust2x5.ini b/src/Application/Maps/Files/de_dust2x5.ini new file mode 100644 index 0000000..9f233ed --- /dev/null +++ b/src/Application/Maps/Files/de_dust2x5.ini @@ -0,0 +1,29 @@ +[AlphaTeamLocations] +208.1651,2109.6702,235.1619,1.5434 +215.5830,2110.2866,235.1541,1.5434 +215.8488,2118.7754,235.1541,1.5434 +211.1721,2119.0425,235.1541,1.5434 +207.4113,2121.5613,235.1619,1.5434 +207.4892,2128.9709,233.9559,1.5434 +211.6707,2129.5022,233.7556,1.5434 +216.0851,2130.4431,233.4143,1.5434 +216.2942,2137.0154,231.5879,18.1502 +207.2452,2139.3225,231.0791,4.6768 + +[BetaTeamLocations] +62.1069,2158.1221,226.5291,2.5391 +66.9557,2158.7869,226.5291,2.5391 +71.7357,2159.6450,226.5291,2.5391 +70.8975,2165.8501,226.5291,2.5391 +66.6523,2166.0994,226.5291,2.5391 +64.1333,2167.6709,226.5291,2.5391 +62.0796,2172.3640,226.5291,2.5391 +67.3863,2173.6089,226.5291,2.5391 +72.4421,2174.4194,226.5291,2.5391 +69.6276,2180.9683,226.5291,2.5391 + +[RedFlagLocation] +191.6897,2115.4397,229.8633 + +[BlueFlagLocation] +53.2508,2195.2568,233.4346 \ No newline at end of file diff --git a/tests/Application.Tests/Maps/MapCollectionTests.cs b/tests/Application.Tests/Maps/MapCollectionTests.cs index 39f033b..f7e490b 100644 --- a/tests/Application.Tests/Maps/MapCollectionTests.cs +++ b/tests/Application.Tests/Maps/MapCollectionTests.cs @@ -20,6 +20,7 @@ public void GetAll_WhenAllMapsAreObtainedWithFindBy_ShouldReturnsEnumerable(stri "de_dust2x2", "de_dust2x3", "de_dust2x4", + "de_dust2x5", "de_dust5", "DesertGlory" ]; From 918ab574c40ba6d87d73a15e1ca2d4a362423367 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:46:35 -0500 Subject: [PATCH 13/15] feat: add new map (WarZone2) with integrated objects (#312) --- filterscripts/WarZone2.amx | Bin 0 -> 7358 bytes filterscripts/WarZone2.pwn | 103 ++++++++++++++++++++++++ src/Application/Maps/Files/WarZone2.ini | 35 ++++++++ 3 files changed, 138 insertions(+) create mode 100644 filterscripts/WarZone2.amx create mode 100644 filterscripts/WarZone2.pwn create mode 100644 src/Application/Maps/Files/WarZone2.ini diff --git a/filterscripts/WarZone2.amx b/filterscripts/WarZone2.amx new file mode 100644 index 0000000000000000000000000000000000000000..61b01db4a9115d60caccc4ae26e1e643f95cdfba GIT binary patch literal 7358 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 literal 0 HcmV?d00001 diff --git a/filterscripts/WarZone2.pwn b/filterscripts/WarZone2.pwn new file mode 100644 index 0000000..55e191c --- /dev/null +++ b/filterscripts/WarZone2.pwn @@ -0,0 +1,103 @@ +#include +#define FILTER_SCRIPT_NAME "WarZone2" +#include "objects" + +public OnFilterScriptInit() +{ + new objectId; + CreateObject(4865, 1968.80005, -3016.39990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(4866, 1954.40002, -2902.69995, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1871.50000, -2843.00000, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1901.00000, -2842.60010, 13.10000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1935.40002, -2842.10010, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1968.40002, -2842.69995, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2002.59998, -2842.69995, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2036.19995, -2842.39990, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2070.89990, -2842.60010, 12.80000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2093.89990, -2842.80005, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2045.30005, -3107.00000, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2072.89990, -3107.00000, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2106.60010, -3107.30005, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2014.00000, -3072.39990, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 2030.69995, -3088.19995, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2122.69995, -3092.80005, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2122.60010, -3058.60010, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2122.30005, -3026.39990, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2122.00000, -2995.00000, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2121.69995, -2964.80005, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2122.10010, -2944.39990, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1980.19995, -3072.00000, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1946.19995, -3071.69995, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1913.00000, -3071.19995, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1879.59998, -3071.10010, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(10828, 1868.00000, -3052.19995, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1868.00000, -3020.80005, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1868.09998, -2987.39990, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1868.30005, -2954.69995, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1868.80005, -2921.60010, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1869.40002, -2888.39990, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 1869.50000, -2860.39990, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2104.60010, -2860.69995, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2104.39990, -2893.69995, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2104.30005, -2916.00000, 12.90000, 0.00000, 0.00000, 90.00000); + CreateObject(10828, 2114.60010, -2929.19995, 12.90000, 0.00000, 0.00000, 0.00000); + CreateObject(8251, 2108.39990, -2978.10010, 4.50000, 0.00000, 0.00000, 180.00000); + CreateObject(8251, 1883.30005, -2976.30005, 4.50000, 0.00000, 0.00000, 1.00000); + CreateObject(4832, 1988.40002, -2883.39990, 30.30000, 0.00000, 0.00000, 0.00000); + CreateObject(3665, 1967.80005, -2975.69995, 2.60000, 0.00000, 0.00000, 90.00000); + CreateObject(3665, 1999.19995, -2895.10010, 2.60000, 0.00000, 0.00000, 90.00000); + CreateObject(3664, 2018.50000, -2886.69995, 8.70000, 0.00000, 0.00000, 90.00000); + CreateObject(2985, 1896.00000, -2965.80005, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(2985, 1896.59998, -2986.00000, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(2985, 2095.30005, -2988.60010, 0.60000, 0.00000, 0.00000, 180.00000); + CreateObject(2985, 2095.30005, -2968.19995, 0.60000, 0.00000, 0.00000, 179.99500); + CreateObject(3271, 1939.80005, -2921.10010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3271, 1971.90002, -3033.60010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3271, 2014.40002, -3014.60010, 0.60000, 0.00000, 0.00000, 0.00000); + objectId = CreateObject(3277, 1895.69995, -2975.80005, 0.60000, 0.00000, 0.00000, 0.00000); + SetObjectMaterial(objectId, 0, 10357, "tvtower_sfs", "ws_transmit_red", 0xFFFFFFFF); + objectId = CreateObject(3277, 2093.69995, -2977.39990, 0.60000, 0.00000, 0.00000, 0.00000); + SetObjectMaterial(objectId, 0, 6328, "sunset04_law2", "LAbluewall", 0xFFFFFFFF); + CreateObject(3279, 1900.80005, -2994.89990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 1896.50000, -2956.50000, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 1924.00000, -3049.50000, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 2009.69995, -2949.50000, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 2088.50000, -2958.39990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 2090.69995, -2997.00000, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 2085.00000, -3082.00000, 1.40000, 0.00000, 0.00000, 0.00000); + CreateObject(3396, 2117.80005, -2975.10010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(790, 1918.30005, -2879.89990, 1.70000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1897.50000, -2911.50000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1934.69995, -2892.80005, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1960.69995, -2927.19995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1990.69995, -3046.00000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1934.19995, -3042.30005, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1941.30005, -3041.19995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1901.09998, -3037.69995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1893.19995, -3045.69995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1879.90002, -3019.50000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 1896.90002, -2942.60010, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2041.30005, -2888.39990, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2051.50000, -2902.69995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2054.10010, -2924.50000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(3279, 1993.59998, -2870.60010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(3279, 1984.40002, -2878.39990, 15.50000, 0.00000, 0.00000, 0.00000); + CreateObject(790, 1960.50000, -2997.69995, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2068.39990, -3070.89990, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2078.50000, -3051.00000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2044.90002, -3058.30005, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(790, 2052.50000, -3055.00000, 0.60000, 0.00000, 0.00000, 156.06100); + CreateObject(11440, 1996.00000, -2931.19995, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11440, 2000.30005, -2981.10010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11440, 2030.19995, -2995.19995, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11440, 2045.09998, -3015.89990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11440, 1994.00000, -3062.39990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11443, -1303.59998, 2523.69995, 88.40000, 0.00000, 0.00000, 0.00000); + CreateObject(11556, 2095.50000, -2853.89990, 15.40000, 0.00000, 0.00000, 130.00101); + CreateObject(11442, 1994.09998, -3005.39990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11445, 2053.30005, -2938.80005, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11443, 2076.89990, -2941.89990, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11447, 2073.00000, -2923.60010, 0.60000, 0.00000, 0.00000, 0.00000); + CreateObject(11427, 2033.59998, -3052.19995, 7.80000, 0.00000, 0.00000, 0.00000); + return 1; +} \ No newline at end of file diff --git a/src/Application/Maps/Files/WarZone2.ini b/src/Application/Maps/Files/WarZone2.ini new file mode 100644 index 0000000..2fa9b54 --- /dev/null +++ b/src/Application/Maps/Files/WarZone2.ini @@ -0,0 +1,35 @@ +[AlphaTeamLocations] +1875.2153,-2986.2300,1.6000,269.7687 +1875.6656,-2979.9058,1.6000,269.7687 +1876.1486,-2972.1072,1.6000,269.7687 +1877.3230,-2967.0227,1.6000,269.7687 +1903.7302,-2951.9033,1.6000,273.5285 +1908.0061,-2991.0591,1.6000,272.9018 +1908.5123,-2998.5010,1.6000,272.9018 +1891.7294,-2997.5986,1.6000,306.4287 +1888.1062,-2959.7075,1.6000,248.4615 +1889.1442,-2976.0459,1.6000,274.4218 + +[BetaTeamLocations] +2116.3032,-2987.2896,1.6000,85.8642 +2116.3567,-2980.5825,1.6000,85.8642 +2114.6064,-2973.8179,1.6000,85.8642 +2114.5867,-2968.5134,1.6000,85.8642 +2086.7097,-3008.9888,1.6000,82.7309 +2086.7373,-2995.4021,1.6000,88.0576 +2081.9312,-2957.1003,1.6000,94.0111 +2099.7092,-2958.7798,1.6000,124.4048 +2100.0518,-2995.9136,1.6000,67.3776 +2101.9351,-2977.2610,1.6000,94.9512 + +[Weather] +50 + +[WorldTime] +0 + +[RedFlagLocation] +1895.9871,-2955.8083,17.6781 + +[BlueFlagLocation] +2089.0793,-2959.1411,17.6781 \ No newline at end of file From 5de8c0839aa061957a11d313672e2209bff5ebdf Mon Sep 17 00:00:00 2001 From: MrDave1999 Date: Thu, 23 Jan 2025 13:50:15 -0500 Subject: [PATCH 14/15] chore: update credits --- README.md | 2 +- .../GeneralCommands/Resources/DetailedCommandInfo.Designer.cs | 4 ++-- .../GeneralCommands/Resources/DetailedCommandInfo.resx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0679b39..227e2fd 100644 --- a/README.md +++ b/README.md @@ -314,7 +314,6 @@ See the [scripts](https://github.com/MrDave1999/Capture-The-Flag/tree/dev/script - Compound and cs_rockwar by Amirab. - DesertGlory, fy_iceworld2 and de_dust2x3 by TheYoungCapone. - EntryMap and TheConstruction by B4MB1[MC]. -- fy_iceworld by Sleyer. - fy_snow by UnuAlex. - fy_snow2 by mihaibr. - de_dust2 by JamesT85. @@ -324,6 +323,7 @@ See the [scripts](https://github.com/MrDave1999/Capture-The-Flag/tree/dev/script - de_dust2x2 by Amads. - de_dust2x4 textured by excamunicado. - WarZone by Samarchai. +- WarZone2 by iMaster. - cs_assault by Ghost-X. - GateToHell and TheWild by Zniper. - TheBunker by Dr.Pawno. diff --git a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.Designer.cs b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.Designer.cs index 58b1c0a..1538eb8 100644 --- a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.Designer.cs +++ b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.Designer.cs @@ -82,12 +82,12 @@ internal static string Admin { ///{Color1}Creator and programmer: {Color2}MrDave (Dave Roman) ///{Color1}Mappers:{Color2} ///DragonZafiro, Elorreli, amirab, JamesT85, - ///TheYoungCapone, B4MB1[MC], Sleyer, mihaibr, + ///TheYoungCapone, B4MB1[MC], iMaster, mihaibr, ///UnuAlex, SpikY_, Niktia_Ruchkov, Amads, ///Samarchai, haubitze, Ghost-X, Zniper, Dr.Pawno, ///SENiOR, saawan, Risq, Famous, Leo and Pyraeus. ///{Color1}Acknowledgments to:{Color2} - ///ikkent [rest of string was truncated]";. + ///ikken [rest of string was truncated]";. /// internal static string Credits { get { diff --git a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx index 876c424..aa8c3a9 100644 --- a/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx +++ b/src/Application/Players/GeneralCommands/Resources/DetailedCommandInfo.resx @@ -143,7 +143,7 @@ {Color1}Creator and programmer: {Color2}MrDave (Dave Roman) {Color1}Mappers:{Color2} DragonZafiro, Elorreli, amirab, JamesT85, -TheYoungCapone, B4MB1[MC], Sleyer, mihaibr, +TheYoungCapone, B4MB1[MC], iMaster, mihaibr, UnuAlex, SpikY_, Niktia_Ruchkov, Amads, Samarchai, haubitze, Ghost-X, Zniper, Dr.Pawno, SENiOR, saawan, Risq, Famous, Leo and Pyraeus. From 24f1da0eb42d5961937e5345ba1a57b864ec15e4 Mon Sep 17 00:00:00 2001 From: Dave Roman <43916038+MrDave1999@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:07:17 -0500 Subject: [PATCH 15/15] refactor: update the flag locations on the Area66 map (#313) --- src/Application/Maps/Files/Area66.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Application/Maps/Files/Area66.ini b/src/Application/Maps/Files/Area66.ini index 17dfc20..ad1f96d 100644 --- a/src/Application/Maps/Files/Area66.ini +++ b/src/Application/Maps/Files/Area66.ini @@ -23,7 +23,7 @@ 2319.0933,-3432.0413,9.5763,126.3212 [RedFlagLocation] -2248.9248,-3825.6113,14.4702 +2178.0320,-3850.8962,24.5733 [BlueFlagLocation] -2333.0566,-3496.5181,14.5427 \ No newline at end of file +2323.3853,-3451.6448,24.5733 \ No newline at end of file