Release 2.1.0

Improve bot camping

.astylerc

@@ -0,0 +1,21 @@
+# try to mimic the original gsc provided
+mode=c
+style=allman
+
+indent=tab
+lineend=windows
+
+pad-oper
+pad-paren-in
+pad-header
+
+# delete-empty-lines
+
+break-blocks
+# remove-braces
+
+indent-switches
+indent-cases
+indent-after-parens
+
+remove-comment-prefix

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+charset = latin1
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -2,15 +2,17 @@
 /*
 
 # Files to not ignore
+!/.vscode
 !/.gitignore
-!/z_devserver.bat
+!/.editorconfig
-!/z_dev.bat
+!/.gitattributes
-!/z_serverdev.bat
+
 !/z_server.bat
-!/z_bots.bat
+!/z_server_watchdog.bat
-!/z_client.bat
 !/z_server_pvbrust.bat
+!/z_server_pvbrust_watchdog.bat
 !/z_server_pvbvote.bat
+!/z_server_pvbvote_watchdog.bat
 
 # Folder to not ignore
 !/userraw
@@ -22,6 +24,11 @@
 !/README.md
 !/out
 
+!/.astylerc
+!/z_deploy.bat
+!/deploy.bat
+!/deploy.js
+
 *.zip
 *.log
 *.stat

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+    "astyle.astylerc": "${workspaceRoot}/.astylerc",
+    "astyle.additional_languages": [
+        "gsc"
+    ],
+    "[gsc]": {
+			"editor.defaultFormatter": "chiehyu.vscode-astyle",
+		},
+		"editor.quickSuggestions": {
+			"other": true,
+			"comments": true,
+			"strings": true
+		},
+		"vscode-codscript.use_builtin_completionItems": false
+}

README.md

@@ -73,91 +73,65 @@ You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfar
 - Pressing the menu button again closes menus.
 
 ### DVARs
-- bots_manage_add - an integer amount of bots to add to the game, resets to 0 once the bots have been added.
+| Dvar                             | Description                                                                                 | Default Value |
-    - for example: 'bots_manage_add 10' will add 10 bots to the game.
+|----------------------------------|---------------------------------------------------------------------------------------------|--------------:|
-
+| bots_main                        | Enable this mod.                                                                            | true          |
-- bots_manage_fill - an integer amount of players/bots (depends on bots_manage_fill_mode) to retain on the server, it will automatically add bots to fill player space.
+| bots_main_firstIsHost            | The first player to connect will be given host.                                             | false         |
-    - for example: 'bots_manage_fill 10' will have the server retain 10 players in the server, if there are less than 10, it will add bots until that value is reached.
+| bots_main_GUIDs                  | A comma separated list of GUIDs of players who will be given host.                          | ""            |
-
+| bots_main_waitForHostTime        | How many seconds to wait for the host player to connect before adding bots to the match.    | 10            |
-- bots_manage_fill_mode - a value to indicate if the server should consider only bots or players and bots when filling player space.
+| bots_main_menu                   | Enable the in-game menu for hosts.                                                          | true          |
-    - 0 will consider both players and bots.
+| bots_main_debug                  | Enable the in-game waypoint editor.                                                         | false         |
-    - 1 will only consider bots.
+| bots_main_kickBotsAtEnd          | Kick the bots at the end of a match.                                                        | false         |
-
+| bots_main_chat                   | The rate bots will chat at, set to 0 to disable.                                            | 1.0           |
-- bots_manage_fill_kick - a boolean value (0 or 1), whether or not if the server should kick bots if the amount of players/bots (depends on bots_manage_fill_mode) exceeds the value of bots_manage_fill.
+| bots_manage_add                  | Amount of bots to add to the game, once bots are added, resets back to `0`.                 | 0             |
-
+| bots_manage_fill                 | Amount of players/bots (look at `bots_manage_fill_mode`) to maintain in the match.          | 0             |
-- bots_manage_fill_spec - a boolean value (0 or 1), whether or not if the server should consider players who are on the spectator team when filling player space.
+| bots_manage_fill_mode            | `bots_manage_fill` players/bots counting method.<ul><li>`0` - counts both players and bots.</li><li>`1` - only counts bots.</li></ul> | 0 |
-
+| bots_manage_fill_kick            | If the amount of players/bots in the match exceeds `bots_manage_fill`, kick bots until no longer exceeds. | false |
----
+| bots_manage_fill_spec            | If when counting players for `bots_manage_fill` should include spectators.                  | true          |
-
+| bots_team                        | One of `autoassign`, `allies`, `axis`, `spectator`, or `custom`. What team the bots should be on. | autoassign |
-- bots_team - a string, the value indicates what team the bots should join:
+| bots_team_amount                 | When `bots_team` is set to `custom`. The amount of bots to be placed on the axis team. The remainder will be placed on the allies team. | 0 |
-    - 'autoassign' will have bots balance the teams
+| bots_team_force                  | If the server should force bots' teams according to the `bots_team` value. When `bots_team` is `autoassign`, unbalanced teams will be balanced. This dvar is ignored when `bots_team` is `custom`. | false |
-    - 'allies' will have the bots join the allies team
+| bots_team_mode                   | When `bots_team_force` is `true` and `bots_team` is `autoassign`, players/bots counting method. <ul><li>`0` - counts both players and bots.</li><li>`1` - only counts bots</li></ul> | 0 |
-    - 'axis' will have the bots join the axis team
+| bots_skill                       | Bots' difficulty.<ul><li>`0` - Random difficulty for each bot.</li><li>`1` - Easiest difficulty for all bots.</li><li>`2` to `6` - Between easy and hard difficulty for all bots.</li><li>`7` - The hardest difficulty for all bots.</li><li>`8` - custom (look at the `bots_skill_<team>_<difficulty>` dvars</li></ul> | 0 |
-    - 'custom' will have bots_team_amount bots on the axis team, the rest will be on the allies team
+| bots_skill_axis_hard             | When `bots_skill` is set to `8`, the amount of hard difficulty bots to set on the axis team. | 0            |
-    
+| bots_skill_axis_med              | When `bots_skill` is set to `8`, the amount of medium difficulty bots to set on the axis team. The remaining bots on the team will be set to easy difficulty. | 0 |
-- bots_team_amount - an integer amount of bots to have on the axis team if bots_team is set to 'custom', the rest of the bots will be placed on the allies team.
+| bots_skill_allies_hard           | When `bots_skill` is set to `8`, the amount of hard difficulty bots to set on the allies team. | 0          |
-    - for example: there are 5 bots on the server and 'bots_team_amount 3', then 3 bots will be placed on the axis team, the other 2 will be placed on the allies team.
+| bots_skill_allies_med            | When `bots_skill` is set to `8`, the amount of medium difficulty bots to set on the allies team. The remaining bots on the team will be set to easy difficulty. | 0 |
-
+| bots_skill_min                   | The minimum difficulty level for the bots.                                                     | 1          |
-- bots_team_force - a boolean value (0 or 1), whether or not if the server should enforce periodically the bot's team instead of just a single team when the bot is added to the game.
+| bots_skill_max                   | The maximum difficulty level for the bots.                                                     | 7          |
-    - for example: 'bots_team_force 1' and 'bots_team autoassign' and the teams become to far unbalanced, then the server will change a bot's team to make it balanced again.
+| bots_loadout_reasonable          | If the bots should filter bad performing create-a-class selections.                            | false      |
-
+| bots_loadout_allow_op            | If the bots should be able to use overpowered and annoying create-a-class selections.          | true       |
-- bots_team_mode - a value to indicate if the server should consider only bots or players and bots when counting players on the teams.
+| bots_loadout_rank                | What rank to set the bots.<ul><li>`-1` - Average of all players in the match.</li><li>`0` - All random.</li><li>`1` or higher - Sets the bots' rank to this.</li></ul> | -1 |
-    - 0 will consider both players and bots.
+| bots_loadout_prestige            | What prestige to set the bots.<ul><li>`-1` - Same as host player in the match.</li><li>`-2` - All random.</li><li>`0` or higher - Sets the bots' prestige to this.</li></ul> | -1 |
-    - 1 will only consider bots.
+| bots_play_move                   | If the bots can move.                                                                          | true       |
-
+| bots_play_knife                  | If the bots can knife.                                                                         | true       |
----
+| bots_play_fire                   | If the bots can fire.                                                                          | true       |
-
+| bots_play_nade                   | If the bots can grenade.                                                                       | true       |
-- bots_skill - value to indicate how difficult the bots should be.
+| bots_play_take_carepackages      | If the bots can take carepackages.                                                             | true       |
-    - 0 will be mixed difficultly
+| bots_play_obj                    | If the bots can play the objective.                                                            | true       |
-    - 1 will be the most easy
+| bots_play_camp                   | If the bots can camp.                                                                          | true       |
-    - 2-6 will be in between most easy and most hard
+| bots_play_jumpdrop               | If the bots can jump/drop shot.                                                                | true       |
-    - 7 will be the most hard.
+| bots_play_target_other           | If the bots can target other entities other than players.                                      | true       |
-    - 8 will be custom.
+| bots_play_killstreak             | If the bots can call in killstreaks.                                                           | true       |
-
+| bots_play_ads                    | If the bots can aim down sights.                                                               | true       |
-- bots_skill_axis_hard - an integer amount of hard bots on the axis team.
+| bots_play_aim                    | If the bots can aim.                                                                           | true       |
-- bots_skill_axis_med - an integer amount of medium bots on the axis team.
-- bots_skill_allies_hard - an integer amount of hard bots on the allies team.
-- bots_skill_allies_med - an integer amount of medium bots on the allies team
-    - if bots_skill is 8 (custom). The remaining bots on the team will become easy bots
-    - for example: having 5 bots on the allies team, 'bots_skill_allies_hard 2' and 'bots_skill_allies_med 2' will have 2 hard bots, 2 medium bots, and 1 easy bot on the allies team.
-
----
-
-- bots_loadout_reasonable - a boolean value (0 or 1), whether or not if the bots should filter out bad create a class selections (like no miniuzi bling with acog rapidfire and hardline for example)
-
-- bots_loadout_allow_op - a boolean value (0 or 1), whether or not if the bots are allowed to use deathstreaks, noobtubes, rpg, laststand, etc.
-
-- bots_loadout_rank - an integer number, bots will be around this rank, -1 is average of all players in game, 0 is all random
-
-- bots_loadout_prestige - an integer number, bots will be this prestige, -1 is the same as player, -2 is all random
-
-- bots_play_move - a boolean value (0 or 1), whether or not if the bots will move
-- bots_play_knife - a boolean value (0 or 1), whether or not if the bots will use the knife
-- bots_play_fire - a boolean value (0 or 1), whether or not if the bots will fire their weapons
-- bots_play_nade - a boolean value (0 or 1), whether or not if the bots will grenade
-- bots_play_take_carepackages - a boolean value (0 or 1), whether or not if the bots will take carepackages
-- bots_play_obj - a boolean value (0 or 1), whether or not if the bots will play the objective
-- bots_play_camp - a boolean value (0 or 1), whether or not if the bots will camp
-- bots_play_jumpdrop - a boolean value (0 or 1), whether or not if the bots will jump shot or drop shot
-- bots_play_target_other - a boolean value (0 or 1), whether or not if the bots will target claymores, killstreaks, etc.
-- bots_play_killstreak - a boolean value (0 or 1), whether or not if the bots will use killstreaks
-- bots_play_ads - a boolean value (0 or 1), whether or not if the bots will ads
-
----
-
-- bots_main - a boolean value (0 or 1), enables or disables the mod
-
-- bots_main_firstIsHost - a boolean value (0 or 1), the first player to connect is considered a host
-
-- bots_main_GUIDs - a list of GUIDs (comma separated) of players who will be considered a host
-
-- bots_main_waitForHostTime - a float value, how long in seconds to wait for the host player to connect before adding in bots
-
-- bots_main_menu - a boolean value (0 or 1), enables or disables the menu
-
-- bots_main_debug - a boolean value (0 or 1), enables or disables the waypoint editor
 
 ## Changelog
+- v2.1.0
+  - Bot chatter system, bots_main_chat
+  - Greatly reduce script variable usage
+  - Fix bots slowly reacting in remote streaks
+  - Improved bots mantling and stuck
+  - Improved bots aim
+  - Fix some runtime errors
+  - Fixed bots aim in third person
+  - Bots sprint more
+  - Improved bots sight on enemies
+  - Bots play hidden gamemodes like one-flag and arena
+  - Bots do random actions while waiting at an objective
+  - Improved bots from getting stuck
+  - Better bot difficulty management, bots_skill_min and bots_skill_max
+
 - v2.0.1
   - Reduced bots crouching
   - Increased bots sprinting
@@ -181,10 +155,20 @@ You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfar
 - v2.0.0
   - Initial reboot release
 
+
+- TODOs
+  - A variable leak in _menu (script)
+  - Recoil for bots (engine, maybe script)
+  - Use proper activate button for bombs, carepackages, etc (script, use +activate)
+  - Proper weapon swaps, including altmode (engine, then script)
+  - Use static turrets in maps (script)
+  - Proper use of pred missile (script and engine)
+  - Fix testclient view angle clamping (messes with ac130 and chopper gunner) (engine)
+
 ## Credits
 - IW4x Team - https://github.com/XLabsProject/iw4x-client
 - CoD4x Team - https://github.com/callofduty4x/CoD4x_Server
-- INeedGames(me) - http://www.moddb.com/mods/bot-warfare
+- INeedGames - http://www.moddb.com/mods/bot-warfare
 - tinkie101 - https://web.archive.org/web/20120326060712/http://alteriw.net/viewtopic.php?f=72&t=4869
 - PeZBot team - http://www.moddb.com/mods/pezbot
 - apdonato - http://rsebots.blogspot.ca/

deploy.bat

@@ -0,0 +1,6 @@
+xcopy iw4x_bot_warfare\userraw\maps userraw\maps\ /Y /I /E /H /C
+xcopy iw4x_bot_warfare\userraw\scripts userraw\scripts\ /Y /I /E /H /C
+xcopy iw4x_bot_warfare\userraw\waypoints userraw\waypoints\ /Y /I /E /H /C
+xcopy iw4x_bot_warfare\userraw\mp userraw\mp\ /Y /I /E /H /C
+xcopy iw4x_bot_warfare\main main\ /Y /I /E /H /C
+xcopy iw4x_bot_warfare\userraw\bots.txt userraw\ /Y /I /H /C

deploy.js

@@ -0,0 +1,54 @@
+// nodejs 14+
+
+const exec = require('util').promisify(require('child_process').exec)
+
+const repo_name = 'iw4x_bot_warfare'
+const repo_url = `https://github.com/ineedbots/${repo_name}`
+const deploy_check_rate = 60000
+const title = 'IW4x Bot Warfare Git Deployer'
+
+function printToConsole(what, error = false)
+{
+  log = error ? console.error : console.log
+
+  log(`[${new Date().toISOString()}]:`, what)
+}
+
+async function doDeploy() {
+  try {
+    const { stdout, stderr } = await exec(`cd ${repo_name} && git fetch`)
+
+    if (stderr.length <= 0)
+      return
+
+    if (stderr.startsWith('From '))
+    {
+      printToConsole('git fetched! Pulling...')
+      await exec(`cd ${repo_name} && git pull && git submodule update --init --recursive`)
+      printToConsole('Deploying...')
+      await exec('deploy.bat')
+      printToConsole('Deployed!')
+    }
+  } catch (e) {
+    printToConsole(e, true)
+
+    if (!e.stderr.startsWith('The system cannot find the path specified'))
+      return
+
+    printToConsole('Cloning repo...')
+    try {
+      await exec(`git clone ${repo_url} && cd ${repo_name} && git submodule update --init --recursive`)
+
+      printToConsole('Cloned!')
+      printToConsole('Deploying...')
+      await exec('deploy.bat')
+      printToConsole('Deployed!')
+    } catch (f) {
+      printToConsole(f, true)
+    }
+  }
+}
+
+process.stdout.write(`${String.fromCharCode(27)}]0;${title}${String.fromCharCode(7)}`)
+doDeploy()
+setInterval(doDeploy, deploy_check_rate)

main/pvbrust.cfg

@@ -48,7 +48,6 @@ set sv_wwwDownload "1"
 // NON-GAMEPLAY CONFIGURATION					//
 //////////////////////////////////////////////////
 
-set rcon_password "qazqaz" 							// Access to your server to change stuff remotely or ingame. empty disabled
 set sv_securityLevel "23"						// Configures the servers security level.
 set sv_customTextColor ""						// custom color for ^;
 set g_password "" 								// Password Protected Server. Leave blank if you want players to join
@@ -114,10 +113,10 @@ set scr_classic "0"								// Enable IW3 killstreak system
 //												//
 // DO NOT ABUSE!  Some people like to rank.		//
 // DON'T BE A DICK! Warn HIGH XP via hostname.	//
-// Don't know what you doing? Don't touch it! 	//
+// Don't know what you doing? Dont touch it! 	//
 //////////////////////////////////////////////////
 
-set scr_xpscale "10"							// IW's way of Double XP.
+set scr_xpscale "10"							// IWs way of Double XP.
 
 //set scr_war_score_kill "0"					// Amount of XP by each kill.
 //set scr_war_score_headshot "0"				// Amount of XP by each headshot.
@@ -203,7 +202,7 @@ set scr_airdrop_mega_nuke "1"
 //////////////////////////////////////////////////
 
 set scr_dm_scorelimit "10000"					// Score limit to win the game.
-set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dm_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dm_numlives "0" 						// Number of lives per player 0 for unlimited.
 set scr_dm_roundlimit "1" 						// Rounds per game.
@@ -215,7 +214,7 @@ set scr_dm_promode "0"
 //////////////////////////////////////////////////
 
 set scr_war_scorelimit "25600" 					// Score limit to win the game.
-set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_war_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_war_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_war_numlives "0" 						// Number of lives per player 0 for unlimited.
@@ -228,7 +227,7 @@ set scr_war_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dom_scorelimit "300"					// Score limit to win the game.
-set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dom_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dom_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dom_numlives "0" 						// Number of lives per player per game. 0 is unlimited.
@@ -241,7 +240,7 @@ set scr_dom_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dd_scorelimit "1"						// Score limit needed to win.
-set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dd_playerrespawndelay "0"				// How long player will wait until respawn.
 set scr_dd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dd_numlives "0"							// Number of lives per player per game. 0 is unlimited.
@@ -257,7 +256,7 @@ set scr_dd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sd_scorelimit "1"						// Score limit required to win the game.
-set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sd_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_sd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_sd_numlives "1"							// Number of lives per player per game.
@@ -276,7 +275,7 @@ set scr_sd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sab_scorelimit "0"						// Score limit to win the match.
-set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sab_bombtimer "30"						// Duration in seconds the bomb takes to detonate.
 set scr_sab_defusetime "5"						// Time taken to defuse the bomb.
 set scr_sab_hotpotato "0" 						// One bomb that the teams must fight over. One defending and one have to plant at the site.
@@ -294,7 +293,7 @@ set scr_sab_promode "0"
 //////////////////////////////////////////////////
 
 set scr_ctf_scorelimit "0"						// Target score before the round ends.
-set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_ctf_numlives "0"						// Number of lives per player 0 for unlimited.
 set scr_ctf_halftime "1"						// Half-Time
 set scr_ctf_roundlimit "1"						// How many rounds match would last.
@@ -308,7 +307,7 @@ set scr_ctf_promode "0"
 //////////////////////////////////////////////////
 
 set scr_oneflag_scorelimit "1"					// Target score before the round ends.
-set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_oneflag_numlives "0"					// number of lives per player 0 for unlimited.
 set scr_oneflag_playerrespawndelay "0" 			// Respawn wait in seconds.
 set scr_oneflag_roundlimit "1"					// How many rounds match would last.
@@ -321,7 +320,7 @@ set scr_oneflag_promode "0"
 //////////////////////////////////////////////////
 
 set scr_koth_scorelimit "250" 					// Score limit to win the game.
-set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isn't reached.
+set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isnt reached.
 set scr_koth_numlives "0"						// Number of lives per game. 0 for unlimited.
 set scr_koth_playerrespawndelay "0"				// Players respawn wait.
 set scr_koth_roundlimit "1" 					// Rounds to be played.
@@ -335,7 +334,7 @@ set scr_koth_promode "0"
 //////////////////////////////////////////////////
 
 set scr_arena_scorelimit "1"					// Score limit to win the game.
-set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isn't reached.
+set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isnt reached.
 set scr_arena_numlives "1"						// Number of lives per game 0 for unlimited.
 set scr_arena_roundlimit "0"					// Rounds to be played.
 set scr_arena_roundswitch "3"					// Rounds before the teams switch sides.
@@ -348,7 +347,7 @@ set scr_arena_promode "0"
 //////////////////////////////////////////////////
 
 set scr_gtnw_scorelimit "101"					// Score limit to win the game.
-set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isn't reached.
+set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isnt reached.
 set scr_gtnw_numlives "0"						// Number of lives per game 0 for unlimited.
 set scr_gtnw_playerrespawndelay "0"				// Players respawn wait.
 set scr_gtnw_roundlimit "1"						// Rounds to be played.
@@ -491,10 +490,11 @@ set iw4x_onelog ""
 
 // CUSTOM
 set bot_pvb_helper_noPlayersOnTeam "axis"
-set bot_pvb_helper_customBotClassTeam ""
+set bot_pvb_helper_customBotClassTeam "allies"
 set scr_showHP "1"
 set scr_allowFPSBooster "1"
 set bot_sniperCheck "1"
+set dom_lastFlagUseTimeMulti "4.0"
 
 // _class
 // set scr_allow_ "0"
@@ -529,12 +529,12 @@ set bots_manage_fill_kick "1"
 set bots_team "axis"
 set bots_team_amount "0"
 set bots_team_force "1"
-set bots_team_mode "0"
+set bots_team_mode "1"
-set bots_skill "0"
+set bots_skill "8"
 set bots_skill_axis_hard "0"
-set bots_skill_axis_med "0"
+set bots_skill_axis_med "4"
 set bots_skill_allies_hard "0"
-set bots_skill_allies_med "0"
+set bots_skill_allies_med "4"
 set bots_loadout_reasonable "0"
 set bots_loadout_allow_op "0"
 set bots_loadout_rank "-1"
@@ -553,7 +553,7 @@ set bots_play_ads "1"
 
 
 // iw4madmin
-set sv_printradarupdates "1"
+set sv_printradarupdates "0"
 
 
 // _killcam
@@ -592,6 +592,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

main/pvbvote.cfg

@@ -48,7 +48,6 @@ set sv_wwwDownload "1"
 // NON-GAMEPLAY CONFIGURATION					//
 //////////////////////////////////////////////////
 
-set rcon_password "qazqaz" 							// Access to your server to change stuff remotely or ingame. empty disabled
 set sv_securityLevel "23"						// Configures the servers security level.
 set sv_customTextColor ""						// custom color for ^;
 set g_password "" 								// Password Protected Server. Leave blank if you want players to join
@@ -114,10 +113,10 @@ set scr_classic "0"								// Enable IW3 killstreak system
 //												//
 // DO NOT ABUSE!  Some people like to rank.		//
 // DON'T BE A DICK! Warn HIGH XP via hostname.	//
-// Don't know what you doing? Don't touch it! 	//
+// Don't know what you doing? Dont touch it! 	//
 //////////////////////////////////////////////////
 
-set scr_xpscale "10"							// IW's way of Double XP.
+set scr_xpscale "10"							// IWs way of Double XP.
 
 //set scr_war_score_kill "0"					// Amount of XP by each kill.
 //set scr_war_score_headshot "0"				// Amount of XP by each headshot.
@@ -203,7 +202,7 @@ set scr_airdrop_mega_nuke "1"
 //////////////////////////////////////////////////
 
 set scr_dm_scorelimit "10000"					// Score limit to win the game.
-set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dm_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dm_numlives "0" 						// Number of lives per player 0 for unlimited.
 set scr_dm_roundlimit "1" 						// Rounds per game.
@@ -215,7 +214,7 @@ set scr_dm_promode "0"
 //////////////////////////////////////////////////
 
 set scr_war_scorelimit "25600" 					// Score limit to win the game.
-set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_war_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_war_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_war_numlives "0" 						// Number of lives per player 0 for unlimited.			
@@ -228,7 +227,7 @@ set scr_war_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dom_scorelimit "300"					// Score limit to win the game.
-set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dom_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dom_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dom_numlives "0" 						// Number of lives per player per game. 0 is unlimited.
@@ -241,7 +240,7 @@ set scr_dom_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dd_scorelimit "1"						// Score limit needed to win.
-set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dd_playerrespawndelay "0"				// How long player will wait until respawn.
 set scr_dd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dd_numlives "0"							// Number of lives per player per game. 0 is unlimited.
@@ -257,7 +256,7 @@ set scr_dd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sd_scorelimit "1"						// Score limit required to win the game.
-set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sd_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_sd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_sd_numlives "1"							// Number of lives per player per game.
@@ -276,7 +275,7 @@ set scr_sd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sab_scorelimit "0"						// Score limit to win the match.
-set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sab_bombtimer "30"						// Duration in seconds the bomb takes to detonate.
 set scr_sab_defusetime "5"						// Time taken to defuse the bomb.
 set scr_sab_hotpotato "0" 						// One bomb that the teams must fight over. One defending and one have to plant at the site.
@@ -294,7 +293,7 @@ set scr_sab_promode "0"
 //////////////////////////////////////////////////
 
 set scr_ctf_scorelimit "0"						// Target score before the round ends.
-set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_ctf_numlives "0"						// Number of lives per player 0 for unlimited.
 set scr_ctf_halftime "1"						// Half-Time
 set scr_ctf_roundlimit "1"						// How many rounds match would last.
@@ -308,7 +307,7 @@ set scr_ctf_promode "0"
 //////////////////////////////////////////////////
 
 set scr_oneflag_scorelimit "1"					// Target score before the round ends.
-set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_oneflag_numlives "0"					// number of lives per player 0 for unlimited.
 set scr_oneflag_playerrespawndelay "0" 			// Respawn wait in seconds.
 set scr_oneflag_roundlimit "1"					// How many rounds match would last.
@@ -321,7 +320,7 @@ set scr_oneflag_promode "0"
 //////////////////////////////////////////////////
 
 set scr_koth_scorelimit "250" 					// Score limit to win the game.
-set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isn't reached.
+set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isnt reached.
 set scr_koth_numlives "0"						// Number of lives per game. 0 for unlimited.
 set scr_koth_playerrespawndelay "0"				// Players respawn wait.
 set scr_koth_roundlimit "1" 					// Rounds to be played.
@@ -335,7 +334,7 @@ set scr_koth_promode "0"
 //////////////////////////////////////////////////
 
 set scr_arena_scorelimit "1"					// Score limit to win the game.
-set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isn't reached.
+set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isnt reached.
 set scr_arena_numlives "1"						// Number of lives per game 0 for unlimited.
 set scr_arena_roundlimit "0"					// Rounds to be played.
 set scr_arena_roundswitch "3"					// Rounds before the teams switch sides.
@@ -348,7 +347,7 @@ set scr_arena_promode "0"
 //////////////////////////////////////////////////
 
 set scr_gtnw_scorelimit "101"					// Score limit to win the game.
-set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isn't reached.
+set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isnt reached.
 set scr_gtnw_numlives "0"						// Number of lives per game 0 for unlimited.
 set scr_gtnw_playerrespawndelay "0"				// Players respawn wait.
 set scr_gtnw_roundlimit "1"						// Rounds to be played.
@@ -490,11 +489,12 @@ set iw4x_onelog ""
 
 
 // CUSTOM
-set bot_pvb_helper_noPlayersOnTeam "allies"
+set bot_pvb_helper_noPlayersOnTeam "axis"
-set bot_pvb_helper_customBotClassTeam "axis"
+set bot_pvb_helper_customBotClassTeam ""
 set scr_showHP "1"
 set scr_allowFPSBooster "1"
 set bot_sniperCheck "1"
+set dom_lastFlagUseTimeMulti "4.0"
 
 // _class
 // set scr_allow_ "0"
@@ -521,20 +521,20 @@ set bots_main "1"
 set bots_main_GUIDs ""
 set bots_main_firstIsHost "0"
 set bots_main_waitForHostTime "10"
-set bots_manage_add "10"
+set bots_manage_add "9"
-set bots_manage_fill "10"
+set bots_manage_fill "9"
 set bots_manage_fill_spec "0"
 set bots_manage_fill_mode "1"
 set bots_manage_fill_kick "1"
-set bots_team "custom"
+set bots_team "axis"
-set bots_team_amount "1"
+set bots_team_amount "0"
 set bots_team_force "1"
-set bots_team_mode "1"
+set bots_team_mode "0"
 set bots_skill "8"
-set bots_skill_axis_hard "1"
+set bots_skill_axis_hard "0"
-set bots_skill_axis_med "0"
+set bots_skill_axis_med "3"
 set bots_skill_allies_hard "0"
-set bots_skill_allies_med "3"
+set bots_skill_allies_med "0"
 set bots_loadout_reasonable "0"
 set bots_loadout_allow_op "0"
 set bots_loadout_rank "-1"
@@ -592,6 +592,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

main/server.cfg

@@ -48,7 +48,6 @@ set sv_wwwDownload "1"
 // NON-GAMEPLAY CONFIGURATION					//
 //////////////////////////////////////////////////
 
-set rcon_password "qazqaz" 							// Access to your server to change stuff remotely or ingame. empty disabled
 set sv_securityLevel "23"						// Configures the servers security level.
 set sv_customTextColor ""						// custom color for ^;
 set g_password "" 								// Password Protected Server. Leave blank if you want players to join
@@ -114,10 +113,10 @@ set scr_classic "0"								// Enable IW3 killstreak system
 //												//
 // DO NOT ABUSE!  Some people like to rank.		//
 // DON'T BE A DICK! Warn HIGH XP via hostname.	//
-// Don't know what you doing? Don't touch it! 	//
+// Don't know what you doing? Dont touch it! 	//
 //////////////////////////////////////////////////
 
-set scr_xpscale "10"							// IW's way of Double XP.
+set scr_xpscale "10"							// IWs way of Double XP.
 
 //set scr_war_score_kill "0"					// Amount of XP by each kill.
 //set scr_war_score_headshot "0"				// Amount of XP by each headshot.
@@ -203,7 +202,7 @@ set scr_airdrop_mega_nuke "1"
 //////////////////////////////////////////////////
 
 set scr_dm_scorelimit "10000"					// Score limit to win the game.
-set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dm_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dm_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dm_numlives "0" 						// Number of lives per player 0 for unlimited.
 set scr_dm_roundlimit "1" 						// Rounds per game.
@@ -215,7 +214,7 @@ set scr_dm_promode "0"
 //////////////////////////////////////////////////
 
 set scr_war_scorelimit "25600" 					// Score limit to win the game.
-set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_war_timelimit "10" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_war_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_war_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_war_numlives "0" 						// Number of lives per player 0 for unlimited.			
@@ -228,7 +227,7 @@ set scr_war_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dom_scorelimit "300"					// Score limit to win the game.
-set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dom_timelimit "30" 						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dom_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_dom_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dom_numlives "0" 						// Number of lives per player per game. 0 is unlimited.
@@ -241,7 +240,7 @@ set scr_dom_promode "0"
 //////////////////////////////////////////////////
 
 set scr_dd_scorelimit "1"						// Score limit needed to win.
-set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_dd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_dd_playerrespawndelay "0"				// How long player will wait until respawn.
 set scr_dd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_dd_numlives "0"							// Number of lives per player per game. 0 is unlimited.
@@ -257,7 +256,7 @@ set scr_dd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sd_scorelimit "1"						// Score limit required to win the game.
-set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sd_timelimit "2.5"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sd_playerrespawndelay "0" 				// How long player will wait until respawn.
 set scr_sd_waverespawndelay "0" 				// Duration is seconds before the first respawn in each round.
 set scr_sd_numlives "1"							// Number of lives per player per game.
@@ -276,7 +275,7 @@ set scr_sd_promode "0"
 //////////////////////////////////////////////////
 
 set scr_sab_scorelimit "0"						// Score limit to win the match.
-set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_sab_timelimit "20"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_sab_bombtimer "30"						// Duration in seconds the bomb takes to detonate.
 set scr_sab_defusetime "5"						// Time taken to defuse the bomb.
 set scr_sab_hotpotato "0" 						// One bomb that the teams must fight over. One defending and one have to plant at the site.
@@ -294,7 +293,7 @@ set scr_sab_promode "0"
 //////////////////////////////////////////////////
 
 set scr_ctf_scorelimit "0"						// Target score before the round ends.
-set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_ctf_timelimit "10"						// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_ctf_numlives "0"						// Number of lives per player 0 for unlimited.
 set scr_ctf_halftime "1"						// Half-Time
 set scr_ctf_roundlimit "1"						// How many rounds match would last.
@@ -308,7 +307,7 @@ set scr_ctf_promode "0"
 //////////////////////////////////////////////////
 
 set scr_oneflag_scorelimit "1"					// Target score before the round ends.
-set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isn't reached.
+set scr_oneflag_timelimit "3"					// Duration in minutes for the game to end if the score limit isnt reached.
 set scr_oneflag_numlives "0"					// number of lives per player 0 for unlimited.
 set scr_oneflag_playerrespawndelay "0" 			// Respawn wait in seconds.
 set scr_oneflag_roundlimit "1"					// How many rounds match would last.
@@ -321,7 +320,7 @@ set scr_oneflag_promode "0"
 //////////////////////////////////////////////////
 
 set scr_koth_scorelimit "250" 					// Score limit to win the game.
-set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isn't reached.
+set scr_koth_timelimit "15" 					// Duration in minutes the game will continue if the score isnt reached.
 set scr_koth_numlives "0"						// Number of lives per game. 0 for unlimited.
 set scr_koth_playerrespawndelay "0"				// Players respawn wait.
 set scr_koth_roundlimit "1" 					// Rounds to be played.
@@ -335,7 +334,7 @@ set scr_koth_promode "0"
 //////////////////////////////////////////////////
 
 set scr_arena_scorelimit "1"					// Score limit to win the game.
-set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isn't reached.
+set scr_arena_timelimit "2.5"					// Duration in minutes the game will continue if the score isnt reached.
 set scr_arena_numlives "1"						// Number of lives per game 0 for unlimited.
 set scr_arena_roundlimit "0"					// Rounds to be played.
 set scr_arena_roundswitch "3"					// Rounds before the teams switch sides.
@@ -348,7 +347,7 @@ set scr_arena_promode "0"
 //////////////////////////////////////////////////
 
 set scr_gtnw_scorelimit "101"					// Score limit to win the game.
-set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isn't reached.
+set scr_gtnw_timelimit "10"						// Duration in minutes the game will continue if the score isnt reached.
 set scr_gtnw_numlives "0"						// Number of lives per game 0 for unlimited.
 set scr_gtnw_playerrespawndelay "0"				// Players respawn wait.
 set scr_gtnw_roundlimit "1"						// Rounds to be played.
@@ -591,6 +590,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

out/README.txt

@@ -1,4 +1,4 @@
-# IW4x Bot Warfare v2.0.0
+# IW4x Bot Warfare v2.1.0
 Bot Warfare is a GSC mod for the IW4x project.
 
 It aims to add playable AI to the multiplayer games of Modern Warfare 2.
@@ -23,6 +23,21 @@ You can find the GitHub containing more info at https://github.com/ineedbots/iw4
 - Pressing the menu button again closes menus.
 
 ## Changelog
+- v2.1.0
+  - Bot chatter system, bots_main_chat
+  - Greatly reduce script variable usage
+  - Fix bots slowly reacting in remote streaks
+  - Improved bots mantling and stuck
+  - Improved bots aim
+  - Fix some runtime errors
+  - Fixed bots aim in third person
+  - Bots sprint more
+  - Improved bots sight on enemies
+  - Bots play hidden gamemodes like one-flag and arena
+  - Bots do random actions while waiting at an objective
+  - Improved bots from getting stuck
+  - Better bot difficulty management, bots_skill_min and bots_skill_max
+
 - v2.0.1
   - Reduced bots crouching
   - Increased bots sprinting
@@ -46,6 +61,16 @@ You can find the GitHub containing more info at https://github.com/ineedbots/iw4
 - v2.0.0
   - Initial reboot release
 
+
+- TODOs
+  - A variable leak in _menu (script)
+  - Recoil for bots (engine, maybe script)
+  - Use proper activate button for bombs, carepackages, etc (script, use +activate)
+  - Proper weapon swaps, including altmode (engine, then script)
+  - Use static turrets in maps (script)
+  - Proper use of pred missile (script and engine)
+  - Fix testclient view angle clamping (messes with ac130 and chopper gunner) (engine)
+
 ## Credits
 - IW4x Team - https://github.com/XLabsProject/iw4x-client
 - CoD4x Team - https://github.com/callofduty4x/CoD4x_Server

userraw/bots.txt

@@ -1,26 +1,26 @@
-a
+bota
-b
+botb
-c
+botc
-d
+botd
-e
+bote
-f
+botf
-g
+botg
-h
+both
-i
+boti
-j
+botj
-k
+botk
-l
+botl
-m
+botm
-n
+botn
-o
+boto
-p
+botp
-q
+botq
-r
+botr
-s
+bots
-t
+bott
-u
+botu
-v
+botv
-w
+botw
-x
+botx
-y
+boty
-z
+botz

userraw/maps/mp/bots/_bot_http.gsc

@@ -14,55 +14,55 @@ doVersionCheck()
 {
 	remoteVersion = getRemoteVersion();
 
-	if (!isDefined(remoteVersion))
+	if ( !isDefined( remoteVersion ) )
 	{
-		PrintConsole("Error getting remote version of Bot Warfare.\n");
+		PrintConsole( "Error getting remote version of Bot Warfare.\n" );
 		return false;
 	}
 
-	if (level.bw_VERSION != remoteVersion)
+	if ( level.bw_VERSION != remoteVersion )
 	{
-		PrintConsole("There is a new version of Bot Warfare!\n");
+		PrintConsole( "There is a new version of Bot Warfare!\n" );
-		PrintConsole("You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!\n");
+		PrintConsole( "You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!\n" );
 		return false;
 	}
 
-	PrintConsole("You are on the latest version of Bot Warfare!\n");
+	PrintConsole( "You are on the latest version of Bot Warfare!\n" );
 	return true;
 }
 
 /*
 	Will attempt to retreive waypoints from the internet
 */
