Merge branch 'dev'

# Conflicts: # ext/Shared/Registry/Registry.lua # mod.json
Joe91 · Jun 23, 2024 · a2cf550 · a2cf550
2 parents 3181f00 + 846713c
commit a2cf550
Show file tree

Hide file tree

Showing 50 changed files with 274,362 additions and 53,121 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -22,21 +22,33 @@ This is the changelog for the version V2.9 Don't forget to [join us on Discord](
 * Obstacels on XP4_quake get destroyed on level loaded (by tagener-noisu)
 * Obtion to not use jets was added (by tagener-noisu)
 * Bots can Revive Bots now #327
+* Separate update-function fro bots by Bree_Arnold
+* improve compatibility with Randomiser mod #333
+* Registryoptions for Revive-Probability added (by tanger-noisu)
+* fire-mode for burst-weapons was added (by tanger-noisu)
+* Option to disable defend-mode (by tanger-noisu)
+* Better handling for Light AA (by tanger-noisu)
+* Option for Bots to spawn in Gunship-Vehicle (by tanger-noisu)
 
 ### Bug fixes
 * Merged pull request #323 from tagener-noisu Path-Switcher fixes
 * Bots find best squad after team-switch again.
 * Aiming with the defib was fixed by Bree_Arnold
 * fixed wrong spawn-delay after revive of bots
+* Don't revive Bots, that were killed by the gamedirector (by tanger-noisu)
 
 ### New maps
 * Conquest Large MP_018 by ThyKingdomCome
 * Conquest Large MP_017 by ThyKingdomCome
 * Conquest Large XP3_Valley by ThyKingdomCome
+* Conquest Assault Small XP1_003 by ThyKindomeCome (redone)
 * XP4_FD Scavenger by Volbeat13
 * XP4_Parl Scavenger by Volbeat13
 * XP4_Quake Scavenger by Volbeat13
 * XP3_Shield TankSuperiority by Augusta
+* Conquest Large MP_003 by IgorUA
+* Conquest Large XP3_Desert by IgorUA
+* Conquest Large XP5_003 by IgorUA
 
 ### Updated maps
 * Conquest Small MP_001 by IgorUA
@@ -73,7 +85,10 @@ This is the changelog for the version V2.9 Don't forget to [join us on Discord](
 * TDM XP2_Palace by Clef_went away
 * TDM XP4_Quake by Clef_went away
 * TDM XP4_FD by Clef_went away
-
+* Assault Small XP1_002 by Clef_went away
+* SquadRush XP3_Valley by Clef_went away
+* Assault Small XP4_Rubble by Clef_went away
+* Many many more maps by IgorUA
 
 ### Documentation update
 
diff --git a/MapList.txt b/MapList.txt
@@ -11,6 +11,7 @@ XP1_001 ConquestAssaultSmall1 1
 XP1_003 ConquestAssaultSmall1 1
 XP1_004 ConquestAssaultSmall1 1
 MP_001 ConquestLarge0 1
+MP_003 ConquestLarge0 1
 MP_007 ConquestLarge0 1
 MP_011 ConquestLarge0 1
 MP_012 ConquestLarge0 1
@@ -20,13 +21,15 @@ MP_018 ConquestLarge0 1
 MP_Subway ConquestLarge0 1
 XP1_002 ConquestLarge0 1
 XP3_Alborz ConquestLarge0 1
+XP3_Desert ConquestLarge0 1
 XP3_Shield ConquestLarge0 1
 XP3_Valley ConquestLarge0 1
 XP4_FD ConquestLarge0 1
 XP4_Parl ConquestLarge0 1
 XP4_Quake ConquestLarge0 1
 XP5_001 ConquestLarge0 1
 XP5_002 ConquestLarge0 1
+XP5_003 ConquestLarge0 1
 XP5_004 ConquestLarge0 1
 COOP_006 ConquestSmall0 1
 MP_001 ConquestSmall0 1

