Skip to content

Commit

Permalink
Merge pull request #314 from MrDave1999/dev
Browse files Browse the repository at this point in the history
9.6.0 Release
  • Loading branch information
MrDave1999 authored Jan 23, 2025
2 parents e985397 + 24f1da0 commit 6989733
Show file tree
Hide file tree
Showing 30 changed files with 1,371 additions and 111 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down
Binary file added filterscripts/WarZone2.amx
Binary file not shown.
103 changes: 103 additions & 0 deletions filterscripts/WarZone2.pwn
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#include <open.mp>
#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;
}
Binary file added filterscripts/cs_opposition.amx
Binary file not shown.
Loading

0 comments on commit 6989733

Please sign in to comment.