-getRemoteWaypoints(mapname)
+getRemoteWaypoints( mapname )
 {
 	url = "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/" + mapname + "_wp.csv";
 	filename = "waypoints/" + mapname + "_wp.csv";
 
-	PrintConsole("Attempting to get remote waypoints from " + url + "\n");
+	PrintConsole( "Attempting to get remote waypoints from " + url + "\n" );
-	res = getLinesFromUrl(url, filename);
+	res = getLinesFromUrl( url, filename );
 
-	if (!res.lines.size)
+	if ( !res.lines.size )
 		return;
 
-	waypointCount = int(res.lines[0]);
+	waypointCount = int( res.lines[0] );
 
 	waypoints = [];
-	PrintConsole("Loading remote waypoints...\n");
+	PrintConsole( "Loading remote waypoints...\n" );
 
-	for (i = 1; i <= waypointCount; i++)
+	for ( i = 1; i <= waypointCount; i++ )
 	{
-		tokens = tokenizeLine(res.lines[i], ",");
+		tokens = tokenizeLine( res.lines[i], "," );
 
-		waypoint = parseTokensIntoWaypoint(tokens);
+		waypoint = parseTokensIntoWaypoint( tokens );
 
-		waypoints[i-1] = waypoint;
+		waypoints[i - 1] = waypoint;
 	}
 
-	if (waypoints.size)
+	if ( waypoints.size )
 	{
 		level.waypoints = waypoints;
-		PrintConsole("Loaded " + waypoints.size + " waypoints from remote.\n");
+		PrintConsole( "Loaded " + waypoints.size + " waypoints from remote.\n" );
 	}
 }
 
