smaall changes

not OP disable RPG on Perks

.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

.gitattributes

@@ -0,0 +1 @@
+*.gsx linguist-language=GSC

.gitignore

@@ -1,17 +1,16 @@
-# Ignore everything in repository root 
+# Ignore everything in repository root
 /*
 
 # Files to not ignore
 !/.gitignore
-!/botnames.txt
+!/.editorconfig
-!/z_devserver.bat
+!/.gitattributes
-!/z_serverdev.bat
+
 !/z_server.bat
-!/z_client.bat
-!/z_dev.bat
 
 # Folder to not ignore
 !/main_shared/
+!/.vscode
 *.gsx
 !/main_shared/maps/mp/gametypes/_callbacksetup.gsx
 main_shared/maps/mp/gametypes/_globallogic.gsx
@@ -20,6 +19,11 @@ main_shared/maps/mp/gametypes/_hardpoints.gsx
 *.zip
 !/out
 
+!/.astylerc
+!/z_deploy.bat
+!/deploy.bat
+!/deploy.js
+
 !/main/
 /main/*
 !/main/server.cfg

.vscode/settings.json

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

README.md

@@ -5,7 +5,7 @@ Bot Warfare is a GSC mod for the [CoD4x project](https://github.com/callofduty4x
 
 It aims to add playable AI to the multiplayer games of CoD4.
 
-You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfare/downloads/cod4x-bot-warfare-latest) and the CoD4x.me post [here](https://cod4x.me/index.php?/forums/topic/3116-release-bot-warfare/).
+You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfare/downloads/cod4x-bot-warfare-latest) and the CoD4x forum post [here](https://cod4x.ovh/index.php?/forums/topic/3116-release-bot-warfare/).
 
 ## <span style="color:red">Important to public dedicated servers</span>
 The ```bots_main_firstIsHost``` DVAR is enabled by default!
@@ -22,7 +22,7 @@ Make sure to disable this DVAR by adding ```set bots_main_firstIsHost 0``` in yo
 - [Credits](#Credits)
 
 ## Features
-- A Waypoint Editor for creating and modifying bot's waypoints of traversing the map. Have a look at [Using the Waypoint editor]().
+- A Waypoint Editor for creating and modifying bot's waypoints of traversing the map. Have a look at [Using the Waypoint editor](/main_shared/bw-assets/wpedit.md).
 
 - A clean and nice menu, you can edit every bot DVAR within in-game.
 
@@ -57,15 +57,15 @@ Make sure to disable this DVAR by adding ```set bots_main_firstIsHost 0``` in yo
   - ... And pretty much everything you expect a Combat Training bot to have
 
 ## Installation
-Using CoD4x's extended functionality requires to use their Dedicated server, as explained [here](https://cod4x.me/index.php?/forums/topic/2047-add-cod4x-server-gsc-functions-to-the-client/).
+Using CoD4x's extended functionality requires to use their Dedicated server, as explained [here](https://cod4x.ovh/index.php?/forums/topic/2047-add-cod4x-server-gsc-functions-to-the-client/).
 
-You can easily setup a local LAN dedicated server for you to join and play on. Have a look at [Setting up a CoD4x server]().
+You can easily setup a local LAN dedicated server for you to join and play on. Have a look at [Setting up a CoD4x server](https://github.com/callofduty4x/CoD4x_Server/wiki/Server-setup).
 
-0. Make sure that [CoD4x server + client](https://cod4x.me/) is installed, updated and working properly.
+0. Make sure that [CoD4x server + client](https://cod4x.ovh/) is installed, updated and working properly.
     - Download the [latest release](https://github.com/ineedbots/cod4x_bot_warfare/releases) of Bot Warfare.
 1. Locate your CoD4x server install folder.
 2. Move the files/folders found in 'Add to root of CoD4x server' from the Bot Warfare release archive you downloaded to the root of your CoD4x server folder.
-    - The folder/file structure should follow as '.CoD4x server folder\main_shared\maps\mp\bots\_bot.gsc'.
+    - The folder/file structure should follow as `.CoD4x server folder\main_shared\maps\mp\bots\_bot.gsc`.
 3. The mod is now installed, now start your server, change the DVARs and start a map.
 4. Now start your CoD4x client and connect to your server ('connect 127.0.0.1' in the console most likely) and play!
 
@@ -79,88 +79,60 @@ You can easily setup a local LAN dedicated server for you to join and play on. H
 - 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_main_firstIsHost            | The first player to connect will be given host.                                             | true          |
+| 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_main_menu                   | Enable the in-game menu for hosts.                                                          | true          |
+| bots_main_debug                  | Enable the in-game waypoint editor.                                                         | false         |
+| 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_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_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_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 |
+| 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 |
+| 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 |
+| 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 |
+| 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_skill_allies_hard           | When `bots_skill` is set to `8`, the amount of hard difficulty bots to set on the allies team. | 0          |
+| 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_skill_max                   | The maximum difficulty level for the bots.                                                     | 7          |
+| 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_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 |
+| 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_play_obj                    | If the bots can play the objective.                                                            | true       |
+| bots_play_camp                   | If the bots can camp.                                                                          | true       |
+| bots_play_jumpdrop               | If the bots can jump/drop shot.                                                                | true       |
+| bots_play_target_other           | If the bots can target other entities other than players.                                      | true       |
+| bots_play_killstreak             | If the bots can call in killstreaks.                                                           | true       |
+| bots_play_ads                    | If the bots can aim down sights.                                                               | true       |
+| bots_play_aim                    | If the bots can aim.                                                                           | 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.
-    - 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_manage_fill_mode - a value to indicate if the server should consider only bots or players and bots when filling player space.
-    - 0 will consider both players and bots.
-    - 1 will only consider bots.
-
-- 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_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_team - a string, the value indicates what team the bots should join:
-    - 'autoassign' will have bots balance the teams
-    - 'allies' will have the bots join the allies team
-    - 'axis' will have the bots join the axis team
-    - 'custom' will have bots_team_amount bots on the axis team, the rest will be on the allies team
-    
-- 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.
-    - 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_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.
-    - 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_team_mode - a value to indicate if the server should consider only bots or players and bots when counting players on the teams.
-    - 0 will consider both players and bots.
-    - 1 will only consider bots.
-
----
-
-- bots_skill - value to indicate how difficult the bots should be.
-    - 0 will be mixed difficultly
-    - 1 will be the most easy
-    - 2-6 will be in between most easy and most hard
-    - 7 will be the most hard.
-    - 8 will be custom.
-
-- bots_skill_axis_hard - an integer amount of hard bots on the axis team.
-- 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
-
-- bots_loadout_allow_op - a boolean value (0 or 1), whether or not if the bots are allowed to use jug, marty, 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_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_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 seperated) 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
+  - Improved bots mantling and stuck
+  - Fix some runtime errors
+  - Bots sprint more
+  - Improved bots sight on enemies
+  - 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
@@ -182,7 +154,7 @@ You can easily setup a local LAN dedicated server for you to join and play on. H
 
 ## Credits
 - 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
 - PeZBot team - http://www.moddb.com/mods/pezbot
 - Ability
 - Salvation

deploy.bat

@@ -0,0 +1,2 @@
+xcopy cod4x_bot_warfare\main_shared\maps\mp\bots main_shared\maps\mp\bots\ /Y /I /E /H /C
+xcopy cod4x_bot_warfare\main main\ /Y /I /E /H /C

deploy.js

@@ -0,0 +1,54 @@
+// nodejs 14+
+
+const exec = require('util').promisify(require('child_process').exec)
+
+const repo_name = 'cod4x_bot_warfare'
+const repo_url = `https://github.com/ineedbots/${repo_name}`
+const deploy_check_rate = 60000
+const title = 'CoD4x 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/server.cfg

@@ -9,7 +9,7 @@
 ///      features only available on CoD4X 1.8+ servers   ///
 ///                                                      ///
 ////////////////////////////////////////////////////////////
-
+loadplugin "httpget"
 
 // Meta Information, not required
 sets _Admin "Admin"
@@ -23,15 +23,11 @@ sets _Gametype ""
 // Basics
 set sv_hostname "^1Bot ^3War^5fare ^724/7 Shipment 10x"
 set g_motd "" // Message of the day, which getting shown to every player on his 1st spawn
-set dedicated "2" 	// 0 = Listen, 1 = LAN, 2 = Internet ( you probably want 2 )
-set rcon_password "qazqaz"  // password for remote access, leave empty to deactivate, min 8 characters
 set g_password ""     // join password, leave empty to deactivate
 set sv_privateClients "" //Private Clients, number of slots that can only be changed with a password
 set sv_privatePassword ""  // the password to join private slots
 set sv_authorizemode "-1" // cdkey validation
 set sv_showasranked "1" // 0 = show modded server as not ranked, 1 = shows server as ranked altough it is modded
-set sv_authtoken "12312321"
-
 
 // Log File
 set g_logsync "2" // 0=no log, 1=buffered, 2=continuous, 3=append
@@ -41,16 +37,14 @@ set sv_log_damage "1"
 set sv_statusfile "serverstatus.xml" // writes an xml serverstatus to disc, leave empty to disable
 
 // Networking
-// set net_ip "0.0.0.0" // not necessary to be set
-// set net_port 28960 // network port
 // set sv_maxRate 25000
 
 set sv_minPing "0" // minimal ping [ms] for a player to join the server
 set sv_maxPing "0" // maximal ping [ms] for a player to join the server
-set sv_timeout 40 // Seconds to keep a client on server without a new clientmessage
+set sv_timeout "40" // Seconds to keep a client on server without a new clientmessage
-set sv_connectTimeout 90 // Seconds to wait for a client which is loading a map without a new clientmessage
+set sv_connectTimeout "90" // Seconds to wait for a client which is loading a map without a new clientmessage
-set sv_zombieTime 2 // Seconds to keep a disconnected client on server to transmit the last message
+set sv_zombieTime "2" // Seconds to keep a disconnected client on server to transmit the last message
-set sv_reconnectlimit 5 // Seconds to disallow a prior connected client to reconnect to the server
+set sv_reconnectlimit "5" // Seconds to disallow a prior connected client to reconnect to the server
 
 // Floodprotection is enabled by default!
 // sv_floodProtect, sv_maxRate, 
@@ -58,10 +52,10 @@ set sv_reconnectlimit 5 // Seconds to disallow a prior connected client to recon
 
 // Variables you should not touch :)
 // set sv_fps "20" //Server-FPS (do not change!)
-// set sv_punkbuster "0" //Punkbuster, PB is not supported on CoD4x
+set sv_punkbuster "0" //Punkbuster, PB is not supported on CoD4x
-// set sv_pure "1" //check IWD-data 0 = off, 1 = on
+set sv_pure "0" //check IWD-data 0 = off, 1 = on
 // set g_antilag "1" //0 = off, 1 = on // Anti lag checks for weapon hits
-// set ModStats 1 // 1 = use player stats file for mods (normal behaviours), 0 = use player stats file of basegame (DANGEROUS!!! as it can overwrite your stats)
+// set ModStats "1" // 1 = use player stats file for mods (normal behaviours), 0 = use player stats file of basegame (DANGEROUS!!! as it can overwrite your stats)
 
 
 
@@ -74,23 +68,23 @@ set sv_allowAnonymous "0" // Anonymous //0 = off 1 = on
 
 // Maps
 set sv_mapRotation "map mp_shipment" // maps that will be played automatically
-// set sv_randomMapRotation 1 // 0 = sv_mapRotation is randomized, 1 = sequential order of sv_mapRotation
+// set sv_randomMapRotation "1" // 0 = sv_mapRotation is randomized, 1 = sequential order of sv_mapRotation
 
 set g_deadChat "1" // dead can chat // 0 = off, 1 = on
 set voice_deadChat "0" // dead can use voicechat //0 = off, 1 = on
 set g_gravity "800" //Gravity //Standard 800
 set sv_disableClientConsole "0" //deactivate console for clients //0 = no, 1 = yes
-set scr_teambalance "0" //auto-teambalance //0 = no, 1 = yes
+set scr_teambalance "1" //auto-teambalance //0 = no, 1 = yes
 set scr_team_fftype "0" //friendly-fire //0 = off, 1 = on, //2 = reflect damage, 3 = shared damage
 set scr_game_spectatetype "2" // spectator // 0 = off, 1 = only Team/player, 2 = free
-set scr_hardcore 0 //Hardcore Mode //0 = off 1 = on
+set scr_hardcore "0" //Hardcore Mode //0 = off 1 = on
 set scr_oldschool "0" //Oldschool Mode //0 = off, 1 = on
 
-set g_friendlyPlayerCanBlock 0 // 1 = player collision between friendly players, 0 = collision between friendly players is disabled
+set g_friendlyPlayerCanBlock "0" // 1 = player collision between friendly players, 0 = collision between friendly players is disabled
-set g_FFAPlayerCanBlock 1 // same for FFA (non team based) gamemode
+set g_FFAPlayerCanBlock "1" // same for FFA (non team based) gamemode
 
 // Less interesting Gameplay stuff
-set scr_drawfriend "1" //show team mates //0 = off, 1 = on
+set scr_drawfriend "0" //show team mates //0 = off, 1 = on
 set scr_enable_scoretext "1" //hit-message //0 = no, 1 = yes
 set scr_game_allowkillcam "1" //Killcam //0 = no, 1 = yes // Allow to play killcam after you got killed
 set scr_game_deathpointloss "0" //points-distraction when hit //0 = no, 1 = yes
@@ -126,9 +120,9 @@ set scr_war_waverespawndelay "0"
 
 //Domination (dom)
 set scr_dom_scorelimit "300"
-set scr_dom_timelimit "0"
+set scr_dom_timelimit "30"
 set scr_dom_numlives "0"
-set scr_dom_playerrespawndelay "3"
+set scr_dom_playerrespawndelay "0"
 set scr_dom_roundlimit "1"
 set scr_dom_waverespawndelay "0"
 
@@ -177,10 +171,10 @@ set scr_sd_waverespawndelay "0"
 set g_gametype "dom" // gamemode, one of [war, dm, sd, sab, koth]
 
 // Amazing Stuff
-//set sv_autodemorecord 1 // Records demos of players on the serverside, demos are stored in "demos" folder
+set sv_autodemorecord "1" // Records demos of players on the serverside, demos are stored in "demos" folder
 //set sv_demoCompletedCmd "" // program to execute when a demo has been saved
 //set sv_screenshotArrivedCmd "" // program to execute when a screenshot was taken
-//set sv_legacyguidmode 0 // 1 = old 32 character guids are used, 0 = new cod4x guid format is used ( like steamids )
+//set sv_legacyguidmode "0" // 1 = old 32 character guids are used, 0 = new cod4x guid format is used ( like steamids )
 
 ///////////////////////////
 // Setup for custom maps when running a mod
@@ -190,7 +184,7 @@ seta sv_wwwDlDisconnected "1" // disconnect clients while downloading
 ///////////////////////////
 
 
-set sv_nosteamnames 1 // 1 = Use names from steam if steam is available
+set sv_nosteamnames "1" // 1 = Use names from steam if steam is available
 
 set bots_manage_add "12"
 set bots_main_firstIsHost "0"
@@ -200,3 +194,5 @@ set bots_team_force "1"
 set bots_loadout_allow_op "0"
 set bots_loadout_reasonable "1"
 set bots_manage_fill_spec "0"
+
+exec config.cfg

main_shared/bw-assets/wpedit.md

@@ -0,0 +1,99 @@
+# CoD4x Bot Warfare Waypoint Editor
+First things first, Bot Warfare uses the [AStar search algorithm](https://en.wikipedia.org/wiki/A*_search_algorithm) for creating paths for the bots to find their way through a map. 
+
+The AStar search algorithm requires a [set of waypoints](https://en.wikipedia.org/wiki/Graph_(discrete_mathematics)) defining where all the paths are in the map.
+
+Now if you want to modify existing or create new waypoints for CoD4x maps, this is the read for you.
+
+## Contents
+- [Setting up the Waypoint Editor](#Setting-up-the-Waypoint-Editor)
+- [The Editor](#The-Editor)
+
+## Setting up the Waypoint Editor
+The Bot Warfare mod comes with the Waypoint Editor out of the box, so its just a matter of telling the mod you want to use it. Its a matter of setting the `bots_main_debug` DVAR to `1`.
+
+Start your server with the Bot Warfare mod.
+
+In the server console, type in ```set bots_main_debug 1```.<br>
+![Setting the dvar](/main_shared/bw-assets/console.png)
+
+Now start a match with the map you want to edit with the `devmap <mapname>` command.<br>
+![Starting a map](/main_shared/bw-assets/console-map.png)
+
+It should be noted that waypoints load in this following order;
+1. checks the 'waypoints' folder (FS_Game\waypoints) for a csv file
+2. loads the waypoints from GSC (maps\mp\bots\waypoints)
+3. checks online at [this repo](https://github.com/ineedbots/cod4x_waypoints) for the waypoints (if httpget plugin loaded)
+
+If all fail to load waypoints, there will be no waypoints and the bots will not know how to navigate the map.
+
+Connect to the server with the CoD4x client, you'll be introduced to the Waypoint Editor.
+
+## The Editor
+![The editor](/main_shared/bw-assets/editor.png)<br>
+This is the Waypoint Editor. You can view, edit and create the waypoint graph.
+- Each red number you see in the world is a waypoint.
+- The green string you see is the type of that waypoint.
+- The green list of numbers are the waypoints linked to that waypoint.
+- The pink lines show the links between the waypoints, a link defines that a bot can walk from A to B.
+- The white lines show the 'angles' that a waypoint has, these are used for grenade, claymore and tube waypoints. It's used to tell the bot where to look at when grenading/claymoring, etc.
+
+---
+
+Pressing any of these buttons will initiate a command to the Waypoint Editor.
+Each button has a secondary modifier button, and can be pressed shortly after pressing the primary button.
+
+- SecondaryOffhand (stun) - Add Waypoint
+    - Press nothing - Make a waypoint of your stance
+    - ADS - Make a climb waypoint
+    - Attack + Use - Make a tube waypoint
+    - Attack - Make a grenade waypoint
+    - Use - Make a claymore waypoint
+
+- Melee - Link Waypoint
+    - Press nothing - Link
+    - ADS - Unlink
+
+- FragButton (grenade) - Delete Waypoint
+    - Press nothing - Delete Waypoint
+    - Attack - Delete all waypoints
+    - ADS - (Re)Load Waypoints
+
+- UseButton + Attack - Save Waypoints
+    - Press nothing - Save waypoints
+    - ADS - Toggle autolink waypoints (links waypoints as you create them)
+
+---
+
+Okay, now that you know how to control the Editor, lets now go ahead and create some waypoints.
+
+Here I added a waypoint.<br>
+![Adding a waypoint](/main_shared/bw-assets/editor-addwp.png)
+
+And I added a second waypoint.<br>
+![Adding another waypoint](/main_shared/bw-assets/editor-addwp2.png)
+
+There are several types of waypoints, holding a modifier button before pressing the add waypoint button will create a special type of waypoint.
+- Types of waypoints:
+  - any stance ('stand', 'crouch', 'prone') - bots will have this stance upon reaching this waypoint
+  - grenade - bots will look at the angles you were looking at when you made the waypoint and throw a grenade from the waypoint
+  - tube - bots will look at the angles you were looking at when you made the waypoint and switch to a launcher and fire
+  - claymore - bots will look at the angles you were looking at when you made the waypoint and place a claymore or c4
+  - camp ('crouch' waypoint with only one linked waypoint) - bots will look at the angles you were looking at when you made the waypoint and camp
+  - climb - bots will look at the angles you were looking at when you made the waypoint and climb (use this for ladders and mantles)
+
+Here I linked the two waypoints together.<br>
+![Linking waypoints](/main_shared/bw-assets/editor-link.png)
+
+Linking waypoints are very important, it tells the bots that they can reach waypoint 1 from waypoint 0, and vice versa.
+
+Now go and waypoint the whole map out. This may take awhile and can be pretty tedious.
+
+Once you feel like you are done, press the Save buttons. This will generate a [CSV](https://en.wikipedia.org/wiki/Comma-separated_values) output to your waypoints folder!
+
+That is it! The waypoints should load next time you start your game!
+
+Your waypoints CSV file will be located at ```<fs_game>/waypoints/<mapname>_wp.csv```. (main folder if fs_game is blank)<br>
+![Location](/main_shared/bw-assets/saved.png)
+
+You can share your waypoints publicly (and can be loaded by other users of Bot Warfare remotely) by making a Pull Request to the [CoD4x_Waypoints repo](https://github.com/ineedbots/cod4x_waypoints).

main_shared/maps/mp/bots/_bot_http.gsc

@@ -10,35 +10,35 @@
 /*
 	Will attempt to retreive waypoints from the internet
 */
