Add files via upload

Author: EfeDursun125

source/basecode.cpp

@@ -40,12 +40,12 @@ ConVar ebot_restrictweapons("ebot_restrict_weapons", "");
 ConVar ebot_camp_min("ebot_camp_time_min", "16");
 ConVar ebot_camp_max("ebot_camp_time_max", "48");
 ConVar ebot_use_radio("ebot_use_radio", "1");
-ConVar ebot_anti_block("ebot_anti_block", "0");
 ConVar ebot_force_flashlight("ebot_force_flashlight", "0");
 ConVar ebot_use_flare("ebot_zm_use_flares", "1");
 ConVar ebot_chat_percent("ebot_chat_percent", "20");
 ConVar ebot_eco_rounds("ebot_eco_rounds", "1");
 ConVar ebot_avoid_grenades("ebot_avoid_grenades", "1");
+ConVar ebot_breakable_health_limit("ebot_breakable_health_limit", "3000.0");
 
 ConVar ebot_chatter_path("ebot_chatter_path", "radio/bot");
 
@@ -730,7 +730,7 @@ void Bot::FindItem(void)
 				if (g_entityId[i] == -1 || g_entityAction[i] != 3)
 					continue;
 
-				if (m_team != g_entityTeam[i] && g_entityTeam[i] != 2)
+				if (g_entityTeam[i] != 2 && m_team != g_entityTeam[i])
 					continue;
 
 				if (ent != INDEXENT(g_entityId[i]))