@@ -73,43 +73,44 @@ getRemoteVersion()
 {
 	request = httpGet( "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/version.txt" );
 
-	if (!isDefined(request))
+	if ( !isDefined( request ) )
 		return undefined;
 
 	request waittill( "done", success, data );
 
-	if (!success)
+	if ( !success )
 		return undefined;
 
-	return strtok(data, "\n")[0];
+	return strtok( data, "\n" )[0];
 }
 
 /*
 	Returns an array of each line from the response of the http url request
 */
-getLinesFromUrl(url, filename)
+getLinesFromUrl( url, filename )
 {
 	result = spawnStruct();
 	result.lines = [];
 
 	request = httpGet( url );
 
-	if (!isDefined(request))
+	if ( !isDefined( request ) )
 		return result;
 
 	request waittill( "done", success, data );
 
-	if (!success)
+	if ( !success )
 		return result;
 
-	fileWrite(filename, data, "write");
+	fileWrite( filename, data, "write" );
 
 	line = "";
-	for (i=0;i<data.size;i++)
+
+	for ( i = 0; i < data.size; i++ )
 	{
 		c = data[i];
 
-		if (c == "\n")
+		if ( c == "\n" )
 		{
 			result.lines[result.lines.size] = line;
 
@@ -119,6 +120,7 @@ getLinesFromUrl(url, filename)
 
 		line += c;
 	}
+
 	result.lines[result.lines.size] = line;
 
 	return result;

userraw/maps/mp/bots/_wp_editor.gsc

@@ -12,81 +12,82 @@
 
 init()
 {
-	if(getDvar("bots_main_debug") == "")
+	if ( getDvar( "bots_main_debug" ) == "" )
-		setDvar("bots_main_debug", 0);
+		setDvar( "bots_main_debug", 0 );
 
-	if(!getDVarint("bots_main_debug"))
+	if ( !getDVarint( "bots_main_debug" ) )
 		return;
 
-	if(!getDVarint("developer"))
+	if ( !getDVarint( "developer" ) )
 	{
-		setdvar("developer_script", 1);
+		setdvar( "developer_script", 1 );
-		setdvar("developer", 1);
+		setdvar( "developer", 1 );
 
-		setdvar("sv_mapRotation", "map "+getDvar("mapname"));
+		setdvar( "sv_mapRotation", "map " + getDvar( "mapname" ) );
-		exitLevel(false);
+		exitLevel( false );
 	}
 
-	setDvar("bots_main", 0);
+	setDvar( "bots_main", 0 );
-	setdvar("bots_main_menu", 0);
+	setdvar( "bots_main_menu", 0 );
-	setdvar("bots_manage_fill_mode", 0);
+	setdvar( "bots_manage_fill_mode", 0 );
-	setdvar("bots_manage_fill", 0);
+	setdvar( "bots_manage_fill", 0 );
-	setdvar("bots_manage_add", 0);
+	setdvar( "bots_manage_add", 0 );
-	setdvar("bots_manage_fill_kick", 1);
+	setdvar( "bots_manage_fill_kick", 1 );
-	setDvar("bots_manage_fill_spec", 1);
+	setDvar( "bots_manage_fill_spec", 1 );
 
-	if (getDvar("bots_main_debug_distance") == "")
+	if ( getDvar( "bots_main_debug_distance" ) == "" )
-		setDvar("bots_main_debug_distance", 512.0);
+		setDvar( "bots_main_debug_distance", 512.0 );
 
-	if (getDvar("bots_main_debug_cone") == "")
+	if ( getDvar( "bots_main_debug_cone" ) == "" )
-		setDvar("bots_main_debug_cone", 0.65);
+		setDvar( "bots_main_debug_cone", 0.65 );
 
-	if (getDvar("bots_main_debug_minDist") == "")
+	if ( getDvar( "bots_main_debug_minDist" ) == "" )
-		setDvar("bots_main_debug_minDist", 32.0);
+		setDvar( "bots_main_debug_minDist", 32.0 );
 
-	if (getDvar("bots_main_debug_drawThrough") == "")
+	if ( getDvar( "bots_main_debug_drawThrough" ) == "" )
-		setDvar("bots_main_debug_drawThrough", false);
+		setDvar( "bots_main_debug_drawThrough", false );
 
-	setDvar("player_sustainAmmo", 1);
+	setDvar( "player_sustainAmmo", 1 );
 
 	level.waypoints = [];
 	level.waypointCount = 0;
 
-	level waittill( "connected", player);
+	level waittill( "connected", player );
 	player thread onPlayerSpawned();
 }
 
 onPlayerSpawned()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	for(;;)
+
+	for ( ;; )
 	{
-		self waittill("spawned_player");
+		self waittill( "spawned_player" );
 		self thread startDev();
 	}
 }
 
 StartDev()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
 	level.wpToLink = -1;
 	level.autoLink = false;
 	self.nearest = -1;
 
 	self takeAllWeapons();
-	self giveWeapon("m16_gl_mp");//to knife windows
+	self giveWeapon( "m16_gl_mp" ); //to knife windows
-	self giveWeapon("javelin_mp");//to mark jav spots
+	self giveWeapon( "javelin_mp" ); //to mark jav spots
 	self SetOffhandPrimaryClass( "other" );
-	self giveWeapon("semtex_mp");
+	self giveWeapon( "semtex_mp" );
 	self _clearperks();
 	self.specialty = [];
-	self maps\mp\perks\_perks::givePerk("specialty_fastmantle");
+	self maps\mp\perks\_perks::givePerk( "specialty_fastmantle" );
-	self maps\mp\perks\_perks::givePerk("specialty_falldamage");
+	self maps\mp\perks\_perks::givePerk( "specialty_falldamage" );
-	self maps\mp\perks\_perks::givePerk("specialty_marathon");
+	self maps\mp\perks\_perks::givePerk( "specialty_marathon" );
-	self maps\mp\perks\_perks::givePerk("specialty_lightweight");
+	self maps\mp\perks\_perks::givePerk( "specialty_lightweight" );
-	self freezecontrols(false);
+	self freezecontrols( false );
 
 	self thread watchAddWaypointCommand();
 	self thread watchDeleteAllWaypointsCommand();
@@ -104,44 +105,45 @@ StartDev()
 
 sayExtras()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
-	self iprintln("Before adding waypoints, holding buttons:");
+	self iprintln( "Before adding waypoints, holding buttons:" );
 	wait 4;
-	self iprintln("ADS - climb");
+	self iprintln( "ADS - climb" );
-	self iprintln("Use + Attack - tube");
+	self iprintln( "Use + Attack - tube" );
-	self iprintln("Attack - grenade");
+	self iprintln( "Attack - grenade" );
-	self iprintln("Use - claymore");
+	self iprintln( "Use - claymore" );
 	wait 4;
-	self iprintln("Else the waypoint will be your stance.");
+	self iprintln( "Else the waypoint will be your stance." );
-	self iprintln("Making a crouch waypoint with only one link...");
+	self iprintln( "Making a crouch waypoint with only one link..." );
-	self iprintln("Makes a camping waypoint.");
+	self iprintln( "Makes a camping waypoint." );
 }
 
 watchAstarCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("astar", "+gostand");
+	self notifyOnPlayerCommand( "astar", "+gostand" );
-	for (;;)
+
+	for ( ;; )
 	{
-		self waittill("astar");
+		self waittill( "astar" );
 
-		if (1)
+		if ( 1 )
 			continue;
 
-		self iprintln("Start AStar");
+		self iprintln( "Start AStar" );
 		self.astar = undefined;
 		astar = spawnStruct();
 		astar.start = self.origin;
 
-		self waittill("astar");
+		self waittill( "astar" );
-		self iprintln("End AStar");
+		self iprintln( "End AStar" );
 		astar.goal = self.origin;
 
-		astar.nodes = AStarSearch(astar.start, astar.goal, undefined, true);
+		astar.nodes = AStarSearch( astar.start, astar.goal, undefined, true );
-		self iprintln("AStar size: " + astar.nodes.size);
+		self iprintln( "AStar size: " + astar.nodes.size );
 
 		self.astar = astar;
 	}
@@ -149,141 +151,147 @@ watchAstarCommand()
 
 updateWaypointsStats()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self initHudElem("TotalWps:",102,5);
+	self initHudElem( "TotalWps:", 102, 5 );
-	totalWpsHud = self initHudElem("",180,5);
+	totalWpsHud = self initHudElem( "", 180, 5 );
-	self initHudElem("NearestWP:",102,15);
+	self initHudElem( "NearestWP:", 102, 15 );
-	nearestWP = self initHudElem("",180,15);
+	nearestWP = self initHudElem( "", 180, 15 );
-	self initHudElem("Childs:",102,25);
+	self initHudElem( "Childs:", 102, 25 );
-	children = self initHudElem("",160,25);
+	children = self initHudElem( "", 160, 25 );
-	self initHudElem("Type:",102,35);
+	self initHudElem( "Type:", 102, 35 );
-	type = self initHudElem("",160,35);
+	type = self initHudElem( "", 160, 35 );
-	self initHudElem("ToLink:",102,45);
+	self initHudElem( "ToLink:", 102, 45 );
-	wpToLink = self initHudElem("",160,45);
+	wpToLink = self initHudElem( "", 160, 45 );
 
 	infotext = self initHudElem2();
 	self initHudElem3();
 	self initHudElem4();
 