-getRemoteWaypoints(mapname)
+getRemoteWaypoints( mapname )
 {
 	url = "https://raw.githubusercontent.com/ineedbots/cod4x_waypoints/master/" + mapname + "_wp.csv";
 	filename = "waypoints/" + mapname + "_wp.csv";
 
-	printToConsole("Attempting to get remote waypoints from " + url);
+	printToConsole( "Attempting to get remote waypoints from " + url );
-	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 = [];
-	printToConsole("Loading remote waypoints...");
+	printToConsole( "Loading remote waypoints..." );
 
-	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);
 
-		waypoints[i-1] = waypoint;
+		waypoint = parseTokensIntoWaypoint( tokens );
+
+		waypoints[i - 1] = waypoint;
 	}
 
-	if (waypoints.size)
+	if ( waypoints.size )
 	{
 		level.waypoints = waypoints;
-		printToConsole("Loaded " + waypoints.size + " waypoints from remote.");
+		printToConsole( "Loaded " + waypoints.size + " waypoints from remote." );
 	}
 }
 
@@ -49,20 +49,20 @@ doVersionCheck()
 {
 	remoteVersion = getRemoteVersion();
 
-	if (!isDefined(remoteVersion))
+	if ( !isDefined( remoteVersion ) )
 	{
-		printToConsole("Error getting remote version of Bot Warfare.");
+		printToConsole( "Error getting remote version of Bot Warfare." );
 		return false;
 	}
 
-	if (level.bw_VERSION != remoteVersion)
+	if ( level.bw_VERSION != remoteVersion )
 	{
-		printToConsole("There is a new version of Bot Warfare!");
+		printToConsole( "There is a new version of Bot Warfare!" );
-		printToConsole("You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!");
+		printToConsole( "You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!" );
 		return false;
 	}
 
-	printToConsole("You are on the latest version of Bot Warfare!");
+	printToConsole( "You are on the latest version of Bot Warfare!" );
 	return true;
 }
 