@@ -5795,7 +5795,11 @@ void Bot::RunTask(void)
 		// is bot facing the breakable?
 		if (GetShootingConeDeviation(GetEntity(), &m_breakable) >= 0.90f)
 		{
-			m_moveSpeed = 0.0f;
+			if (m_isZombieBot || m_currentWeapon == WEAPON_KNIFE)
+				m_moveSpeed = pev->maxspeed;
+			else
+				m_moveSpeed = 0.0f;
+
 			m_strafeSpeed = 0.0f;
 			m_wantsToFire = true;
 			m_shootTime = engine->GetTime();
@@ -7302,7 +7306,7 @@ bool Bot::IsShootableBreakable(edict_t* ent)
 	if (FNullEnt(ent))
 		return false;
 
-	if (FClassnameIs(ent, "func_breakable") || (FClassnameIs(ent, "func_pushable") && (ent->v.spawnflags & SF_PUSH_BREAKABLE)) || (FClassnameIs(ent, "func_wall") && ent->v.health <= 500))
+	if ((FClassnameIs(ent, "func_breakable") || (FClassnameIs(ent, "func_pushable") && (ent->v.spawnflags & SF_PUSH_BREAKABLE)) || FClassnameIs(ent, "func_wall")) && ent->v.health <= ebot_breakable_health_limit.GetFloat())
 	{
 		if (ent->v.takedamage != DAMAGE_NO && ent->v.impulse <= 0 && !(ent->v.flags & FL_WORLDBRUSH) && !(ent->v.spawnflags & SF_BREAK_TRIGGER_ONLY))
 			return (ent->v.movetype == MOVETYPE_PUSH || ent->v.movetype == MOVETYPE_PUSHSTEP);
@@ -7314,7 +7318,7 @@ bool Bot::IsShootableBreakable(edict_t* ent)
 // this function is gets called when bot enters a buyzone, to allow bot to buy some stuff
 void Bot::EquipInBuyzone(int iBuyCount)
 {
-	static float lastEquipTime = 0.0f;
+	static float lastEquipTime = 0.0f; 
 
 	// if bot is in buy zone, try to buy ammo for this weapon...
 	if (lastEquipTime + 15.0f < engine->GetTime() && m_inBuyZone && g_timeRoundStart + engine->RandomFloat(10.0f, 20.0f) + engine->GetBuyTime() < engine->GetTime() && !g_bombPlanted && m_moneyAmount > 700)

source/chatlib.cpp

@@ -463,7 +463,7 @@ void Bot::ChatSay(bool teamSay, const char* text, ...)
         if (FNullEnt(client.ent))
             continue;
 
-        if (!(client.flags & CFLAG_USED) || client.ent == GetEntity() || client.flags & FL_FAKECLIENT)
+        if (!(client.flags & CFLAG_USED) || client.ent == GetEntity())
             continue;
 
         if (teamSay && client.team != m_team)

source/combat.cpp

@@ -27,7 +27,7 @@
 ConVar ebot_escape("ebot_zombie_escape_mode", "0");
 ConVar ebot_zp_use_grenade_percent("ebot_zm_use_grenade_percent", "10");
 ConVar ebot_zp_escape_distance("ebot_zm_escape_distance", "300");
-ConVar ebot_zombie_speed_factor("ebot_zombie_speed_factor", "0.5");
+ConVar ebot_zombie_speed_factor("ebot_zombie_speed_factor", "0.54");
 ConVar ebot_sb_mode("ebot_sb_mode", "0");
 
 int Bot::GetNearbyFriendsNearPosition(Vector origin, int radius)
@@ -896,9 +896,9 @@ bool Bot::KnifeAttack(float attackDistance)
 
 	if (kaMode > 0)
 	{
-		float distanceSkipZ = (pev->origin - GetEntityOrigin(entity)).GetLength2D();
+		float distanceSkipZ = (pev->origin - GetEntityOrigin(entity)).GetLengthSquared2D();
 
-		if (pev->origin.z > GetEntityOrigin(entity).z && distanceSkipZ < 64.0f)
+		if (pev->origin.z > GetEntityOrigin(entity).z && distanceSkipZ < SquaredF(64.0f))
 		{
 			pev->button |= IN_DUCK;
 			m_campButtons |= IN_DUCK;
@@ -909,7 +909,7 @@ bool Bot::KnifeAttack(float attackDistance)
 			pev->button &= ~IN_DUCK;
 			m_campButtons &= ~IN_DUCK;
 
-			if (pev->origin.z + 150.0f < GetEntityOrigin(entity).z && distanceSkipZ < 300.0f)
+			if (pev->origin.z + 150.0f < GetEntityOrigin(entity).z && distanceSkipZ < SquaredF(300.0f))
 				pev->button |= IN_JUMP;
 		}
 
@@ -970,9 +970,9 @@ void Bot::FocusEnemy(void)
 	if (m_enemySurpriseTime > engine->GetTime())
 		return;
 
-	float distance = (m_lookAt - EyePosition()).GetLength2D();  // how far away is the enemy scum?
+	float distance = (m_lookAt - EyePosition()).GetLengthSquared2D();  // how far away is the enemy scum?
 
-	if (distance < 128)
+	if (distance < SquaredF(128.0f))
 	{
 		if (m_currentWeapon == WEAPON_KNIFE)
 		{
@@ -1270,7 +1270,7 @@ void Bot::CombatFight(void)
 				}
 			}
 
-			if (m_jumpTime + 10.0f < engine->GetTime() && !IsOnLadder() && ChanceOf(m_isReloading ? 5 : 2) && pev->velocity.GetLength2D() > float(m_skill + 50.0f) && !UsesSniper())
+			if (m_jumpTime + 10.0f < engine->GetTime() && !IsOnLadder() && ChanceOf(m_isReloading ? 5 : 2) && pev->velocity.GetLength2D() > float(m_skill + 50) && !UsesSniper())
 				pev->button |= IN_JUMP;
 
 			if (m_moveSpeed > 0.0f && distance > SquaredF(512.0f) && m_currentWeapon != WEAPON_KNIFE)

source/engine.cpp

@@ -23,7 +23,6 @@
 //
 
 #include <core.h>
-#include <random>
 
 ConVar::ConVar(const char* name, const char* initval, VarType type)
 {

source/interface.cpp

@@ -105,6 +105,79 @@ int BotCommandHandler_O(edict_t* ent, const String& arg0, const String& arg1, co
 	else if (stricmp(arg0, "fillserver") == 0 || stricmp(arg0, "fill") == 0)
 		g_botManager->FillServer(atoi(arg1), IsNullString(arg2) ? -1 : atoi(arg2), IsNullString(arg3) ? -1 : atoi(arg3), IsNullString(arg4) ? -1 : atoi(arg4));
 
+	// set entity action with command
+	else if (stricmp(arg0, "setentityaction") == 0)
+	{
+		int index = atoi(arg1);
+		int team = atoi(arg2);
+		int action = atoi(arg3);
+
+		int i;
+		if (index == -1)
+		{
+			for (i = 0; i < entityNum; i++)
+				SetEntityActionData(i);
+
+			ServerPrintNoTag("[E-Bot] Set Entity Action - Delete All - Done");
+			return 1;
+		}
+
+		edict_t* entity = INDEXENT(index);
+		if (FNullEnt(entity) || !IsAlive(entity))
+		{
+			ServerPrintNoTag("[E-Bot] Set Entity Action - Entity is NULL or not alive - Done");
+			return -1;
+		}
+
+		if (IsValidPlayer(entity))
+		{
+			ServerPrintNoTag("[E-Bot] Set Entity Action - Cannot set the player - Done");
+			return -1;
+		}
+
+		for (i = 0; i < entityNum; i++)
+		{
+			if (g_entityId[i] == index)
+			{
+				if (action != -1)
+				{
+					if (team != g_entityTeam[i] || action != g_entityAction[i])
+					{
+						SetEntityActionData(i, index, team, action);
+						ServerPrintNoTag("[E-Bot] Set Entity Action - Change ID: %d Team: %d Action: %d - Done", index, team, action);
+					}
+					else
+						ServerPrintNoTag("[E-Bot] Set Entity Action - Don't Need Change ID: %d - Not Change - Done", index);
+				}
+				else
+				{
+					SetEntityActionData(i);
+					ServerPrintNoTag("[E-Bot] Set Entity Action - Delete ID: %d - Done", index);
+				}
+
+				return 1;
+			}
+		}
+
+		if (action == -1)
+		{
+			ServerPrintNoTag("[E-Bot] Set Entity Action - Cannot Delete ID: %d - Not Find - Done", index);
+			return -1;
+		}
+
+		for (i = 0; i < entityNum; i++)
+		{
+			if (g_entityId[i] == -1)
+			{
+				SetEntityActionData(i, index, team, action);
+				return 1;
+			}
+		}
+
+		ServerPrintNoTag("[E-Bot] Cannot Add Entity Action - Unknow Error - Done");
+		return -1;
+	}
+
 	// swap counter-terrorist and terrorist teams
 	else if (stricmp(arg0, "swaptteams") == 0 || stricmp(arg0, "swap") == 0)
 	{
@@ -288,46 +361,6 @@ int BotCommandHandler_O(edict_t* ent, const String& arg0, const String& arg1, co
 		}
 	}
 
-	// sets mesh for waypoint
-	else if (stricmp(arg0, "setmesh") == 0)
-	{
-		if (IsNullString(arg1))
-			ClientPrint(ent, print_withtag, "Please set mesh <number>");
-		else if (FNullEnt(g_hostEntity))
-			ClientPrint(ent, print_withtag, "Please try this in lan game");
-		else
-		{
-			int index = g_waypoint->FindNearest(GetEntityOrigin(g_hostEntity), 75.0f);
-			if (IsValidWaypoint(index))
-			{
-				g_waypoint->GetPath(index)->campStartX = fabsf(static_cast <float> (atof(arg1)));
-				ClientPrint(ent, print_withtag, "Waypoint mesh set to %d", static_cast <int> (g_waypoint->GetPath(index)->campStartX));
-			}
-			else
-				ClientPrint(ent, print_withtag, "Waypoint is not valid");
-		}
-	}
-
-	// sets gravity for waypoint
-	else if (stricmp(arg0, "setgravity") == 0)
-	{
-		if (IsNullString(arg1))
-			ClientPrint(ent, print_withtag, "Please set gravity <number>");
-		else if (FNullEnt(g_hostEntity))
-			ClientPrint(ent, print_withtag, "Please try this in lan game");
-		else
-		{
-			int index = g_waypoint->FindNearest(GetEntityOrigin(g_hostEntity), 75.0f);
-			if (IsValidWaypoint(index))
-			{
-				g_waypoint->GetPath(index)->campStartY = fabsf(static_cast <float> (atof(arg1)));
-				ClientPrint(ent, print_withtag, "Waypoint gravity set to %f", g_waypoint->GetPath(index)->campStartY);
-			}
-			else
-				ClientPrint(ent, print_withtag, "Waypoint is not valid");
-		}
-	}
-
 	// displays main bot menu
 	else if (stricmp(arg0, "botmenu") == 0 || stricmp(arg0, "menu") == 0)
 		DisplayMenuToClient(ent, &g_menus[0]);
@@ -478,6 +511,42 @@ int BotCommandHandler_O(edict_t* ent, const String& arg0, const String& arg1, co
 			DisplayMenuToClient(g_hostEntity, &g_menus[12]);
 		}
 
+		// sets mesh for waypoint
+		else if (stricmp(arg1, "setmesh") == 0)
+		{
+			if (IsNullString(arg2))
+				ClientPrint(ent, print_withtag, "Please set mesh <number>");
+			else
+			{
+				int index = g_waypoint->FindNearest(GetEntityOrigin(g_hostEntity), 75.0f);
+				if (IsValidWaypoint(index))
+				{
+					g_waypoint->GetPath(index)->campStartX = fabsf(static_cast <float> (atof(arg2)));
+					ClientPrint(ent, print_withtag, "Waypoint mesh set to %d", static_cast <int> (g_waypoint->GetPath(index)->campStartX));
+				}
+				else
+					ClientPrint(ent, print_withtag, "Waypoint is not valid");
+			}
+		}
+
+		// sets gravity for waypoint
+		else if (stricmp(arg1, "setgravity") == 0)
+		{
+			if (IsNullString(arg2))
+				ClientPrint(ent, print_withtag, "Please set gravity <number>");
+			else
+			{
+				int index = g_waypoint->FindNearest(GetEntityOrigin(g_hostEntity), 75.0f);
+				if (IsValidWaypoint(index))
+				{
+					g_waypoint->GetPath(index)->campStartY = fabsf(static_cast <float> (atof(arg2)));
+					ClientPrint(ent, print_withtag, "Waypoint gravity set to %f", g_waypoint->GetPath(index)->campStartY);
+				}
+				else
+					ClientPrint(ent, print_withtag, "Waypoint is not valid");
+			}
+		}
+
 		// creates basic waypoints on the map (ladder/spawn points/goals)
 		else if (stricmp(arg1, "addbasic") == 0)
 		{
@@ -2789,7 +2858,7 @@ void JustAStuff(void)
 			edict_t* player = INDEXENT(i);
 
 			// code below is executed only on dedicated server
-			if (!FNullEnt(player) && (player->v.flags & FL_CLIENT) && !(player->v.flags & FL_FAKECLIENT))
+			if (!FNullEnt(player) && (player->v.flags & FL_CLIENT))
 			{
 				const char* password = ebot_password.GetString();
 				const char* key = ebot_password_key.GetString();
@@ -2846,38 +2915,36 @@ void JustAStuff(void)
 static float secondTimer = 0.0;
 void FrameThread(void)
 {
-	if (g_analyzewaypoints)
-		g_waypoint->Analyze();
-
-	if (ebot_lockzbot.GetBool())
-	{
-		if (CVAR_GET_FLOAT("bot_quota") > 0)
-		{
-			CVAR_SET_FLOAT("ebot_quota", CVAR_GET_FLOAT("bot_quota"));
-			ServerPrint("ebot_lockzbot is 1, you cannot add Z-Bot");
-			ServerPrint("You can input ebot_lockzbot unlock add Z-Bot");
-			ServerPrint("But, If you have use AMXX plug-in or Zombie Mod, I think this is not good choice");
-			CVAR_SET_FLOAT("bot_quota", 0);
-		}
-	}
-
 	if (secondTimer < engine->GetTime())
 	{
 		LoadEntityData();
 		JustAStuff();
 
-		float time = 0.64f;
-		if (g_waypointOn)
-			time = 1.0f;
+		if (g_bombPlanted)
+			g_waypoint->SetBombPosition();
 
-		secondTimer = AddTime(time);
-	}
+		if (ebot_lockzbot.GetBool())
+		{
+			if (CVAR_GET_FLOAT("bot_quota") > 0)
+			{
+				CVAR_SET_FLOAT("ebot_quota", CVAR_GET_FLOAT("bot_quota"));
+				ServerPrint("ebot_lockzbot is 1, you cannot add Z-Bot");
+				ServerPrint("You can input ebot_lockzbot unlock add Z-Bot");
+				ServerPrint("But, If you have use AMXX plug-in or Zombie Mod, I think this is not good choice");
+				CVAR_SET_FLOAT("bot_quota", 0);
+			}
+		}
 
-	if (g_bombPlanted)
-		g_waypoint->SetBombPosition();
+		secondTimer = AddTime(1.0f);
+	}
+	else
+	{
+		// keep bot number up to date
+		g_botManager->MaintainBotQuota();
 
-	// keep bot number up to date
-	g_botManager->MaintainBotQuota();
+		if (g_analyzewaypoints)
+			g_waypoint->Analyze();
+	}
 }
 
 void StartFrame(void)