-	for(time=0;;time+=0.05)
+	for ( time = 0;; time += 0.05 )
 	{
 		wait 0.05;
 
-		totalWpsHud setText(level.waypointCount);
+		totalWpsHud setText( level.waypointCount );
 
 		closest = -1;
 		myEye = self getEye();
 		myAngles = self GetPlayerAngles();
-		for(i = 0; i < level.waypointCount; i++)
+
+		for ( i = 0; i < level.waypointCount; i++ )
 		{
-			if(closest == -1 || closer(self.origin, level.waypoints[i].origin, level.waypoints[closest].origin))
+			if ( closest == -1 || closer( self.origin, level.waypoints[i].origin, level.waypoints[closest].origin ) )
 				closest = i;
 
-			wpOrg = level.waypoints[i].origin + (0, 0, 25);
+			wpOrg = level.waypoints[i].origin + ( 0, 0, 25 );
 
-			if(distance(level.waypoints[i].origin, self.origin) < getDvarFloat("bots_main_debug_distance") && (bulletTracePassed(myEye, wpOrg, false, self) || getDVarint("bots_main_debug_drawThrough")))
+			if ( distance( level.waypoints[i].origin, self.origin ) < getDvarFloat( "bots_main_debug_distance" ) && ( bulletTracePassed( myEye, wpOrg, false, self ) || getDVarint( "bots_main_debug_drawThrough" ) ) )
 			{
-				for(h = 0; h < level.waypoints[i].childCount; h++)
+				for ( h = level.waypoints[i].children.size - 1; h >= 0; h-- )
-					line(wpOrg, level.waypoints[level.waypoints[i].children[h]].origin + (0, 0, 25), (1,0,1));
+					line( wpOrg, level.waypoints[level.waypoints[i].children[h]].origin + ( 0, 0, 25 ), ( 1, 0, 1 ) );
 
-				if(getConeDot(wpOrg, myEye, myAngles) > getDvarFloat("bots_main_debug_cone"))
+				if ( getConeDot( wpOrg, myEye, myAngles ) > getDvarFloat( "bots_main_debug_cone" ) )
-					print3d(wpOrg, i, (1,0,0), 2);
+					print3d( wpOrg, i, ( 1, 0, 0 ), 2 );
 
-				if (isDefined(level.waypoints[i].angles) && level.waypoints[i].type != "stand")
+				if ( isDefined( level.waypoints[i].angles ) && level.waypoints[i].type != "stand" )
-					line(wpOrg, wpOrg + AnglesToForward(level.waypoints[i].angles) * 64, (1,1,1));
+					line( wpOrg, wpOrg + AnglesToForward( level.waypoints[i].angles ) * 64, ( 1, 1, 1 ) );
 
-				if (isDefined(level.waypoints[i].jav_point))
+				if ( isDefined( level.waypoints[i].jav_point ) )
-					line(wpOrg, level.waypoints[i].jav_point, (0,0,0));
+					line( wpOrg, level.waypoints[i].jav_point, ( 0, 0, 0 ) );
 			}
 		}
 
 		self.nearest = closest;
 
-		nearestWP setText(self.nearest);
+		nearestWP setText( self.nearest );
 
-		children setText(buildChildCountString(self.nearest));
+		children setText( buildChildCountString( self.nearest ) );
 
-		type setText(buildTypeString(self.nearest));
+		type setText( buildTypeString( self.nearest ) );
 
-		wpToLink setText(level.wpToLink);
+		wpToLink setText( level.wpToLink );
 
 		infotext.x = infotext.x - 2;
-		if(infotext.x <= -800)
+
+		if ( infotext.x <= -800 )
 			infotext.x = 800;
 
-		if (self UseButtonPressed() && time > 2)
+		if ( self UseButtonPressed() && time > 2 )
 		{
 			time = 0;
-			self iPrintLnBold(self.nearest + " children:  " + buildChildString(self.nearest));
+			self iPrintLnBold( self.nearest + " children:  " + buildChildString( self.nearest ) );
 		}
 
-		if (isDefined(self.astar))
+		if ( isDefined( self.astar ) )
 		{
-			print3d(self.astar.start + (0, 0, 35), "start", (0,0,1), 2);
+			print3d( self.astar.start + ( 0, 0, 35 ), "start", ( 0, 0, 1 ), 2 );
-			print3d(self.astar.goal + (0, 0, 35), "goal", (0,0,1), 2);
+			print3d( self.astar.goal + ( 0, 0, 35 ), "goal", ( 0, 0, 1 ), 2 );
 
-			prev = self.astar.start + (0, 0, 35);
+			prev = self.astar.start + ( 0, 0, 35 );
 
-			for (i = self.astar.nodes.size - 1; i >= 0; i--)
+			for ( i = self.astar.nodes.size - 1; i >= 0; i-- )
 			{
 				node = self.astar.nodes[i];
 
-				line(prev, level.waypoints[node].origin + (0, 0, 35), (0,1,1));
+				line( prev, level.waypoints[node].origin + ( 0, 0, 35 ), ( 0, 1, 1 ) );
 
-				prev = level.waypoints[node].origin + (0, 0, 35);
+				prev = level.waypoints[node].origin + ( 0, 0, 35 );
 			}
 
-			line(prev, self.astar.goal + (0, 0, 35), (0,1,1));
+			line( prev, self.astar.goal + ( 0, 0, 35 ), ( 0, 1, 1 ) );
 		}
 	}
 }
 
 watchLoadWaypointsCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+actionslot 2}]", "+actionslot 2");
+	self notifyOnPlayerCommand( "[{+actionslot 2}]", "+actionslot 2" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+actionslot 2}]");
+		self waittill( "[{+actionslot 2}]" );
 		self LoadWaypoints();
 	}
 }
 
 watchAddWaypointCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+smoke}]", "+smoke");
+	self notifyOnPlayerCommand( "[{+smoke}]", "+smoke" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+smoke}]");
+		self waittill( "[{+smoke}]" );
 		self AddWaypoint();
 	}
 }
 
 watchAutoLinkCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+frag}]", "+frag");
+	self notifyOnPlayerCommand( "[{+frag}]", "+frag" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+frag}]");
+		self waittill( "[{+frag}]" );
-		if(level.autoLink)
+
+		if ( level.autoLink )
 		{
-			self iPrintlnBold("Auto link disabled");
+			self iPrintlnBold( "Auto link disabled" );
 			level.autoLink = false;
 			level.wpToLink = -1;
 		}
 		else
 		{
-			self iPrintlnBold("Auto link enabled");
+			self iPrintlnBold( "Auto link enabled" );
 			level.autoLink = true;
 			level.wpToLink = self.nearest;
 		}
@@ -292,137 +300,148 @@ watchAutoLinkCommand()
 
 watchLinkWaypointCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+melee}]", "+melee");
+	self notifyOnPlayerCommand( "[{+melee}]", "+melee" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+melee}]");
+		self waittill( "[{+melee}]" );
-		self LinkWaypoint(self.nearest);
+		self LinkWaypoint( self.nearest );
 	}
 }
 
 watchUnlinkWaypointCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+reload}]", "+reload");
+	self notifyOnPlayerCommand( "[{+reload}]", "+reload" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+reload}]");
+		self waittill( "[{+reload}]" );
-		self UnLinkWaypoint(self.nearest);
+		self UnLinkWaypoint( self.nearest );
 	}
 }
 
 watchDeleteWaypointCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+actionslot 3}]", "+actionslot 3");
+	self notifyOnPlayerCommand( "[{+actionslot 3}]", "+actionslot 3" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+actionslot 3}]");
+		self waittill( "[{+actionslot 3}]" );
-		self DeleteWaypoint(self.nearest);
+		self DeleteWaypoint( self.nearest );
 	}
 }
 
 watchDeleteAllWaypointsCommand()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
-	self endon("death");
+	self endon( "death" );
 