@@ -77,16 +77,16 @@ getRemoteVersion()
 	data = undefined;
 #endif
 
-	if (!isDefined(data))
+	if ( !isDefined( data ) )
 		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 = [];
@@ -97,25 +97,26 @@ getLinesFromUrl(url, filename)
 	data = undefined;
 #endif
 
-	if (!isDefined(data))
+	if ( !isDefined( data ) )
 		return result;
 
-	fd = FS_FOpen(filename, "write");
+	fd = FS_FOpen( filename, "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;
 
-			if (fd > 0)
+			if ( fd > 0 )
 			{
-				if (!FS_WriteLine(fd, line))
+				if ( !FS_WriteLine( fd, line ) )
 				{
-					FS_FClose(fd);
+					FS_FClose( fd );
 					fd = 0;
 				}
 			}
@@ -126,10 +127,11 @@ getLinesFromUrl(url, filename)
 
 		line += c;
 	}
+
 	result.lines[result.lines.size] = line;
 
-	if (fd > 0)
+	if ( fd > 0 )
-		FS_FClose(fd);
+		FS_FClose( fd );
 
 	return result;
 }

main_shared/maps/mp/gametypes/_callbacksetup.gsx

@@ -15,8 +15,9 @@ CodeCallback_StartGameType()
 		[[level.callbackStartGameType]]();
 
 		level.gametypestarted = true; // so we know that the gametype has been started up