diff --git a/Supported-maps.md b/Supported-maps.md
@@ -4,7 +4,7 @@ The following maps are currently supported in this commit.
 |   	   	| Technical Name | Name | Supported Gamemodes |   Supported Gamemodes with Vehicles |
 |---	|---	|---	|---	|---	|
 |   ![image](https://user-images.githubusercontent.com/57008952/124316245-9a38c380-db75-11eb-9bad-d248e002fd21.png)	 |   `MP_001`	| **Grand Bazaar** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316273-a3c22b80-db75-11eb-86fc-ad43486a6b61.png)	 |   `MP_003`	| **Teheran Highway** | `CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316273-a3c22b80-db75-11eb-86fc-ad43486a6b61.png)	 |   `MP_003`	| **Teheran Highway** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316281-a886df80-db75-11eb-986d-4576205d0ea9.png)	 |   `MP_007`	| **Caspian Border** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316354-c5231780-db75-11eb-9c0c-e2fd4e8b580f.png) 	|   `MP_011`	| **Seine Crossing** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316386-d0764300-db75-11eb-8ee7-87684f0ec4d7.png) 	|   `MP_012`	| **Operation Firestorm** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
@@ -13,24 +13,24 @@ The following maps are currently supported in this commit.
 |   ![image](https://user-images.githubusercontent.com/57008952/124316457-eab02100-db75-11eb-8cde-ef8fd4e20c71.png) 	|   `MP_018`	| **Kharg Island** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316492-f26fc580-db75-11eb-9a27-cffec0fc8564.png) 	|   `MP_Subway`	| **Operation Metro** | `CQ Large` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` |  |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316546-0a474980-db76-11eb-9a00-48a44d38de9d.png) 	|   `XP1_001`	| **Strike at Karkand** | `Assault Large` ,`Assault` ,`Assault 2` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `Assault Large` ,`Assault` ,`Assault 2` ,`Rush` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316582-19c69280-db76-11eb-87ff-fe9bbeb857fc.png) 	|   `XP1_002`	| **Gulf of Oman** | `Assault` ,`CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316597-21863700-db76-11eb-969d-49f6cb167b82.png) 	|   `XP1_003`	| **Sharqi Peninsula** | `Assault Large` ,`Assault` ,`Assault 2` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `Assault` ,`Rush` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316582-19c69280-db76-11eb-87ff-fe9bbeb857fc.png) 	|   `XP1_002`	| **Gulf of Oman** | `Assault` ,`CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `Assault` ,`CQ Large` ,`CQ Small` ,`Rush` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316597-21863700-db76-11eb-969d-49f6cb167b82.png) 	|   `XP1_003`	| **Sharqi Peninsula** | `Assault Large` ,`Assault` ,`Assault 2` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `Assault Large` ,`Assault` ,`Assault 2` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316613-2945db80-db76-11eb-8a71-ea094670337b.png) 	|   `XP1_004`	| **Wake Island** | `Assault Large` ,`Assault` ,`Assault 2` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `Assault Large` ,`Assault 2` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316641-34007080-db76-11eb-899e-019b0d04c73a.png) 	|   `XP2_Factory`	| **Scrapmetal** | `CQ Dom` ,`GM` ,`SDM` ,`SQ Rush` ,`TDM CQ` |  |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316661-3cf14200-db76-11eb-809b-59d14953eaa5.png) 	|   `XP2_Office`	| **Operation 925** | `CQ Dom` ,`GM` ,`SDM` ,`SQ Rush` ,`TDM CQ` |  |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316687-467aaa00-db76-11eb-9a67-81f4700ed727.png) 	|   `XP2_Skybar`	| **Ziba Tower** | `CQ Dom` ,`GM` ,`SDM` ,`TDM CQ` |  |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316714-51353f00-db76-11eb-829c-48c2526c0e18.png) 	|   `XP2_Palace`	| **Donya Fortress** | `CQ Dom` ,`GM` ,`SDM` ,`TDM CQ` |  |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316739-5a261080-db76-11eb-8b84-e74d5b6ff6b3.png) 	|   `XP3_Alborz`	| **Alborz Mountains** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316753-61e5b500-db76-11eb-977c-b78a172532e4.png) 	|   `XP3_Desert`	| **Bandar Desert** | `CQ Small` ,`Rush` ,`SDM` ,`SQ Rush` ,`Tank Superiority` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` ,`Tank Superiority` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316753-61e5b500-db76-11eb-977c-b78a172532e4.png) 	|   `XP3_Desert`	| **Bandar Desert** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`SQ Rush` ,`Tank Superiority` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` ,`Tank Superiority` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316774-6b6f1d00-db76-11eb-9b92-4f4d526fe115.png) 	|   `XP3_Shield`	| **Armored Shield** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`SQ Rush` ,`Tank Superiority` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` ,`Tank Superiority` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316795-74f88500-db76-11eb-8419-2a0cd57ca286.png) 	|   `XP3_Valley`	| **Death Valley** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`SQ Rush` ,`Tank Superiority` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` ,`Tank Superiority` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316859-8a6daf00-db76-11eb-95dd-0c8671338c1a.png) 	|   `XP4_FD`	| **Markaz Monolith** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`Scavanger` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316879-90fc2680-db76-11eb-9937-b1b9e7e7914b.png) 	|   `XP4_Rubble`	| **Talah Market** | `Assault` ,`GM` ,`Rush` ,`Scavanger` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `Assault` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316901-98233480-db76-11eb-80bd-baf046552122.png) 	|   `XP4_Quake`	| **Epicenter** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`Scavanger` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Small` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316914-a07b6f80-db76-11eb-82cb-2396a2828b76.png) 	|   `XP4_Parl`	| **Azadi Palace** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`Scavanger` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316914-a07b6f80-db76-11eb-82cb-2396a2828b76.png) 	|   `XP4_Parl`	| **Azadi Palace** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`Scavanger` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316932-a83b1400-db76-11eb-99ad-926721cfbb09.png) 	|   `XP5_001`	| **Operation Riverside** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316951-aec98b80-db76-11eb-816d-140f9614359e.png) 	|   `XP5_002`	| **Nebandan Flats** | `CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
-|   ![image](https://user-images.githubusercontent.com/57008952/124316976-b8eb8a00-db76-11eb-8207-addf58c94317.png) 	|   `XP5_003`	| **Kiasar Railroad** | `CTF` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Small` ,`Rush` |
+|   ![image](https://user-images.githubusercontent.com/57008952/124316976-b8eb8a00-db76-11eb-8207-addf58c94317.png) 	|   `XP5_003`	| **Kiasar Railroad** | `CTF` ,`CQ Large` ,`CQ Small` ,`GM` ,`Rush` ,`SDM` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 |   ![image](https://user-images.githubusercontent.com/57008952/124316988-bee16b00-db76-11eb-96f4-fc714fcf6fce.png) 	|   `XP5_004`	| **Sabalan Pipeline** | `CQ Large` ,`CQ Small` ,`Rush` ,`SDM` ,`SQ Rush` ,`TDM` ,`TDM CQ` | `CQ Large` ,`CQ Small` ,`Rush` |
 
 The following maps can be played with the [mod](https://github.com/keku645/vu-all-gamemodes-in-all-maps) from keku645.