-	self notifyOnPlayerCommand("[{+actionslot 4}]", "+actionslot 4");
+	self notifyOnPlayerCommand( "[{+actionslot 4}]", "+actionslot 4" );
-	for( ;; )
+
+	for ( ;; )
 	{
-		self waittill("[{+actionslot 4}]");
+		self waittill( "[{+actionslot 4}]" );
 		self DeleteAllWaypoints();
 	}
 }
 
 watchSaveWaypointsCommand()
 {
-	self endon("death");
+	self endon( "death" );
-	self endon("disconnect");
+	self endon( "disconnect" );
 
-	self notifyOnPlayerCommand("[{+actionslot 1}]", "+actionslot 1");
+	self notifyOnPlayerCommand( "[{+actionslot 1}]", "+actionslot 1" );
-	for(;;)
+
+	for ( ;; )
 	{
-		self waittill("[{+actionslot 1}]");
+		self waittill( "[{+actionslot 1}]" );
 
 		self checkForWarnings();
 		wait 1;
 
-		logprint("***********ABiliTy's WPDump**************\n\n");
+		logprint( "***********ABiliTy's WPDump**************\n\n" );
-		logprint("\n\n\n\n");
+		logprint( "\n\n\n\n" );
-		mpnm=getMapName(getdvar("mapname"));
+		mpnm = getMapName( getdvar( "mapname" ) );
-		logprint("\n\n"+mpnm+"()\n{\n/*");
+		logprint( "\n\n" + mpnm + "()\n{\n/*" );
-		logprint("*/waypoints = [];\n/*");
+		logprint( "*/waypoints = [];\n/*" );
-		for(i = 0; i < level.waypointCount; i++)
+
+		for ( i = 0; i < level.waypointCount; i++ )
 		{
-			logprint("*/waypoints["+i+"] = spawnstruct();\n/*");
+			logprint( "*/waypoints[" + i + "] = spawnstruct();\n/*" );
-			logprint("*/waypoints["+i+"].origin = "+level.waypoints[i].origin+";\n/*");
+			logprint( "*/waypoints[" + i + "].origin = " + level.waypoints[i].origin + ";\n/*" );
-			logprint("*/waypoints["+i+"].type = \""+level.waypoints[i].type+"\";\n/*");
+			logprint( "*/waypoints[" + i + "].type = \"" + level.waypoints[i].type + "\";\n/*" );
-			logprint("*/waypoints["+i+"].childCount = "+level.waypoints[i].childCount+";\n/*");
+
-			for(c = 0; c < level.waypoints[i].childCount; c++)
+			for ( c = 0; c < level.waypoints[i].children.size; c++ )
 			{
-				logprint("*/waypoints["+i+"].children["+c+"] = "+level.waypoints[i].children[c]+";\n/*");
+				logprint( "*/waypoints[" + i + "].children[" + c + "] = " + level.waypoints[i].children[c] + ";\n/*" );
 			}
-			if(isDefined(level.waypoints[i].angles) && (level.waypoints[i].type == "claymore" || level.waypoints[i].type == "tube" || (level.waypoints[i].type == "crouch" && level.waypoints[i].childCount == 1) || level.waypoints[i].type == "climb" || level.waypoints[i].type == "grenade"))
-				logprint("*/waypoints["+i+"].angles = "+level.waypoints[i].angles+";\n/*");
 
-			if (isDefined(level.waypoints[i].jav_point) && level.waypoints[i].type == "javelin")
+			if ( isDefined( level.waypoints[i].angles ) && ( level.waypoints[i].type == "claymore" || level.waypoints[i].type == "tube" || ( level.waypoints[i].type == "crouch" && level.waypoints[i].children.size == 1 ) || level.waypoints[i].type == "climb" || level.waypoints[i].type == "grenade" ) )
-				logprint("*/waypoints["+i+"].jav_point = "+level.waypoints[i].jav_point+";\n/*");
+				logprint( "*/waypoints[" + i + "].angles = " + level.waypoints[i].angles + ";\n/*" );
+
+			if ( isDefined( level.waypoints[i].jav_point ) && level.waypoints[i].type == "javelin" )
+				logprint( "*/waypoints[" + i + "].jav_point = " + level.waypoints[i].jav_point + ";\n/*" );
 		}
-		logprint("*/return waypoints;\n}\n\n\n\n");
 
-		filename = "waypoints/" + getdvar("mapname") + "_wp.csv";
+		logprint( "*/return waypoints;\n}\n\n\n\n" );
 
-		PrintLn("********* Start Bot Warfare WPDump *********");
+		filename = "waypoints/" + getdvar( "mapname" ) + "_wp.csv";
-		PrintLn(level.waypointCount);
 
-		fileWrite(filename, level.waypointCount+"\n", "write");
+		PrintLn( "********* Start Bot Warfare WPDump *********" );
-		for(i = 0; i < level.waypointCount; i++)
+		PrintLn( level.waypointCount );
+
+		fileWrite( filename, level.waypointCount + "\n", "write" );
+
+		for ( i = 0; i < level.waypointCount; i++ )
 		{
 			str = "";
 			wp = level.waypoints[i];
 
 			str += wp.origin[0] + " " + wp.origin[1] + " " + wp.origin[2] + ",";
 
-			for(h = 0; h < wp.childCount; h++)
+			for ( h = 0; h < wp.children.size; h++ )
 			{
 				str += wp.children[h];
 
-				if (h < wp.childCount - 1)
+				if ( h < wp.children.size - 1 )
 					str += " ";
 			}
+
 			str += "," + wp.type + ",";
 
-			if (isDefined(wp.angles))
+			if ( isDefined( wp.angles ) )
 				str += wp.angles[0] + " " + wp.angles[1] + " " + wp.angles[2] + ",";
 			else
 				str += ",";
 
-			if (isDefined(wp.jav_point))
+			if ( isDefined( wp.jav_point ) )
 				str += wp.jav_point[0] + " " + wp.jav_point[1] + " " + wp.jav_point[2] + ",";
 			else
 				str += ",";
 
-			PrintLn(str);
+			PrintLn( str );
-			fileWrite(filename, str+"\n", "append");
+			fileWrite( filename, str + "\n", "append" );
 		}
-		PrintLn("\n\n\n\n\n\n");
 
-		self iprintln("Saved!!! to " + filename);
+		PrintLn( "\n\n\n\n\n\n" );
+
+		self iprintln( "Saved!!! to " + filename );
 	}
 }
 
 LoadWaypoints()
 {
 	self DeleteAllWaypoints();
-	self iPrintlnBold("Loading WPS...");
+	self iPrintlnBold( "Loading WPS..." );
 	load_waypoints();
 
 	wait 1;
@@ -432,120 +451,132 @@ LoadWaypoints()
 
 checkForWarnings()
 {
-	if(level.waypointCount <= 0)
+	if ( level.waypointCount <= 0 )
-		self iprintln("WARNING: waypointCount is "+level.waypointCount);
+		self iprintln( "WARNING: waypointCount is " + level.waypointCount );
 
-	if(level.waypointCount != level.waypoints.size)
+	if ( level.waypointCount != level.waypoints.size )
-		self iprintln("WARNING: waypointCount is not "+level.waypoints.size);
+		self iprintln( "WARNING: waypointCount is not " + level.waypoints.size );
 
-	for(i = 0; i < level.waypointCount; i++)
+	for ( i = 0; i < level.waypointCount; i++ )
 	{
-		if(!isDefined(level.waypoints[i]))
+		if ( !isDefined( level.waypoints[i] ) )
 		{
-			self iprintln("WARNING: waypoint "+i+" is undefined");
+			self iprintln( "WARNING: waypoint " + i + " is undefined" );
 			continue;
 		}
 
-		if(level.waypoints[i].childCount <= 0)
+		if ( level.waypoints[i].children.size <= 0 )
-			self iprintln("WARNING: waypoint "+i+" childCount is "+level.waypoints[i].childCount);
+			self iprintln( "WARNING: waypoint " + i + " childCount is " + level.waypoints[i].children.size );
 		else
 		{
-			if (!isDefined(level.waypoints[i].children) || !isDefined(level.waypoints[i].children.size))
+			if ( !isDefined( level.waypoints[i].children ) || !isDefined( level.waypoints[i].children.size ) )
 			{
-				self iprintln("WARNING: waypoint "+i+" children is not defined");
+				self iprintln( "WARNING: waypoint " + i + " children is not defined" );
 			}
 			else
 			{
-				if(level.waypoints[i].childCount != level.waypoints[i].children.size)
+				for ( h = level.waypoints[i].children.size - 1; h >= 0; h-- )
-					self iprintln("WARNING: waypoint "+i+" childCount is not "+level.waypoints[i].children.size);
-				
-				for (h = 0; h < level.waypoints[i].childCount; h++)
 				{
 					child = level.waypoints[i].children[h];
 
-					if(!isDefined(level.waypoints[child]))
+					if ( !isDefined( level.waypoints[child] ) )
-						self iprintln("WARNING: waypoint "+i+" child "+child+" is undefined");
+						self iprintln( "WARNING: waypoint " + i + " child " + child + " is undefined" );
-					else if(child == i)
+					else if ( child == i )
-						self iprintln("WARNING: waypoint "+i+" child "+child+" is itself");
+						self iprintln( "WARNING: waypoint " + i + " child " + child + " is itself" );
 				}
 			}
 		}
 
-		if(!isDefined(level.waypoints[i].type))
+		if ( !isDefined( level.waypoints[i].type ) )
 		{
-			self iprintln("WARNING: waypoint "+i+" type is undefined");
+			self iprintln( "WARNING: waypoint " + i + " type is undefined" );
 			continue;
 		}
 
-		if (level.waypoints[i].type == "javelin" && !isDefined(level.waypoints[i].jav_point))
+		if ( level.waypoints[i].type == "javelin" && !isDefined( level.waypoints[i].jav_point ) )
-			self iprintln("WARNING: waypoint "+i+" jav_point is undefined");
+			self iprintln( "WARNING: waypoint " + i + " jav_point is undefined" );
 
-		if(!isDefined(level.waypoints[i].angles) && (level.waypoints[i].type == "claymore" || level.waypoints[i].type == "tube" || (level.waypoints[i].type == "crouch" && level.waypoints[i].childCount == 1) || level.waypoints[i].type == "climb" || level.waypoints[i].type == "grenade"))
+		if ( !isDefined( level.waypoints[i].angles ) && ( level.waypoints[i].type == "claymore" || level.waypoints[i].type == "tube" || ( level.waypoints[i].type == "crouch" && level.waypoints[i].children.size == 1 ) || level.waypoints[i].type == "climb" || level.waypoints[i].type == "grenade" ) )
-			self iprintln("WARNING: waypoint "+i+" angles is undefined");
+			self iprintln( "WARNING: waypoint " + i + " angles is undefined" );
 	}
+
+	// check reachability, assume bidirectional graph
+
+	wpIdx = randomInt( level.waypointCount );
+
+	for ( i = 0; i < level.waypointCount; i++ )
+	{
+		if ( i % 5 == 0 )
+			wait 0.05;
+
+		astar = AStarSearch( level.waypoints[wpIdx].origin, level.waypoints[i].origin, undefined, true );
+
+		if ( astar.size <= 0 )
+			self iprintln( "WARNING: waypoint " + wpIdx + " has no path to waypoint " + i );
+	}
+
+	self iprintln( "Waypoint warnings check completed." );
 }
 
-UnLinkWaypoint(nwp)
+UnLinkWaypoint( nwp )
 {
-	if(nwp == -1 || distance(self.origin, level.waypoints[nwp].origin) > getDvarFloat("bots_main_debug_minDist"))
+	if ( nwp == -1 || distance( self.origin, level.waypoints[nwp].origin ) > getDvarFloat( "bots_main_debug_minDist" ) )
 	{
-		self iprintln("Waypoint Unlink Cancelled "+level.wpToLink);
+		self iprintln( "Waypoint Unlink Cancelled " + level.wpToLink );
 		level.wpToLink = -1;
 		return;
 	}
 
-	if(level.wpToLink == -1 || nwp == level.wpToLink)
+	if ( level.wpToLink == -1 || nwp == level.wpToLink )
 	{
 		level.wpToLink = nwp;
-		self iprintln("Waypoint Unlink Started "+nwp);
+		self iprintln( "Waypoint Unlink Started " + nwp );
 		return;
 	}
 
-	level.waypoints[nwp].children = array_remove(level.waypoints[nwp].children, level.wpToLink);
+	level.waypoints[nwp].children = array_remove( level.waypoints[nwp].children, level.wpToLink );
-	level.waypoints[level.wpToLink].children = array_remove(level.waypoints[level.wpToLink].children, nwp);
+	level.waypoints[level.wpToLink].children = array_remove( level.waypoints[level.wpToLink].children, nwp );
 
-	level.waypoints[nwp].childCount = level.waypoints[nwp].children.size;
+	self iprintln( "Waypoint " + nwp + " Broken to " + level.wpToLink );
-	level.waypoints[level.wpToLink].childCount = level.waypoints[level.wpToLink].children.size;
-	
-	self iprintln("Waypoint " + nwp + " Broken to " + level.wpToLink);
 	level.wpToLink = -1;
 }
 
-LinkWaypoint(nwp)
+LinkWaypoint( nwp )
 {
-	if(nwp == -1 || distance(self.origin, level.waypoints[nwp].origin) > getDvarFloat("bots_main_debug_minDist"))
+	if ( nwp == -1 || distance( self.origin, level.waypoints[nwp].origin ) > getDvarFloat( "bots_main_debug_minDist" ) )
 	{
-		self iprintln("Waypoint Link Cancelled "+level.wpToLink);
+		self iprintln( "Waypoint Link Cancelled " + level.wpToLink );
 		level.wpToLink = -1;
 		return;
 	}
 
-	if(level.wpToLink == -1 || nwp == level.wpToLink)
+	if ( level.wpToLink == -1 || nwp == level.wpToLink )
 	{
 		level.wpToLink = nwp;
-		self iprintln("Waypoint Link Started "+nwp);
+		self iprintln( "Waypoint Link Started " + nwp );
 		return;
 	}
 
 	weGood = true;
-	for (i = 0; i < level.waypoints[level.wpToLink].childCount; i++)
+
+	for ( i = level.waypoints[level.wpToLink].children.size - 1; i >= 0; i-- )
 	{
 		child = level.waypoints[level.wpToLink].children[i];
 
-		if(child == nwp)
+		if ( child == nwp )
 		{
 			weGood = false;
 			break;
 		}
 	}
 
-	if(weGood)
+	if ( weGood )
 	{
-		for (i = 0; i < level.waypoints[nwp].childCount; i++)
+		for ( i = level.waypoints[nwp].children.size - 1; i >= 0; i-- )
 		{
 			child = level.waypoints[nwp].children[i];
 
-			if(child == level.wpToLink)
+			if ( child == level.wpToLink )
 			{
 				weGood = false;
 				break;
@@ -553,46 +584,42 @@ LinkWaypoint(nwp)
 		}
 	}
 
-	if (!weGood )
+	if ( !weGood )
 	{
-		self iprintln("Waypoint Link Cancelled "+nwp+" and "+level.wpToLink+" already linked.");
+		self iprintln( "Waypoint Link Cancelled " + nwp + " and " + level.wpToLink + " already linked." );
 		level.wpToLink = -1;
 		return;
 	}
 
-	level.waypoints[level.wpToLink].children[level.waypoints[level.wpToLink].childcount] = nwp;
+	level.waypoints[level.wpToLink].children[level.waypoints[level.wpToLink].children.size] = nwp;
-	level.waypoints[level.wpToLink].childcount++;
+	level.waypoints[nwp].children[level.waypoints[nwp].children.size] = level.wpToLink;
-	level.waypoints[nwp].children[level.waypoints[nwp].childcount] = level.wpToLink;
-	level.waypoints[nwp].childcount++;
 
-	self iprintln("Waypoint " + nwp + " Linked to " + level.wpToLink);
+	self iprintln( "Waypoint " + nwp + " Linked to " + level.wpToLink );
 	level.wpToLink = -1;
 }
 
-DeleteWaypoint(nwp)
+DeleteWaypoint( nwp )
 {
-	if(nwp == -1 || distance(self.origin, level.waypoints[nwp].origin) > getDvarFloat("bots_main_debug_minDist"))
+	if ( nwp == -1 || distance( self.origin, level.waypoints[nwp].origin ) > getDvarFloat( "bots_main_debug_minDist" ) )
 	{
-		self iprintln("No close enough waypoint to delete.");
+		self iprintln( "No close enough waypoint to delete." );
 		return;
 	}
 
 	level.wpToLink = -1;
 
-	for (i = 0; i < level.waypoints[nwp].childCount; i++)
+	for ( i = level.waypoints[nwp].children.size - 1; i >= 0; i-- )
 	{
 		child = level.waypoints[nwp].children[i];
 
-		level.waypoints[child].children = array_remove(level.waypoints[child].children, nwp);
+		level.waypoints[child].children = array_remove( level.waypoints[child].children, nwp );
-		
-		level.waypoints[child].childCount = level.waypoints[child].children.size;
 	}
 
-	for(i = 0; i < level.waypointCount; i++)
+	for ( i = 0; i < level.waypointCount; i++ )
 	{
-		for(h = 0; h < level.waypoints[i].childCount; h++)
+		for ( h = level.waypoints[i].children.size - 1; h >= 0; h-- )
 		{
-			if(level.waypoints[i].children[h] > nwp)
+			if ( level.waypoints[i].children[h] > nwp )
 				level.waypoints[i].children[h]--;
 		}
 	}
@@ -601,18 +628,20 @@ DeleteWaypoint(nwp)
 	{
 		if ( entry == nwp )
 		{
-			while ( entry < level.waypointCount-1 )
+			while ( entry < level.waypointCount - 1 )
 			{
-				level.waypoints[entry] = level.waypoints[entry+1];
+				level.waypoints[entry] = level.waypoints[entry + 1];
 				entry++;
 			}
+
 			level.waypoints[entry] = undefined;
 			break;
 		}
 	}
+
 	level.waypointCount--;
 
-	self iprintln("DelWp "+nwp);
+	self iprintln( "DelWp " + nwp );
 }
 
 AddWaypoint()
@@ -622,15 +651,15 @@ AddWaypoint()
 	pos = self getOrigin();
 	level.waypoints[level.waypointCount].origin = pos;
 
-	if (isDefined(self.javelinTargetPoint))
+	if ( isDefined( self.javelinTargetPoint ) )
 		level.waypoints[level.waypointCount].type = "javelin";
-	else if(self AdsButtonPressed())
+	else if ( self AdsButtonPressed() )
 		level.waypoints[level.waypointCount].type = "climb";
-	else if(self AttackButtonPressed() && self UseButtonPressed())
+	else if ( self AttackButtonPressed() && self UseButtonPressed() )
 		level.waypoints[level.waypointCount].type = "tube";
-	else if(self AttackButtonPressed())
+	else if ( self AttackButtonPressed() )
 		level.waypoints[level.waypointCount].type = "grenade";
-	else if(self UseButtonPressed())
+	else if ( self UseButtonPressed() )
 		level.waypoints[level.waypointCount].type = "claymore";
 	else
 		level.waypoints[level.waypointCount].type = self getStance();
@@ -638,22 +667,21 @@ AddWaypoint()
 	level.waypoints[level.waypointCount].angles = self getPlayerAngles();
 
 	level.waypoints[level.waypointCount].children = [];
-	level.waypoints[level.waypointCount].childCount = 0;
 
-	if (level.waypoints[level.waypointCount].type == "javelin")
+	if ( level.waypoints[level.waypointCount].type == "javelin" )
 	{
 		level.waypoints[level.waypointCount].jav_point = self.javelinTargetPoint;
 	}
 
-	self iprintln(level.waypoints[level.waypointCount].type + " Waypoint "+ level.waypointCount +" Added at "+pos);
+	self iprintln( level.waypoints[level.waypointCount].type + " Waypoint " + level.waypointCount + " Added at " + pos );
 
-	if(level.autoLink)
+	if ( level.autoLink )
 	{
-		if(level.wpToLink == -1)
+		if ( level.wpToLink == -1 )
 			level.wpToLink = level.waypointCount - 1;
 
 		level.waypointCount++;
-		self LinkWaypoint(level.waypointCount - 1);
+		self LinkWaypoint( level.waypointCount - 1 );
 	}
 	else
 	{
@@ -665,15 +693,8 @@ DeleteAllWaypoints()
 {
 	level.waypoints = [];
 	level.waypointCount = 0;
-	level.waypointsKDTree = WaypointsToKDTree();
 
-	level.waypointsCamp = [];
+	self iprintln( "DelAllWps" );
-	level.waypointsTube = [];
-	level.waypointsGren = [];
-	level.waypointsClay = [];
-	level.waypointsJav = [];
-	
-	self iprintln("DelAllWps");
 }
 
 buildChildCountString ( wp )
@@ -681,7 +702,7 @@ buildChildCountString ( wp )
 	if ( wp == -1 )
 		return "";
 
-	wpstr = level.waypoints[wp].childCount + "";
+	wpstr = level.waypoints[wp].children.size + "";
 
 	return wpstr;
 }
@@ -693,12 +714,12 @@ buildChildString( wp )
 
 	wpstr = "";
 
-	for(i = 0; i < level.waypoints[wp].childCount; i++)
+	for ( i = 0; i < level.waypoints[wp].children.size; i++ )
 	{
-		if(i != 0)
+		if ( i != 0 )
 			wpstr = wpstr + "," + level.waypoints[wp].children[i];
 		else
-			wpstr= wpstr + level.waypoints[wp].children[i];
+			wpstr = wpstr + level.waypoints[wp].children[i];
 	}
 
 	return wpstr;
@@ -712,17 +733,17 @@ buildTypeString( wp )
 	return level.waypoints[wp].type;
 }
 
-destroyOnDeath(hud)
+destroyOnDeath( hud )
 {
-	hud endon("death");
+	hud endon( "death" );
-	self waittill_either("death","disconnect");
+	self waittill_either( "death", "disconnect" );
 	hud destroy();
 }
 
-initHudElem(txt, xl, yl)
+initHudElem( txt, xl, yl )
 {
 	hud = NewClientHudElem( self );
-	hud setText(txt);
+	hud setText( txt );
 	hud.alignX = "left";
 	hud.alignY =  "top";
 	hud.horzAlign =  "left";
@@ -746,7 +767,7 @@ initHudElem(txt, xl, yl)
 initHudElem2()
 {
 	infotext = NewHudElem();
-	infotext setText("^1[{+smoke}]-AddWp ^2[{+melee}]-LinkWp ^3[{+reload}]-UnLinkWp ^4[{+actionslot 3}]-DeleteWp ^5[{+actionslot 4}]-DelAllWps ^6[{+actionslot 2}]-LoadWPS ^7[{+actionslot 1}]-SaveWp");
+	infotext setText( "^1[{+smoke}]-AddWp ^2[{+melee}]-LinkWp ^3[{+reload}]-UnLinkWp ^4[{+actionslot 3}]-DeleteWp ^5[{+actionslot 4}]-DelAllWps ^6[{+actionslot 2}]-LoadWPS ^7[{+actionslot 1}]-SaveWp" );
 	infotext.alignX = "center";
 	infotext.alignY = "bottom";
 	infotext.horzAlign = "center";
@@ -769,7 +790,7 @@ initHudElem2()
 
 initHudElem3()
 {
-	bar = level createServerBar((0.5, 0.5, 0.5), 1000, 25);
+	bar = level createServerBar( ( 0.5, 0.5, 0.5 ), 1000, 25 );
 	bar.alignX = "center";
 	bar.alignY = "bottom";
 	bar.horzAlign = "center";
@@ -791,7 +812,7 @@ initHudElem4()
 	OptionsBG.alignY = "top";
 	OptionsBG.horzAlign = "left";
 	OptionsBG.vertAlign = "top";
-	OptionsBG setshader("black", 200, 60);
+	OptionsBG setshader( "black", 200, 60 );
 	OptionsBG.alpha = 0.4;
 
 	self thread destroyOnDeath( OptionsBG );

userraw/maps/mp/gametypes/_damage.gsc

@@ -1460,7 +1460,7 @@ Callback_PlayerDamage_internal( eInflictor, eAttacker, victim, iDamage, iDFlags,
 
 		if ( attackerIsNPC && isDefined( eAttacker.gunner ) )
 			damager = eAttacker.gunner;
-		else if( level.extraDamageFeedback && isDefined( eAttacker.owner ) )
+		else if( level.extraDamageFeedback && isDefined( eAttacker ) && isDefined( eAttacker.owner ) )
 			damager = eAttacker.owner;
 		else
 			damager = eAttacker;
@@ -1592,17 +1592,62 @@ Callback_PlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, s
 }
 
 
+doPrintDamage(dmg, hitloc, flags)
+{
+	self endon( "disconnect" );
+
+	huddamage = newclienthudelem(self);
+	huddamage.alignx = "center";
+	huddamage.horzalign = "center";
+	huddamage.x = 10;
+	huddamage.y = 235;
+	huddamage.fontscale = 1.6;
+	huddamage.font = "objective";
+	huddamage setvalue(dmg);
+
+	if ((flags & level.iDFLAGS_RADIUS) != 0)
+		huddamage.color = (0.25, 0.25, 0.25);
+
+	if ((flags & level.iDFLAGS_PENETRATION) != 0)
+		huddamage.color = (1, 1, 0.25);
+
+	if (hitloc == "head")
+		huddamage.color = (1, 0.25, 0.25);
+
+	huddamage moveovertime(1);
+	huddamage fadeovertime(1);
+	huddamage.alpha = 0;
+	huddamage.x = randomIntRange(25, 70);
+
+	val = 1;
+	if (cointoss())
+		val = -1;
+	
+	huddamage.y = 235 + randomIntRange(25, 70) * val;
+
+	wait 1;
+
+	if ( isDefined( huddamage ) )
+		huddamage destroy();
+}
+
+
 finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime, stunFraction )
 {
 	if( level.allowPrintDamage )
 	{
-		if ( isDefined( eAttacker ) && isPlayer( eAttacker ) && eAttacker.printDamage )
+		if ( !isDefined( eAttacker ) )
-			eAttacker iPrintLnBold( iDamage );
+		{
+			if ( !isDefined( eInflictor ) && self.printDamage )
+				self thread doPrintDamage( iDamage, sHitLoc, iDFlags );
+		}
+		else if ( isPlayer( eAttacker ) && eAttacker.printDamage )
+			eAttacker thread doPrintDamage( iDamage, sHitLoc, iDFlags );
 		else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage )
-			eAttacker.owner iPrintLnBold( iDamage );
+			eAttacker.owner thread doPrintDamage( iDamage, sHitLoc, iDFlags );
 	}
 	
-	if( level.extraDamageFeedback )
+	if( isDefined( eAttacker ) && level.extraDamageFeedback )
 	{
 		if( sWeapon == "nuke_mp" )
 		{
@@ -1618,7 +1663,7 @@ finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeat
 
 		if( sHitLoc == "head" || sHitLoc == "helmet" )
 		{
-			if ( isDefined( eAttacker ) && isPlayer( eAttacker ) )
+			if ( isPlayer( eAttacker ) )
 				eAttacker playLocalSound( "bullet_impact_headshot_2" );
 			else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) )
 				eAttacker.owner playLocalSound( "bullet_impact_headshot_2" );

userraw/maps/mp/gametypes/_persistence.gsc

@@ -64,6 +64,9 @@ statSet( dataName, value )
 	if ( !self rankingEnabled() )
 		return;
 
+	if (getDvarInt("developer_script"))
+		return;
+
 	self SetPlayerData( dataName, value );
 }
 
@@ -81,6 +84,9 @@ statAdd( dataName, value )
 	if ( !self rankingEnabled() )
 		return;
 
+	if (getDvarInt("developer_script"))
+		return;
+
 	curValue = self GetPlayerData( dataName );
 	self SetPlayerData( dataName, value + curValue );
 }
@@ -97,6 +103,9 @@ statSetChild( parent, child, value )
 	if ( !self rankingEnabled() )
 		return;
 
+	if (getDvarInt("developer_script"))
+		return;
+
 	self SetPlayerData( parent, child, value );
 }
 
@@ -108,6 +117,9 @@ statAddChild( parent, child, value )
 	if ( !self rankingEnabled() )
 		return;
 
+	if (getDvarInt("developer_script"))
+		return;
+
 	curValue = self GetPlayerData( parent, child );
 	self SetPlayerData( parent, child, curValue + value );
 }