-		
+
 		level thread maps\mp\bots\_bot::init();
+		level thread maps\mp\bots\_bot_chat::init();
 		level thread maps\mp\bots\_menu::init();
 		level thread maps\mp\bots\_wp_editor::init();
 	}
@@ -91,7 +92,7 @@ Setup any misc callbacks stuff like defines and default callbacks
 SetupCallbacks()
 {
 	SetDefaultCallbacks();
-	
+
 	// Set defined for damage flags used in the playerDamage callback
 	level.iDFLAGS_RADIUS			= 1;
 	level.iDFLAGS_NO_ARMOR			= 2;
@@ -129,7 +130,7 @@ AbortLevel()
 	level.callbackPlayerDamage = ::callbackVoid;
 	level.callbackPlayerKilled = ::callbackVoid;
 	level.callbackPlayerLastStand = ::callbackVoid;
-	
+
 	setdvar("g_gametype", "dm");
 
 	exitLevel(false);

out/Add to root of CoD4x server/main/localbotserver.cfg

@@ -1 +1,7 @@
+loadplugin "httpget"
+
 set sv_hostname "^1Bot ^3War^5fare ^7Local server"
+set sv_punkbuster "0"
+
+set g_gametype "dom"
+set sv_mapRotation "map mp_shipment"

out/Add to root of CoD4x server/main_shared/maps/mp/bots/_bot_http.gsc

@@ -10,35 +10,35 @@
 /*
 	Will attempt to retreive waypoints from the internet
 */
-getRemoteWaypoints(mapname)
+getRemoteWaypoints( mapname )
 {
 	url = "https://raw.githubusercontent.com/ineedbots/cod4x_waypoints/master/" + mapname + "_wp.csv";
 	filename = "waypoints/" + mapname + "_wp.csv";
 
-	printToConsole("Attempting to get remote waypoints from " + url);
+	printToConsole( "Attempting to get remote waypoints from " + url );
-	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 = [];
-	printToConsole("Loading remote waypoints...");
+	printToConsole( "Loading remote waypoints..." );
 
-	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);
 
-		waypoints[i-1] = waypoint;
+		waypoint = parseTokensIntoWaypoint( tokens );
+
+		waypoints[i - 1] = waypoint;
 	}
 
