Add reload canceling

README.md

@@ -173,6 +173,7 @@ You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfar
   - Improved and fixed various waypoints for maps
   - Fixed bots rubberbanding movement when their goal changes
   - Added bots quickscoping with snipers
+  - Added bots reload canceling
 
 - v2.0.0
   - Initial reboot release

userraw/maps/mp/bots/_bot_internal.gsc

@@ -1343,7 +1343,7 @@ aim()
 
 					if (trace_time > reaction_time)
 					{
-						if((!canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone") && (conedot > 0.95 || dist < level.bots_maxKnifeDistance) && getDvarInt("bots_play_fire"))
+						if((!canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone") && (conedot > 0.99 || dist < level.bots_maxKnifeDistance) && getDvarInt("bots_play_fire"))
 							self botFire(curweap);
 
 						if (isplay)

userraw/maps/mp/bots/_bot_script.gsc

@@ -1095,13 +1095,10 @@ difficulty()
 
 	for(;;)
 	{
-		wait 5;
-		
 		rankVar = GetDvarInt("bots_skill");
 		
-		if(rankVar == 9)
-			continue;
-			
+		if(rankVar != 9)
+		{
 			switch(self.pers["bots"]["skill"]["base"])
 			{
 				case 1:
@@ -1323,6 +1320,9 @@ difficulty()
 					break;
 			}
 		}
+
+		wait 5;
+	}
 }
 
 /*
@@ -1471,6 +1471,7 @@ start_bot_threads()
 		self thread bot_killstreak_think();
 
 	self thread bot_weapon_think();
+	self thread doReloadCancel();
 	self thread bot_perk_think();
 
 	// script targeting
@@ -3644,6 +3645,68 @@ bot_crate_think()
 	}
 }
 
+/*
+	Reload cancels
+*/
+doReloadCancel()
+{
+	self endon("disconnect");
+	self endon("death");
+
+	for (;;)
+	{
+		self waittill("reload");
+
+		if(self BotIsFrozen())
+			continue;
+			
+		if(self isDefusing() || self isPlanting())
+			continue;
+
+		if (self IsUsingRemote())
+			continue;
+
+		if (self InLastStand() && !self InFinalStand())
+			continue;
+
+		curWeap = self GetCurrentWeapon();
+		// check single reloads
+		if (self GetCurrentWeaponClipAmmo() < WeaponClipSize(curWeap))
+			continue;
+
+		// check difficulty
+		if (self.pers["bots"]["skill"]["base"] <= 3)
+			continue;
+
+		// check if got another weapon
+		weaponslist = self getweaponslistall();
+		weap = "";
+		while(weaponslist.size)
+		{
+			weapon = weaponslist[randomInt(weaponslist.size)];
+			weaponslist = array_remove(weaponslist, weapon);
+					
+			if (!isWeaponPrimary(weapon))
+				continue;
+				
+			if(curWeap == weapon || weapon == "none" || weapon == "")
+				continue;
+				
+			weap = weapon;
+			break;
+		}
+		
+		if(weap == "")
+			continue;
+
+		// do the cancel
+		wait 0.1;
+		self BotChangeToWeapon(weap);
+		wait 0.25;
+		self BotChangeToWeapon(curWeap);
+	}
+}
+
 /*
 	Bots will think to switch weapons
 */