userraw/maps/mp/gametypes/_spawnlogic.gsc

@@ -609,6 +609,8 @@ getSpawnpoint_NearTeam( spawnpoints, favoredspawnpoints )
 	obj = spawnstruct();
 	
 	alliedDistanceWeight = 2;
+	if ( getDVar( "scr_alliedDistanceWeight" ) != "" )
+		alliedDistanceWeight = getDVarFloat( "scr_alliedDistanceWeight" );
 	
 	//prof_begin(" spawn_basicsumdists");
 	myTeam = self.team;

userraw/maps/mp/gametypes/_weapons.gsc

@@ -1572,7 +1572,7 @@ setClaymoreTeamHeadIcon( team )
 {
 	self endon( "death" );
 	
-	if ( self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace )
+	if ( isDefined( self.weaponname ) && self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace )
 	{
 		self waittill( "missile_stuck" );
 		self waittill( "claymore_trace_fixed" );
@@ -1580,6 +1580,9 @@ setClaymoreTeamHeadIcon( team )
 	else
 		wait 0.05;
 
+	if ( !isDefined( self ) )
+		return;
+	
 	if ( isDefined( self.entityHeadIcon ) )
 	{
 		self.entityHeadIconTeam = "none";
@@ -2689,6 +2692,42 @@ detach_hip_weapon()
 }
 
 
+FixHideTagList( hideTagList, stowWeapon )
+{
+	answer = [];
+
+	for ( i = 0; i < hideTagList.size; i++ )
+	{
+		tag = hideTagList[ i ];
+
+		if ( stowWeapon == "weapon_ak74u" )
+		{
+			if ( tag == "tag_reflex_sight" || tag == "tag_acog" || tag == "tag_ak47_mount" )
+				continue;
+		}
+		else if ( stowWeapon == "weapon_ak47_classic" )
+		{
+			if ( tag == "tag_reflex_sight" || tag == "tag_acog" || tag == "tag_ak47_mount" )
+				continue;
+		}
+		else if ( stowWeapon == "worldmodel_bo2_peacekeeper" )
+		{
+			if ( tag == "tag_holo" || tag == "tag_reflex" || tag == "tag_silencer" )
+				continue;
+		}
+		else if ( stowWeapon == "weapon_beretta" )
+		{
+			if ( tag == "tag_knife" )
+				continue;
+		}
+
+		answer[ answer.size ] = tag;
+	}
+
+	return answer;
+}
+
+
 stow_on_back()
 {
 	prof_begin( "stow_on_back" );
@@ -2779,6 +2818,8 @@ stow_on_back()
 		return;
 	}
 	
+	hideTagList = FixHideTagList( hideTagList, self.tag_stowed_back );
+
 	for ( i = 0; i < hideTagList.size; i++ )
 		self HidePart( hideTagList[ i ], self.tag_stowed_back );
 	
@@ -2816,6 +2857,8 @@ stow_on_hip()
 	if ( !isDefined( hideTagList ) )
 		return;
 
+	hideTagList = FixHideTagList( hideTagList, self.tag_stowed_hip );
+	
 	for ( i = 0; i < hideTagList.size; i++ )
 		self HidePart( hideTagList[ i ], self.tag_stowed_hip );
 }

userraw/maps/mp/gametypes/vip.gsc

@@ -0,0 +1,454 @@
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+/*
+	VIP
+	Objective: 	Escort the VIP to safety, or eliminate the VIP beofore he reaches extraction
+	Map ends:	When one team eliminates the enemy team, or the flag is reached
+	Respawning:	Beginning of next round
+
+	Level requirementss
+	------------------
+		Spawnpoints:
+			classname		mp_tdm_spawn
+
+
+		Spectator Spawnpoints:
+			classname		mp_global_intermission
+*/
+
+main()
+{
+	if(getdvar("mapname") == "mp_background")
+		return;
+
+	maps\mp\gametypes\_globallogic::init();
+	maps\mp\gametypes\_callbacksetup::SetupCallbacks();
+	maps\mp\gametypes\_globallogic::SetupCallbacks();
+
+	registerRoundSwitchDvar( level.gameType, 0, 0, 9 );
+	registerTimeLimitDvar( level.gameType, 10, 0, 1440 );
+	registerScoreLimitDvar( level.gameType, 500, 0, 5000 );
+	registerRoundLimitDvar( level.gameType, 1, 0, 10 );
+	registerWinLimitDvar( level.gameType, 1, 0, 10 );
+	registerRoundSwitchDvar( level.gameType, 3, 0, 30 );
+	registerNumLivesDvar( level.gameType, 1, 0, 10 );
+	registerWatchDvarInt( "halftime", 0 );
+
+	level.teamBased = true;
+	level.objectiveBased = true;
+
+	level.onPrecacheGameType = ::onPrecacheGameType;
+	level.onStartGameType = ::onStartGameType;
+	level.getSpawnPoint = ::getSpawnPoint;
+	level.onSpawnPlayer = ::onSpawnPlayer;
+	level.onNormalDeath = ::onNormalDeath;
+	level.onPlayerKilled = ::onPlayerKilled;
+	level.onDeadEvent = ::onDeadEvent;
+
+	game["dialog"]["gametype"] = "VIP";
+}
+
+onPrecacheGameType()
+{
+	precacheShader( "compass_waypoint_captureneutral" );
+	precacheShader( "compass_waypoint_capture" );
+	precacheShader( "compass_waypoint_defend" );
+
+	precacheShader( "waypoint_captureneutral" );
+	precacheShader( "waypoint_capture" );
+	precacheShader( "waypoint_defend" );
+
+	precacheString( &"MP_ELIMINATED_VIP" );
+	precacheString( &"MP_DEFENDED_VIP" );
+	precacheString( &"SPLASHES_VIP" );
+
+	game["flagmodels"] = [];
+	game["flagmodels"]["neutral"] = "prop_flag_neutral";
+
+	game["flagmodels"]["allies"] = maps\mp\gametypes\_teams::getTeamFlagModel( "allies" );
+	game["flagmodels"]["axis"] = maps\mp\gametypes\_teams::getTeamFlagModel( "axis" );
+
+	precacheModel( game["flagmodels"]["neutral"] );
+	precacheModel( game["flagmodels"]["allies"] );
+	precacheModel( game["flagmodels"]["axis"] );
+
+}
+
+onStartGameType()
+{
+	setClientNameMode("auto_change");
+
+	if ( !isdefined( game["switchedsides"] ) )
+		game["switchedsides"] = false;
+
+	if ( game["switchedsides"] )
+	{
+		oldAttackers = game["attackers"];
+		oldDefenders = game["defenders"];
+		game["attackers"] = oldDefenders;
+		game["defenders"] = oldAttackers;
+	}
+
+	setObjectiveText( "allies", &"OBJECTIVES_VIP" );
+	setObjectiveText( "axis", &"OBJECTIVES_VIP" );
+
+	if ( level.splitscreen )
+	{
+		setObjectiveScoreText( "allies", &"OBJECTIVES_VIP" );
+		setObjectiveScoreText( "axis", &"OBJECTIVES_VIP" );
+	}
+	else
+	{
+		setObjectiveScoreText( "allies", &"OBJECTIVES_VIP_SCORE" );
+		setObjectiveScoreText( "axis", &"OBJECTIVES_VIP_SCORE" );
+	}
+	setObjectiveHintText( "allies", &"OBJECTIVES_VIP_HINT" );
+	setObjectiveHintText( "axis", &"OBJECTIVES_VIP_HINT" );
+
+	level.spawnMins = ( 0, 0, 0 );
+	level.spawnMaxs = ( 0, 0, 0 );
+	maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_tdm_spawn_allies_start" );
+	maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_tdm_spawn_axis_start" );
+	maps\mp\gametypes\_spawnlogic::addSpawnPoints( "allies", "mp_tdm_spawn" );
+	maps\mp\gametypes\_spawnlogic::addSpawnPoints( "axis", "mp_tdm_spawn" );
+
+	level.mapCenter = maps\mp\gametypes\_spawnlogic::findBoxCenter( level.spawnMins, level.spawnMaxs );
+	setMapCenter( level.mapCenter );
+
+	allowed[0] = "vip";
+	allowed[1] = "sd";
+	allowed[2] = "airdrop_pallet";
+	allowed[3] = "gtnw";
+	allowed[4] = "gtnw_zone";
+	//maps\mp\gametypes\_rank::registerScoreInfo( "capture", 200 );
+
+	maps\mp\gametypes\_gameobjects::main(allowed);
+
+	self thread waitToProcess();
+}
+
+waitToProcess()
+{
+	level endon( "game_end" );
+	level endon( "waitSkipped" );
+
+	self thread extractionZone();
+	self thread skipWait();
+
+	gameFlagWait( "prematch_done" );
+	gameFlagWait( "graceperiod_done" );
+	self notify( "graceComplete" );
+
+	self thread vipSelection();
+}
+
+skipWait()
+{
+	self endon( "graceComplete" );
+
+	for(;;)
+	{
+		if( level.players.size > 2 )
+			break;
+
+		wait( .5 );
+	}
+
+	self notify( "waitSkipped" );
+	self thread vipSelection();
+
+}
+
+getSpawnPoint()
+{
+	spawnteam = self.pers["team"];
+	if ( game["switchedsides"] )
+		spawnteam = getOtherTeam( spawnteam );
+
+	if ( level.inGracePeriod )
+	{
+		spawnPoints = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_tdm_spawn_" + spawnteam + "_start" );
+		spawnPoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random( spawnPoints );
+	}
+	else
+	{
+		spawnPoints = maps\mp\gametypes\_spawnlogic::getTeamSpawnPoints( spawnteam );
+		spawnPoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_NearTeam( spawnPoints );
+	}
+
+	return spawnPoint;
+}
+
+onSpawnPlayer()
+{
+	self.isVip = false;
+	self.usingObj = undefined;
+	level notify ( "spawned_player" );
+}
+
+onNormalDeath( victim, attacker, lifeId )
+{
+	score = maps\mp\gametypes\_rank::getScoreInfoValue( "kill" );
+	assert( isDefined( score ) );
+
+	attacker maps\mp\gametypes\_gamescore::giveTeamScoreForObjective( attacker.pers["team"], score );
+
+	team = victim.team;
+
+	if ( isDefined( victim.isVip ) && victim.isVip )
+	{
+		level thread vip_endGame( game["attackers"], &"MP_ELIMINATED_VIP" );
+		attacker.finalKill = true;
+	}
+}
+
+onPlayerKilled(eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration, killId)
+{
+	thread checkAllowSpectating();
+}
+
+onTimeLimit()
+{
+	if ( game["status"] == "overtime" )
+	{
+		winner = "forfeit";
+	}
+	else if ( game["teamScores"]["allies"] == game["teamScores"]["axis"] )
+	{
+		winner = "overtime";
+	}
+	else if ( game["teamScores"]["axis"] > game["teamScores"]["allies"] )
+	{
+		winner = "axis";
+	}
+	else
+	{
+		winner = "allies";
+	}
+
+	thread maps\mp\gametypes\_gamelogic::endGame( winner, game["strings"]["time_limit_reached"] );
+}
+
+checkAllowSpectating()
+{
+	wait ( 0.05 );
+
+	update = false;
+	if ( !level.aliveCount[ game["attackers"] ] )
+	{
+		level.spectateOverride[game["attackers"]].allowEnemySpectate = 1;
+		update = true;
+	}
+	if ( !level.aliveCount[ game["defenders"] ] )
+	{
+		level.spectateOverride[game["defenders"]].allowEnemySpectate = 1;
+		update = true;
+	}
+	if ( update )
+		maps\mp\gametypes\_spectating::updateSpectateSettings();
+}
+
+onDeadEvent( team )
+{
+	if ( team == game["attackers"] )
+	{
+		level thread vip_endGame( game["defenders"], game["strings"][game["attackers"]+"_eliminated"] );
+	}
+	else if ( team == game["defenders"] )
+	{
+		level thread vip_endGame( game["attackers"], game["strings"][game["defenders"]+"_eliminated"] );
+	}
+}
+
+vip_endGame( winningTeam, endReasonText )
+{
+	thread maps\mp\gametypes\_gamelogic::endGame( winningTeam, endReasonText );
+}
+
+vipSelection()
+{
+	println( "SELECTION" );
+	potentialVIPs = [];
+	abortTime = 0;
+
+	for( ;; )
+	{
+		if ( level.players.size >= 2 )
+			break;
+
+		if ( abortTime >= 100 )
+		{
+			iPrintlnBold( "Game mode only playable with 2 or more players" );
+			wait( 2 );
+			maps\mp\gametypes\_callbacksetup::AbortLevel();
+		}
+
+		abortTime++;
+		wait( .1 );
+	}
+
+	foreach ( player in level.players )
+	{
+		if ( player.team == game["defenders"] )
+			potentialVIPs[ potentialVIPs.size ] = player;
+	}
+
+	selectedVIPNum = RandomIntRange( 0, potentialVIPs.size );
+	selectedPlayer = potentialVIPs[ selectedVIPNum ];
+
+	if ( !isAlive(selectedPlayer ) && !isSubStr( selectedPlayer.guid, "bot" ) )
+		selectedPlayer forceVIPSpawn();
+
+	setupVip( selectedPlayer );
+}
+
+setupVip ( vipPlayer )
+{
+	vipPlayer TakeAllWeapons();
+	vipPlayer _clearPerks();
+
+	vipPlayer.isVip = true;
+
+	vipPlayer giveWeapon( "deserteagle_fmj_mp" );
+	vipPlayer giveStartAmmo( "deserteagle_fmj_mp" );
+
+	vipPlayer giveWeapon( "riotshield_mp" );
+	vipPlayer switchToWeapon( "riotshield_mp" );
+
+	vipPlayer _setPerk( "specialty_armorvest" );
+	vipPlayer _setPerk( "specialty_finalstand" );
+
+	vipPlayer iPrintlnBold( "You Are the VIP" );
+	//TO DO: add defend icon on the VIP
+}
+
+extractionZone()
+{
+	extractionZones = getEntArray("extraction_vip", "targetname");
+
+	// check to see if zone is available.
+	if ( !extractionZones.size )
+	{
+		println("WARNING: no extraction zone specified" );
+
+		printLn( "^1Not enough extraction zones found in level!" );
+
+		extractionZones = getEntArray( "gtnw_zone", "targetname" );
+
+		if (!extractionZones.size)
+		{
+			maps\mp\gametypes\_callbacksetup::AbortLevel();
+			return;
+		}
+	}
+
+	trigger = extractionZones[0];
+	if ( isDefined( trigger.target ) )
+	{
+		visuals[0] = getEnt( trigger.target, "targetname" );
+	}
+	else
+	{
+		visuals[0] = spawn( "script_model", trigger.origin );
+		visuals[0].angles = trigger.angles;
+	}
+
+	extractionZone = maps\mp\gametypes\_gameobjects::createUseObject( game["defenders"], trigger, visuals, (0,0,100) );
+	extractionZone maps\mp\gametypes\_gameobjects::allowUse( "friendly" );
+	extractionZone maps\mp\gametypes\_gameobjects::setVisibleTeam( "none" );
+	extractionZone maps\mp\gametypes\_gameobjects::setUseText( &"MP_CALLING_EXTRACTION" );
+	extractionZone maps\mp\gametypes\_gameobjects::setUseTime( 0 );
+
+	extractionZone.onUse = ::onUse;
+	extractionZone.onCantUse = ::onCantUse;
+
+	traceStart = trigger.origin + (0,0,32);
+	traceEnd = trigger.origin + (0,0,-32);
+	trace = bulletTrace( traceStart, traceEnd, false, undefined );
+
+	fx = maps\mp\gametypes\_teams::getTeamFlagFX( game["defenders"] );
+	fxid = loadfx( fx );
+
+	upangles = vectorToAngles( trace["normal"] );
+	forward = anglesToForward( upangles );
+	right = anglesToRight( upangles );
+	thread spawnFxDelay( fxid, trace["position"], forward, right, 0.5 );
+
+	extractionZone maps\mp\gametypes\_gameobjects::set2DIcon( "friendly", "compass_waypoint_defend");
+	extractionZone maps\mp\gametypes\_gameobjects::set3DIcon( "friendly", "waypoint_defend");
+	extractionZone maps\mp\gametypes\_gameobjects::setVisibleTeam( "friendly" );
+
+	level.extractionZone = extractionZone;
+}
+
+setVIPUse()
+{
+	foreach (player in level.players)
+	{
+		if ( ! player.isVip )
+			self.trigger disablePlayerUse(player);
+	}
+}
+
+onUse( player )
+{
+	if ( !isDefined( player.isVip ) || ! player.isVip )
+	{
+		return;
+	}
+
+	iPrintlnBold( "Extraction on its way" );
+	self handleTimer( player );
+}
+
+handleTimer( player )
+{
+	player endon( "death" );
+	level endon( "game_end" );
+
+	level.extractionTime = 45;
+	maps\mp\gametypes\_gamelogic::pauseTimer();
+	level.timeLimitOverride = true;
+	setGameEndTime( int( getTime() + (level.extractionTime * 1000) ) );
+	wait level.extractionTime;
+
+	//call the sentry airdrops
+	level thread vip_endGame( game["defenders"], &"MP_DEFENDED_VIP" );
+}
+
+onEndUse( team, player, success )
+{
+	println( "End Use" );
+}
+
+onCantUse( player )
+{
+//	player iPrintLnBold( &"MP_CANT_PLANT_WITHOUT_BOMB" );
+}
+
+spawnFxDelay( fxid, pos, forward, right, delay )
+{
+	wait delay;
+	effect = spawnFx( fxid, pos, forward, right );
+	triggerFx( effect );
+}
+
+forceVIPSpawn()
+{
+	self endon ( "death" );
+	self endon ( "disconnect" );
+	self endon ( "spawned" );
+
+	if ( self.hasSpawned )
+		return;
+
+	if ( !isValidClass( self.pers["class"] ) )
+	{
+		self.pers["class"] = "CLASS_CUSTOM1";
+
+		self.class = self.pers["class"];
+	}
+
+	self closeMenus();
+	self thread maps\mp\gametypes\_playerlogic::spawnClient();
+}

userraw/maps/mp/killstreaks/_killstreaks.gsc

@@ -231,8 +231,10 @@ waitForChangeTeam()
 	for ( ;; )
 	{
 		self waittill ( "joined_team" );
-		clearKillstreaks();
+		self clearKillstreaks();
-		self clearUsingRemote();
+
+		if ( self isUsingRemote() )
+			self clearUsingRemote();
 	}
 }
 