-	if (waypoints.size)
+	if ( waypoints.size )
 	{
 		level.waypoints = waypoints;
-		printToConsole("Loaded " + waypoints.size + " waypoints from remote.");
+		printToConsole( "Loaded " + waypoints.size + " waypoints from remote." );
 	}
 }
 
@@ -49,20 +49,20 @@ doVersionCheck()
 {
 	remoteVersion = getRemoteVersion();
 
-	if (!isDefined(remoteVersion))
+	if ( !isDefined( remoteVersion ) )
 	{
-		printToConsole("Error getting remote version of Bot Warfare.");
+		printToConsole( "Error getting remote version of Bot Warfare." );
 		return false;
 	}
 
-	if (level.bw_VERSION != remoteVersion)
+	if ( level.bw_VERSION != remoteVersion )
 	{
-		printToConsole("There is a new version of Bot Warfare!");
+		printToConsole( "There is a new version of Bot Warfare!" );
-		printToConsole("You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!");
+		printToConsole( "You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!" );
 		return false;
 	}
 
-	printToConsole("You are on the latest version of Bot Warfare!");
+	printToConsole( "You are on the latest version of Bot Warfare!" );
 	return true;
 }
 
@@ -77,16 +77,16 @@ getRemoteVersion()
 	data = undefined;
 #endif
 