@@ -702,8 +704,11 @@ giveKillstreakWeapon( weapon )
 		self takeWeapon( item );
 	}
 	
-	self _giveWeapon( weapon, 0 );
+	if ( isDefined( weapon ) && weapon != "" )
-	self _setActionSlot( 4, "weapon", weapon );
+	{
+		self _giveWeapon( weapon, 0 );
+		self _setActionSlot( 4, "weapon", weapon );
+	}
 }
 
 
@@ -858,7 +863,9 @@ clearRideIntro( delay )
 destroyOnEvents(elem)
 {
 	self waittill_either("disconnect", "start_killstreak_hud");
-	elem destroy();
+
+	if ( isDefined( elem ) )
+		elem destroy();
 }
 
 initKillstreakHud(inity)

userraw/maps/mp/perks/_perkfunctions.gsc

@@ -629,8 +629,12 @@ selectOneManArmyClass()
 	level endon ( "game_ended" );
 	
 	self _disableWeaponSwitch();
-	self _disableOffhandWeapons();
+
-	self _disableUsability();
+	if (level.fix_onemanarmyFlareBug)
+	{
+		self _disableOffhandWeapons();
+		self _disableUsability();
+	}
 	
 	self openPopupMenu( game["menu_onemanarmy"] );
 	
@@ -639,22 +643,34 @@ selectOneManArmyClass()
 	self waittill ( "menuresponse", menu, className );
 
 	self _enableWeaponSwitch();
-	self _enableOffhandWeapons();
+	
-	self _enableUsability();
+	if (level.fix_onemanarmyFlareBug)
+	{
+		self _enableOffhandWeapons();
+		self _enableUsability();
+	}
 	
 	if ( className == "back" || !isOneManArmyMenu( menu ) || self isUsingRemote() )
 	{
 		if ( self getCurrentWeapon() == "onemanarmy_mp" )
 		{
 			self _disableWeaponSwitch();
-			self _disableOffhandWeapons();
+
-			self _disableUsability();
+			if (level.fix_onemanarmyFlareBug)
+			{
+					self _disableOffhandWeapons();
+					self _disableUsability();
+			}
 
 			self switchToWeapon( self getLastWeapon() );
 			self waittill ( "weapon_change" );
 			self _enableWeaponSwitch();
-			self _enableOffhandWeapons();
+
-			self _enableUsability();
+			if (level.fix_onemanarmyFlareBug)
+			{
+					self _enableOffhandWeapons();
+					self _enableUsability();
+			}
 		}
 		return;
 	}	

userraw/maps/mp/perks/_perks.gsc

@@ -12,6 +12,9 @@
 		- onemanarmyRefillsTubes <bool>
 			false - (default) One Man Army does not refill the gl attachment
 			true - it does
+
+		- fix_onemanarmyFlareBug <bool>
+			true - (default) fixes it
 */
 
 #include common_scripts\utility;
@@ -200,6 +203,9 @@ init()
 	setDvarIfUninitialized( "onemanarmyRefillsTubes", false );
 	level.onemanarmyRefillsTubes = getDvarInt( "onemanarmyRefillsTubes" );
 
+	setDvarIfUninitialized( "fix_onemanarmyFlareBug", true );
+	level.fix_onemanarmyFlareBug = getDvarInt( "fix_onemanarmyFlareBug" );
+
 	initPerkDvars();
 
 	level thread onPlayerConnect();

userraw/scripts/bots_chat.gsc

@@ -0,0 +1,4 @@
+init()
+{
+	level thread maps\mp\bots\_bot_chat::init();
+}

userraw/scripts/bots_pvb.gsc