-	if (!isDefined(data))
+	if ( !isDefined( data ) )
 		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 = [];
@@ -97,25 +97,26 @@ getLinesFromUrl(url, filename)
 	data = undefined;
 #endif
 
-	if (!isDefined(data))
+	if ( !isDefined( data ) )
 		return result;
 
-	fd = FS_FOpen(filename, "write");
+	fd = FS_FOpen( filename, "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;
 
-			if (fd > 0)
+			if ( fd > 0 )
 			{
-				if (!FS_WriteLine(fd, line))
+				if ( !FS_WriteLine( fd, line ) )
 				{
-					FS_FClose(fd);
+					FS_FClose( fd );
 					fd = 0;
 				}
 			}
@@ -126,10 +127,11 @@ getLinesFromUrl(url, filename)
 
 		line += c;
 	}
+
 	result.lines[result.lines.size] = line;
 
-	if (fd > 0)
+	if ( fd > 0 )
-		FS_FClose(fd);
+		FS_FClose( fd );
 
 	return result;
 }

out/Add to root of CoD4x server/z_localserver.bat

@@ -1 +1 @@
-start "" "%~dp0cod4x18_dedrun.exe" +set dedicated "1" +set sv_maxclients "64" +set sv_punkbuster "0" +set net_port "28965" +set fs_game "mods/bots" +exec localbotserver.cfg +loadplugin httpget +map_rotate
+start "" "%~dp0cod4x18_dedrun.exe" +set dedicated "1" +set sv_maxclients "64" +set net_port "28965" +set fs_game "mods/bots" +exec localbotserver.cfg +map_rotate

out/readme.txt

@@ -1,4 +1,4 @@
-# CoD4x Bot Warfare
+# CoD4x Bot Warfare v2.1.0
 Bot Warfare is a GSC mod for the CoD4x project.
 
 It aims to add playable AI to the multiplayer games of CoD4.
@@ -12,7 +12,7 @@ Make sure to disable this DVAR by adding 'set bots_main_firstIsHost 0' in your s
 
 ## Installation
 0. Make sure that CoD4x server + client is installed, updated and working properly.
-	- Go to https://cod4x.me/ and download the Windows Server zip file. Move the contents of 'cod4x-windows-server' into your CoD4 game folder.
+	- Go to https://cod4x.ovh/ and download the Windows Server zip file. Move the contents of 'cod4x-windows-server' into your CoD4 game folder.
 1. Locate your CoD4x server install folder.
 2. Move the files/folders found in 'Add to root of CoD4x server' from the Bot Warfare release archive you downloaded to the root of your CoD4x server folder.
     - The folder/file structure should follow as '.CoD4x server folder\main_shared\maps\mp\bots\_bot.gsc'.
@@ -30,6 +30,17 @@ Make sure to disable this DVAR by adding 'set bots_main_firstIsHost 0' in your s
 - Pressing the menu button again closes menus.
 
 ## Changelog