@@ -24,64 +24,69 @@ init()
 
 watchSniper()
 {
-	if (getDvar("bot_sniperCheck") == "")
+	if ( getDvar( "bot_sniperCheck" ) == "" )
 		return;
 
-	for (;;)
+	for ( ;; )
 	{
 		wait 15;
+		logPrint("keepalive\n");
 
 		numPlayers = 0;
 		numSnipers = 0;
 
-		for(i = 0; i < level.players.size; i++)
+		for ( i = 0; i < level.players.size; i++ )
 		{
 			player = level.players[i];
-			if (player is_bot())
+
+			if ( player is_bot() )
 				continue;
 
-			if (!isDefined(player.team))
+			if ( !isDefined( player.team ) )
 				continue;
 
 			numPlayers++;
 
-			if (isDefined(player.isSniper) && player.isSniper)
+			if ( isDefined( player.isSniper ) && player.isSniper )
 				numSnipers++;
 		}
 
-		if (numPlayers > 0)
+		if ( numPlayers > 0 )
 		{
-			if (numSnipers / numPlayers >= 0.5)
+			if ( numSnipers / numPlayers >= 0.5 )
-				setDvar("bots_sniperLoadout", 1);
+				setDvar( "bots_sniperLoadout", 1 );
 			else
-				setDvar("bots_sniperLoadout", 0);
+				setDvar( "bots_sniperLoadout", 0 );
 		}
 	}
 }
 
 watchNuke()
 {
-	setDvar("scr_spawnpointfavorweight", "");
+	setDvar( "scr_spawnpointfavorweight", "" );
-	level waittill( "nuke_death" );
+
-	setDvar("scr_spawnpointfavorweight", "499999");
+	for ( i = 0; i < 3; i++ )
+		level waittill( "nuke_death" );
+
+	setDvar( "scr_spawnpointfavorweight", "499999" );
 }
 
 watchBoxmap()
 {
-	if (getDvar("mapname") == "iw4_credits")
+	if ( getDvar( "mapname" ) == "iw4_credits" )
-		setDvar("scr_spawnsimple", 1);
+		setDvar( "scr_spawnsimple", 1 );
 	else
-		setDvar("scr_spawnsimple", 0);
+		setDvar( "scr_spawnsimple", 0 );
 }
 
 watchBotCrackedClass()
 {
-	if(getDvar("bot_pvb_helper_customBotClassTeam") == "")
+	if ( getDvar( "bot_pvb_helper_customBotClassTeam" ) == "" )
-		setDvar("bot_pvb_helper_customBotClassTeam", "");
+		setDvar( "bot_pvb_helper_customBotClassTeam", "" );
 
-	for (;;)
+	for ( ;; )
 	{
-		level waittill("bot_connected", bot);
+		level waittill( "bot_connected", bot );
 
 		bot thread watchBotLoadout();
 	}
@@ -89,20 +94,20 @@ watchBotCrackedClass()
 
 watchBotLoadout()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
 
-	random = randomInt(2);
+	random = randomInt( 2 );
 
-	for (;;)
+	for ( ;; )
 	{
-		self waittill("bot_giveLoadout");
+		self waittill( "bot_giveLoadout" );
 
-		team = getDvar("bot_pvb_helper_customBotClassTeam");
+		team = getDvar( "bot_pvb_helper_customBotClassTeam" );
 
-		if (team == "")
+		if ( team == "" )
 			continue;
 
-		if (self.team != team)
+		if ( self.team != team )
 			continue;
 
 		// clear perks and weapons
@@ -121,7 +126,8 @@ watchBotLoadout()
 		self maps\mp\perks\_perks::givePerk( "semtex_mp" );
 
 		twoStreak = "helicopter_minigun";
-		if (random)
+
+		if ( random )
 			twoStreak = "ac130";
 
 		self maps\mp\gametypes\_class::setKillstreaks( "harrier_airstrike", twoStreak, "nuke" );
@@ -137,27 +143,29 @@ watchBotLoadout()
 
 watchTeams()
 {
-	if(getDvar("bot_pvb_helper_noPlayersOnTeam") == "")
+	if ( getDvar( "bot_pvb_helper_noPlayersOnTeam" ) == "" )
-		setDvar("bot_pvb_helper_noPlayersOnTeam", "");
+		setDvar( "bot_pvb_helper_noPlayersOnTeam", "" );
 
-	for (;;)
+	for ( ;; )
 	{
 		wait 1;
 
-		if (getDvar("bot_pvb_helper_noPlayersOnTeam") == "")
+		if ( getDvar( "bot_pvb_helper_noPlayersOnTeam" ) == "" )
 			continue;
 
-		team = getDvar("bot_pvb_helper_noPlayersOnTeam");
+		team = getDvar( "bot_pvb_helper_noPlayersOnTeam" );
-		for(i = 0; i < level.players.size; i++)
+
+		for ( i = 0; i < level.players.size; i++ )
 		{
 			player = level.players[i];
-			if (player is_bot())
+
+			if ( player is_bot() )
 				continue;
 
-			if (player.team != team)
+			if ( player.team != team )
 				continue;
 
-			if (team == "axis")
+			if ( team == "axis" )
 				player [[level.allies]]();
 			else
 				player [[level.axis]]();
@@ -167,40 +175,42 @@ watchTeams()
 
 onBotSayVar()
 {
-	SetDvar("bot_say", "");
+	SetDvar( "bot_say", "" );
-	for (;;)
+
+	for ( ;; )
 	{
 		wait 0.05;
 
-		toSay = GetDvar("bot_say");
+		toSay = GetDvar( "bot_say" );
-		if (toSay == "")
+
+		if ( toSay == "" )
 			continue;
 
-		bot = random(getBotArray());
+		bot = random( getBotArray() );
 
-		if (!isDefined(bot))
+		if ( !isDefined( bot ) )
 			continue;
 
-		SetDvar("bot_say", "");
+		SetDvar( "bot_say", "" );
-		bot sayall(toSay);
+		bot sayall( toSay );
 	}
 }
 
 onSomeoneSaid()
 {
-	for (;;)
+	for ( ;; )
 	{
-		level waittill("say", string, player);
+		level waittill( "say", string, player );
 
-		PrintConsole(player.name + ": ^7" + string + "\n");
+		PrintConsole( player.name + ": ^7" + string + "\n" );
 	}
 }
 
 onBotConnected()
 {
-	for (;;)
+	for ( ;; )
 	{
-		level waittill("bot_connected", bot);
+		level waittill( "bot_connected", bot );
 
 		bot thread setBotPing();
 	}
@@ -208,12 +218,12 @@ onBotConnected()
 
 setBotPing()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
 
-	for (;;)
+	for ( ;; )
 	{
 		wait 0.05;
 
-		self SetPing(randomIntRange(40, 60));
+		self SetPing( randomIntRange( 40, 60 ) );
 	}
 }

userraw/scripts/bots_sniper_loadout.gsc

@@ -6,15 +6,18 @@
 init()
 {
 	setDvarIfUninitialized( "bots_sniperLoadout", false );
+	setDvarIfUninitialized( "bots_oneHardIsSniper", false );
 
 	level thread onBotConnected();
+
+	level thread watchOneHardIsSniper();
 }
 
 onBotConnected()
 {
-	for (;;)
+	for ( ;; )
 	{
-		level waittill("bot_connected", bot);
+		level waittill( "bot_connected", bot );
 
 		bot thread onBotGivenLoadout();
 	}
@@ -22,43 +25,72 @@ onBotConnected()
 
 onBotGivenLoadout()
 {
-	self endon("disconnect");
+	self endon( "disconnect" );
 
-	for (;;)
+	for ( ;; )
 	{
 		self waittill( "bot_giveLoadout", allowCopycat );
 
-		if (!getDvarInt("bots_sniperLoadout"))
+		if ( !getDvarInt( "bots_sniperLoadout" ) )
 			continue;
 
-		self.pers["bots"]["behavior"]["quickscope"] = true;
+		self give_sniper_loadout();
-
-		// clear perks and weapons
-		self takeAllWeapons();
-		self.specialty = [];
-		self _clearPerks();
-		self maps\mp\gametypes\_class::_detachAll();
-
-		// give perks
-		self maps\mp\perks\_perks::givePerk( "specialty_fastreload" );
-		self maps\mp\perks\_perks::givePerk( "specialty_quickdraw" );
-		self maps\mp\perks\_perks::givePerk( "specialty_bulletdamage" );
-		self maps\mp\perks\_perks::givePerk( "specialty_armorpiercing" );
-		self maps\mp\perks\_perks::givePerk( "specialty_bulletaccuracy" );
-		self maps\mp\perks\_perks::givePerk( "specialty_holdbreath" );
-
-		// give weapons
-		self _giveWeapon( "usp_mp", 0 );
-		self SetWeaponAmmoClip( "usp_mp", 0 );
-		self SetWeaponAmmoStock( "usp_mp", 0 );
-
-		self _giveWeapon( "cheytac_mp", 0 );
-		self setSpawnWeapon( "cheytac_mp" );
-
-		// make into sniper model
-		if ( level.environment != "" )
-			self [[game[self.team+"_model"]["GHILLIE"]]]();
-		else
-			self [[game[self.team+"_model"]["SNIPER"]]]();
 	}
 }
+
+watchOneHardIsSniper()
+{
+	for(;;)
+	{
+		wait 1;
+
+		if ( !getDvarInt( "bots_oneHardIsSniper" ) )
+			continue;
+
+		foreach (bot in level.bots)
+		{
+			if (bot.pers["bots"]["skill"]["base"] >= 7)
+			{
+				if (isAlive(bot) && !bot.isSniper)
+					bot give_sniper_loadout();
+
+				break;
+			}
+		}
+	}
+}
+
+give_sniper_loadout()
+{
+	self.pers["bots"]["behavior"]["quickscope"] = true;
+
+	// clear perks and weapons
+	self takeAllWeapons();
+	self.specialty = [];
+	self _clearPerks();
+	self maps\mp\gametypes\_class::_detachAll();
+
+	// give perks
+	self maps\mp\perks\_perks::givePerk( "specialty_fastreload" );
+	self maps\mp\perks\_perks::givePerk( "specialty_quickdraw" );
+	self maps\mp\perks\_perks::givePerk( "specialty_bulletdamage" );
+	self maps\mp\perks\_perks::givePerk( "specialty_armorpiercing" );
+	self maps\mp\perks\_perks::givePerk( "specialty_bulletaccuracy" );
+	self maps\mp\perks\_perks::givePerk( "specialty_holdbreath" );
+
+	// give weapons
+	self _giveWeapon( "usp_mp", 0 );
+	self SetWeaponAmmoClip( "usp_mp", 0 );
+	self SetWeaponAmmoStock( "usp_mp", 0 );
+
+	self _giveWeapon( "cheytac_mp", 0 );
+	self setSpawnWeapon( "cheytac_mp" );
+
+	// make into sniper model
+	if ( level.environment != "" )
+		self [[game[self.team + "_model"]["GHILLIE"]]]();
+	else
+		self [[game[self.team + "_model"]["SNIPER"]]]();
+
+	self.isSniper = true;
+}

userraw/scripts/showHP.gsc

@@ -5,42 +5,52 @@
 init()
 {
 	setDvarIfUninitialized( "scr_showHP", false );
-	level.showHP = getDvarInt("scr_showHP");
+	level.showHP = getDvarInt( "scr_showHP" );
 
 	level thread onPlayerConnect();
 }
 
 onPlayerConnect()
 {
-	for(;;)
+	for ( ;; )
 	{
-		level waittill( "connected", player);
+		level waittill( "connected", player );
 		player thread onPlayerSpawned();
 	}
 }
 
 onPlayerSpawned()
 {
-   self endon("disconnect");
+	self endon( "disconnect" );
-   for(;;)
-   {
-	  self waittill("spawned_player");
 
-		if(level.showHP)
+	for ( ;; )
-				self thread drawHP();
+	{
-   }
+		self waittill( "spawned_player" );
+
+		if ( level.showHP )
+			self thread drawHP();
+	}
 }
 
 destoryHPdraw()
 {
-	self waittill_either("disconnect", "death");
+	self endon( "disconnect" );
-	self.drawHP destroy();
+	self waittill( "death" );
+
+	if ( isDefined( self.drawHP ) )
+		self.drawHP destroy();
+
+	if ( isDefined( self.drawSpeed ) )
+		self.drawSpeed destroy();
 }
 
 initHPdraw()
 {
-	self.drawHP = self createFontString("default", 1.2);
+	self.drawHP = self createFontString( "default", 1.2 );
-	self.drawHP setPoint("BOTTOMRIGHT", "BOTTOMRIGHT", -150, -20);
+	self.drawHP setPoint( "BOTTOMRIGHT", "BOTTOMRIGHT", -150, -20 );
+
+	self.drawSpeed = self createFontString( "default", 1.2 );
+	self.drawSpeed setPoint( "BOTTOMRIGHT", "BOTTOMRIGHT", -150, -10 );
 	self thread destoryHPdraw();
 }
 
@@ -49,10 +59,14 @@ drawHP()
 	self endon( "disconnect" );
 	self endon( "death" );
 	self initHPdraw();
-	for(;;)
+
+	for ( ;; )
 	{
 		//self.drawHP setText("HP: "+self.health+"  KS: "+self.pers["cur_kill_streak"]);
-		self.drawHP setText(self.health);
+		self.drawHP setValue( self.health );
+
+		vel = self getVelocity();
+		self.drawSpeed setValue( int( length( ( vel[0], vel[1], 0 ) ) ) );
 		wait 0.05;
 	}
 }

userraw/scripts/spawnTest.gsc

@@ -0,0 +1,71 @@
+init()
+{
+	if ( getDvarInt( "spawnpoints_test" ) )
+		level thread doSpawnPointTest();
+}
+
+drawNoSight(sp)
+{
+	newdeathicon = newHudElem();
+	newdeathicon.x = sp.origin[0];
+	newdeathicon.y = sp.origin[1];
+	newdeathicon.z = sp.origin[2] + 32;
+	newdeathicon.alpha = .61;
+	newdeathicon.archived = true;
+	newdeathicon setShader( "headicon_dead", 5, 5 );
+	newdeathicon setwaypoint( true, false );
+
+	if (isDefined(sp.wp))
+		sp.wp destroy();
+	
+	sp.wp = newdeathicon;
+}
+
+drawSight(sp)
+{
+	newdeathicon = newHudElem();
+	newdeathicon.x = sp.origin[0];
+	newdeathicon.y = sp.origin[1];
+	newdeathicon.z = sp.origin[2] + 32;
+	newdeathicon.alpha = .61;
+	newdeathicon.archived = true;
+	newdeathicon setShader( "rank_prestige1", 5, 5 );
+	newdeathicon setwaypoint( true, false );
+
+	if (isDefined(sp.wp))
+		sp.wp destroy();
+	
+	sp.wp = newdeathicon;
+}
+
+doSpawnPointTest()
+{
+	for ( ;; )
+	{
+		wait 0.05;
+
+		if ( !isdefined( level.spawnpoints ) )
+			return;
+
+		for (i = 0; i < level.spawnpoints.size; i++)
+		{
+			spawnpoint = level.spawnpoints[i];
+
+			sight = false;
+
+			if (level.teamBased)
+			{
+				sight = (spawnpoint.sights["axis"] > 0);
+				if (!sight)
+					sight = (spawnpoint.sights["allies"] > 0);
+			}
+			else
+				sight = (spawnpoint.sights > 0);
+
+			if (!sight)
+				drawNoSight(spawnpoint);
+			else
+				drawSight(spawnpoint);
+		}
+	}
+}

userraw/scripts/tripleDom.gsc

@@ -0,0 +1,70 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+
+init()
+{
+	setDvarIfUninitialized( "dom_lastFlagUseTimeMulti", 1.0 );
+
+	thread watchFlags();
+}
+
+watchFlags()
+{
+	if ( getDvar( "g_gametype" ) != "dom" )
+		return;
+
+	while ( !isDefined( level.domFlags ) )
+		wait 0.05;
+
+	for ( ;; )
+	{
+		wait 1;
+
+		for ( i = 0; i < level.domFlags.size; i++ )
+		{
+			flag = level.domFlags[i];
+
+			if ( isDefined( flag.originalUseTime ) )
+			{
+				flag.useTime = flag.originalUseTime;
+				flag.originalUseTime = undefined;
+			}
+		}
+
+		team = "none";
+
+		axisFlags = maps\mp\gametypes\dom::getTeamFlagCount( "axis" );
+		alliesFlags = maps\mp\gametypes\dom::getTeamFlagCount( "allies" );
+
+		if ( alliesFlags == 2 || axisFlags == 2 )
+		{
+			if ( alliesFlags == 2 )
+				team = "allies";
+			else
+				team = "axis";
+		}
+
+		if ( game["teamScores"]["axis"] < game["teamScores"]["allies"] && team == "axis" )
+			continue;
+
+		if ( game["teamScores"]["allies"] < game["teamScores"]["axis"] && team == "allies" )
+			continue;
+
+		if ( team != "none" )
+		{
+			for ( i = 0; i < level.domFlags.size; i++ )
+			{
+				flag = level.domFlags[i];
+
+				flagTeam = flag maps\mp\gametypes\_gameobjects::getOwnerTeam();
+
+				if ( flagTeam != team && ( flagTeam == "axis" || flagTeam == "allies" ) )
+				{
+					flag.originalUseTime = flag.useTime;
+					flag.useTime *= getDvarFloat( "dom_lastFlagUseTimeMulti" );
+				}
+			}
+		}
+	}
+}

z_bots.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw4x.exe" -nosteam -scriptablehttp -console +set r_fullscreen "0" +set sv_lanonly "1" +set r_mode "1024x768" +set drawlagometer "1" +set cg_drawfps "4" +set fs_game "" +set bots_manage_fill "4" +set cg_drawsnapshot "1" +set ui_mapname "mp_rust" +set scr_game_spectatetype "2" +set scr_war_scorelimit "0" +set thereisacow "1" +set sv_cheats "1" +devmap mp_rust

z_client.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw4x.exe" -nosteam -scriptablehttp +set r_fullscreen "1" +set sv_lanonly "1" +set r_monitor "0" +set drawlagometer "0" +set cg_drawfps "0" +set cg_drawsnapshot "0" +set r_mode "1920x1080"

z_deploy.bat

@@ -0,0 +1 @@
+start "" "node" deploy.js

z_dev.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw4x.exe" -nosteam -dump -console -scriptablehttp +set sv_lanonly "1" +set r_fullscreen "0" +set fs_game "mods/dev" +set developer "1" +set developer_script "1" +set cg_drawfps "4" +set cg_drawsnapshot "1" +set thereisacow "1" +set sv_cheats "1" +set bots_manage_add "0" +set drawlagometer "1" +set scr_game_spectatetype "2" +set r_mode "1024x768" +devmap mp_rust

z_devserver.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw4x.exe" -nosteam -console -dump -scriptablehttp +set sv_lanonly "1" +set r_fullscreen "0" +set fs_game "mods/dev" +set developer "1" +set developer_script "1" +set cg_drawfps "4" +set cg_drawsnapshot "1" +set thereisacow "1" +set sv_cheats "1" +set drawlagometer "1" +set r_mode "1024x768" +connect 127.0.0.1

z_server.bat

@@ -1 +1,26 @@
-start "" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_port "28960" +set fs_game "" +exec server.cfg +map_rotate
+@echo off
+::RemoteCONtrol password, needed for most management tools like IW4MADMIN and B3. Do not skip if you installing IW4MADMIN.
+set rcon_password=
+::Name of the config file the server should use.
+set cfg=server.cfg
+::Name of the server shown in the title of the cmd window. This will NOT bet shown ingame.
+set name=IW4x Bot Warfare Server
+::Port used by the server (default: 28960)
+set port=28960
+::What ip to bind too
+set ip=0.0.0.0
+::Mod name (default "")
+set mod=
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+
+title IW4x MP - %name% - Server restarter
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo Server "%name%" will load "%cfg%" and listen on port "%port%" UDP with IP "%ip%"!
+echo To shut down the server close this window first!
+echo (%date%)  -  (%time%) %name% server start.
+
+:server
+start /wait /abovenormal "%name%" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +exec "%cfg%" +map_rotate
+echo (%date%)  -  (%time%) WARNING: %name% server closed or dropped... server restarts.
+goto Server

z_server_pvbrust.bat

@@ -1 +1,26 @@
-start "" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_port "28960" +set fs_game "" +exec pvbrust.cfg +map_rotate
+@echo off
+::RemoteCONtrol password, needed for most management tools like IW4MADMIN and B3. Do not skip if you installing IW4MADMIN.
+set rcon_password=
+::Name of the config file the server should use.
+set cfg=pvbrust.cfg
+::Name of the server shown in the title of the cmd window. This will NOT bet shown ingame.
+set name=IW4x Bot Warfare PvB Rust
+::Port used by the server (default: 28960)
+set port=28965
+::What ip to bind too
+set ip=0.0.0.0
+::Mod name (default "")
+set mod=
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+
+title IW4x MP - %name% - Server restarter
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo Server "%name%" will load "%cfg%" and listen on port "%port%" UDP with IP "%ip%"!
+echo To shut down the server close this window first!
+echo (%date%)  -  (%time%) %name% server start.
+
+:server
+start /wait /abovenormal "%name%" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +exec "%cfg%" +map_rotate
+echo (%date%)  -  (%time%) WARNING: %name% server closed or dropped... server restarts.
+goto Server

z_server_pvbrust_watchdog.bat

@@ -0,0 +1,40 @@
+@echo off
+::Name
+set name=IW4x Bot Warfare PvB Rust
+::Exe of the server
+set server_exe=iw4x.exe
+::The regex search for the window name of the server
+set server_title_regex=Bot Warfare Players vs bots 24/7 Rust 10x
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+::Rate to check if server is hung
+set check_rate=300
+::Server log location
+set log_path=%gamepath%\userraw\logs\pvbrust
+set log_file=games_mp.log
+
+title IW4x MP - %name% - Server watchdog
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo (%date%)  -  (%time%) %name% server watchdog start.
+
+::https://superuser.com/questions/699769/batch-file-last-modification-time-with-seconds
+dir "%log_path%"\"%log_file%" > nul
+for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+:Server
+	set modif_time=%modif_time_temp%
+
+	timeout /t %check_rate% /nobreak > nul
+
+	dir "%log_path%"\"%log_file%" > nul
+	for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+	if "%modif_time_temp%" == "%modif_time%" (
+		echo "(%date%)  -  (%time%) WARNING: %name% server hung, killing server..."
+		::https://stackoverflow.com/questions/26552368/windows-batch-file-taskkill-if-window-title-contains-text
+		for /f "tokens=2 delims=," %%a in ('
+			tasklist /fi "imagename eq %server_exe%" /v /fo:csv /nh
+			^| findstr /r /c:"%server_title_regex%"
+		') do taskkill /pid %%a /f
+	)
+goto Server

z_server_pvbvote.bat

@@ -1 +1,26 @@
-start "" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_port "28960" +set fs_game "mods/pvb" +exec pvbvote.cfg +map_rotate
+@echo off
+::RemoteCONtrol password, needed for most management tools like IW4MADMIN and B3. Do not skip if you installing IW4MADMIN.
+set rcon_password=
+::Name of the config file the server should use.
+set cfg=pvbvote.cfg
+::Name of the server shown in the title of the cmd window. This will NOT bet shown ingame.
+set name=IW4x Bot Warfare PvB Vote
+::Port used by the server (default: 28960)
+set port=28966
+::What ip to bind too
+set ip=0.0.0.0
+::Mod name (default "")
+set mod=mods/pvb
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+
+title IW4x MP - %name% - Server restarter
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo Server "%name%" will load "%cfg%" and listen on port "%port%" UDP with IP "%ip%"!
+echo To shut down the server close this window first!
+echo (%date%)  -  (%time%) %name% server start.
+
+:server
+start /wait /abovenormal "%name%" "%~dp0iw4x.exe" -dedicated +set sv_lanonly "0" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +exec "%cfg%" +map_rotate
+echo (%date%)  -  (%time%) WARNING: %name% server closed or dropped... server restarts.
+goto Server

z_server_pvbvote_watchdog.bat

@@ -0,0 +1,40 @@
+@echo off
+::Name
+set name=IW4x Bot Warfare PvB Vote
+::Exe of the server
+set server_exe=iw4x.exe
+::The regex search for the window name of the server
+set server_title_regex=Bot Warfare Players vs bots Mapvote 10x
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+::Rate to check if server is hung
+set check_rate=300
+::Server log location
+set log_path=%gamepath%\mods\pvb\logs\pvbvote
+set log_file=games_mp.log
+
+title IW4x MP - %name% - Server watchdog
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo (%date%)  -  (%time%) %name% server watchdog start.
+
+::https://superuser.com/questions/699769/batch-file-last-modification-time-with-seconds
+dir "%log_path%"\"%log_file%" > nul
+for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+:Server
+	set modif_time=%modif_time_temp%
+
+	timeout /t %check_rate% /nobreak > nul
+
+	dir "%log_path%"\"%log_file%" > nul
+	for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+	if "%modif_time_temp%" == "%modif_time%" (
+		echo "(%date%)  -  (%time%) WARNING: %name% server hung, killing server..."
+		::https://stackoverflow.com/questions/26552368/windows-batch-file-taskkill-if-window-title-contains-text
+		for /f "tokens=2 delims=," %%a in ('
+			tasklist /fi "imagename eq %server_exe%" /v /fo:csv /nh
+			^| findstr /r /c:"%server_title_regex%"
+		') do taskkill /pid %%a /f
+	)
+goto Server

z_server_watchdog.bat

@@ -0,0 +1,40 @@
+@echo off
+::Name
+set name=IW4x Bot Warfare Server
+::Exe of the server
+set server_exe=iw4x.exe
+::The regex search for the window name of the server
+set server_title_regex=Bot Warfare 24/7 Rust 10x
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!
+set gamepath=%cd%
+::Rate to check if server is hung
+set check_rate=300
+::Server log location
+set log_path=%gamepath%\userraw\logs\server
+set log_file=games_mp.log
+
+title IW4x MP - %name% - Server watchdog
+echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
+echo (%date%)  -  (%time%) %name% server watchdog start.
+
+::https://superuser.com/questions/699769/batch-file-last-modification-time-with-seconds
+dir "%log_path%"\"%log_file%" > nul
+for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+:Server
+	set modif_time=%modif_time_temp%
+
+	timeout /t %check_rate% /nobreak > nul
+
+	dir "%log_path%"\"%log_file%" > nul
+	for /f "delims=" %%i in ('"forfiles /p "%log_path%" /m "%log_file%" /c "cmd /c echo @ftime" "') do set modif_time_temp=%%i
+
+	if "%modif_time_temp%" == "%modif_time%" (
+		echo "(%date%)  -  (%time%) WARNING: %name% server hung, killing server..."
+		::https://stackoverflow.com/questions/26552368/windows-batch-file-taskkill-if-window-title-contains-text
+		for /f "tokens=2 delims=," %%a in ('
+			tasklist /fi "imagename eq %server_exe%" /v /fo:csv /nh
+			^| findstr /r /c:"%server_title_regex%"
+		') do taskkill /pid %%a /f
+	)
+goto Server

z_serverdev.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw4x.exe" -dedicated -console -dump +set sv_lanonly "1" +set fs_game "mods/dev" +set net_port "28960" +set developer "1" +set developer_script "1" +set scr_game_spectatetype "2" scr_war_scorelimit "0" +set thereisacow "1" +set sv_cheats "1" +set logfile "2" +set bots_manage_add "8" +set bots_main_firstIsHost "1" +devmap mp_rust