+- v2.1.0
+  - Bot chatter system, bots_main_chat
+  - Greatly reduce script variable usage
+  - Improved bots mantling and stuck
+  - Fix some runtime errors
+  - Bots sprint more
+  - Improved bots sight on enemies
+  - 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

z_client.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw3mp.exe" +set r_fullscreen "1" +set cg_drawlagometer "0" +set cg_drawfps "0" +set cg_drawsnapshot "0" +set r_mode "1920x1080" +set r_monitor "0"

z_deploy.bat

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

z_dev.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw3mp.exe" +set r_fullscreen "0" +set cg_drawlagometer "1" +set developer "1" +set developer_script "1" +set logfile "2" +set cg_drawfps "3" +set cg_drawsnapshot "1" +set scr_game_spectatetype "2" +set r_mode "1024x768" +set thereisacow "1" +set sv_cheats "1" +set fs_game "mods/dev" +devmap mp_shipment

z_devserver.bat

@@ -1 +0,0 @@
-start "" "%~dp0iw3mp.exe" +set r_fullscreen "0" +set cg_drawlagometer "1" +set developer "1" +set developer_script "1" +set logfile "2" +set cg_drawfps "3" +set cg_drawsnapshot "1" +set scr_game_spectatetype "2" +set r_mode "1024x768" +set thereisacow "1" +set fs_game "mods/dev" +set sv_cheats "1" +connect 127.0.0.1

z_server.bat

@@ -1 +1,30 @@
-start "" "%~dp0cod4x18_dedrun.exe" +set dedicated "2" +set sv_maxclients "64" +set sv_punkbuster "0" +set net_port "28960" +set fs_game "mods/bots" +exec server.cfg +loadplugin httpget +map_rotate
+@echo off
+::Paste the server key from https://platform.plutonium.pw/serverkeys here
+set key=
+::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=CoD4x Bot Warfare
+::Port used by the server (default: 28960)
+set port=28969
+::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%
+::Max clients in your server
+set maxclients=64
+
+title CoD4x 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%" "%~dp0cod4x18_dedrun.exe" +set dedicated "2" +set sv_authtoken "%key%" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +set sv_maxclients "%maxclients%" +exec "%cfg%" +map_rotate
+echo (%date%)  -  (%time%) WARNING: %name% server closed or dropped... server restarts.
+goto Server

z_serverdev.bat

@@ -1 +0,0 @@
-start "" "%~dp0cod4x18_dedrun_dbg.exe" +set dedicated "1" +set developer "1" +set developer_script "1" +set logfile "2" +set scr_game_spectatetype "2" +set thereisacow "1" +set sv_cheats "1" +set sv_maxclients "64" +set fs_game "mods/dev" +set bots_manage_add "12" +set sv_punkbuster "0" +set scr_war_scorelimit "0" +set net_port "28960" +devmap mp_shipment