improve zbot in zb1

Author: MoeMod

CMakeLists.txt

@@ -31,6 +31,11 @@ if(CMAKE_SIZEOF_VOID_P MATCHES "8")
     endif()
 endif()
 
+# force xp build
+if(MSVC)
+	add_definitions(-D_USING_V110_SDK71_)
+endif()
+
 if(64BIT AND CMAKE_SIZEOF_VOID_P EQUAL 4)
 	message(FATAL_ERROR "You enabled XASH_64BIT, but compiler can't create 64 bit code!")
 endif()

CMakeSettings.json

@@ -965,3 +965,28 @@ float CCSBot::GetRangeToFarthestEscortedHostage() const
 
 	return away.m_farRange;
 }
+
+bool CCSBot::IsAwareOfEnemyDeath() const
+{
+	if (GetEnemyDeathTimestamp() == 0.0f)
+		return false;
+
+	if (m_enemy == NULL)
+		return true;
+
+	if (!m_enemy->IsAlive() && gpGlobals->time - GetEnemyDeathTimestamp() > (1.0f - GetProfile()->GetSkill()))
+		return true;
+
+	if (g_pGameRules->PlayerRelationship(const_cast<CCSBot *>(this), m_enemy) == GR_TEAMMATE)
+		return true;
+
+	return false;
+}
+
+void CCSBot::MakeZombie(ZombieLevel iEvolutionLevel)
+{
+	CBasePlayer::MakeZombie(iEvolutionLevel);
+	StopAiming();
+	StopAttacking();
+	Idle();
+}

dlls/bot/cs_bot.cpp

@@ -336,6 +336,8 @@ class CCSBot: public CBot
 	virtual void Walk();
 	virtual bool Jump(bool mustJump = false);										// returns true if jump was started
 
+	virtual void MakeZombie(ZombieLevel iEvolutionLevel);
+
 	virtual void OnEvent(GameEventType event, CBaseEntity *entity = NULL, CBaseEntity *other = NULL);			// invoked when event occurs in the game (some events have NULL entity)
 
 	#define CHECK_FOV true
@@ -1413,20 +1415,6 @@ inline const Vector *CCSBot::GetNoisePosition() const
 	return NULL;
 }
 
-inline bool CCSBot::IsAwareOfEnemyDeath() const
-{
-	if (GetEnemyDeathTimestamp() == 0.0f)
-		return false;
-
-	if (m_enemy == NULL)
-		return true;
-
-	if (!m_enemy->IsAlive() && gpGlobals->time - GetEnemyDeathTimestamp() > (1.0f - GetProfile()->GetSkill()))
-		return true;
-
-	return false;
-}
-
 inline bool CCSBot::IsNotMoving() const
 {
 	const float stillSpeed = 10.0f;

dlls/bot/cs_bot.h

@@ -973,6 +973,8 @@ void CCSBot::UpdateReactionQueue()
 		m_enemyQueue[ now ].player = NULL;
 		m_enemyQueue[ now ].isReloading = false;
 		m_enemyQueue[ now ].isProtectedByShield = false;
+		if(m_isAttacking)
+			StopAttacking();
 	}
 
 	// queue is round-robin

dlls/bot/cs_bot_vision.cpp

@@ -516,10 +516,11 @@ void AttackState::OnUpdate(CCSBot *me)
 	if (gpGlobals->time > m_reacquireTimestamp)
 		me->FireWeaponAtEnemy();
 
-
+	bool bEnemyIsZombie = (enemy->IsPlayer() && static_cast<CBasePlayer *>(enemy)->m_bIsZombie);
+	// attacking zombie, must moveback
 	// do dodge behavior
 	// If sniping or crouching, stand still.
-	if (m_dodge && !me->IsUsingSniperRifle() && !m_crouchAndHold)
+	if (m_dodge || bEnemyIsZombie)
 	{
 		Vector toEnemy = enemy->pev->origin - me->pev->origin;
 		float range = toEnemy.Length2D();
@@ -530,67 +531,76 @@ void AttackState::OnUpdate(CCSBot *me)
 		float maxRange = me->GetCombatRange() + hysterisRange;
 
 		// move towards (or away from) enemy if we are using a knife, behind a corner, or we aren't very skilled
-		if (me->GetProfile()->GetSkill() < 0.66f || !me->IsEnemyVisible())
+		if (me->GetProfile()->GetSkill() < 0.66f || !me->IsEnemyVisible() || bEnemyIsZombie)
 		{
 			if (range > maxRange)
+			{
 				me->MoveForward();
+				SetCrouchAndHold(false);
+			}
 			else if (range < minRange)
+			{
 				me->MoveBackward();
+				SetCrouchAndHold(false);
+			}
 		}
 
-		// don't dodge if enemy is facing away
-		const float dodgeRange = 2000.0f;
-		if (range > dodgeRange || !me->IsPlayerFacingMe(enemy))
-		{
-			m_dodgeState = STEADY_ON;
-			m_nextDodgeStateTimestamp = 0.0f;
-		}
-		else if (gpGlobals->time >= m_nextDodgeStateTimestamp)
+		if (!me->IsUsingSniperRifle() && !m_crouchAndHold)
 		{
-			int next;
-
-			// select next dodge state that is different that our current one
-			do
+			// don't dodge if enemy is facing away
+			const float dodgeRange = 2000.0f;
+			if (range > dodgeRange || !me->IsPlayerFacingMe(enemy))
 			{
-				// high-skill bots may jump when first engaging the enemy (if they are moving)
-				const float jumpChance = 33.3f;
-				if (m_firstDodge && me->GetProfile()->GetSkill() > 0.5f && RANDOM_FLOAT(0, 100) < jumpChance && !me->IsNotMoving())
-					next = RANDOM_LONG(0, NUM_ATTACK_STATES - 1);
-				else
-					next = RANDOM_LONG(0, NUM_ATTACK_STATES - 2);
+				m_dodgeState = STEADY_ON;
+				m_nextDodgeStateTimestamp = 0.0f;
 			}
-			while (!m_firstDodge && next == m_dodgeState);
+			else if (gpGlobals->time >= m_nextDodgeStateTimestamp)
+			{
+				int next;
 
-			m_dodgeState = (DodgeStateType)next;
-			m_nextDodgeStateTimestamp = gpGlobals->time + RANDOM_FLOAT(0.3f, 1.0f);
-			m_firstDodge = false;
-		}
+				// select next dodge state that is different that our current one
+				do
+				{
+					// high-skill bots may jump when first engaging the enemy (if they are moving)
+					const float jumpChance = 33.3f;
+					if (m_firstDodge && me->GetProfile()->GetSkill() > 0.5f && RANDOM_FLOAT(0, 100) < jumpChance && !me->IsNotMoving())
+						next = RANDOM_LONG(0, NUM_ATTACK_STATES - 1);
+					else
+						next = RANDOM_LONG(0, NUM_ATTACK_STATES - 2);
+				} while (!m_firstDodge && next == m_dodgeState);
+
+				m_dodgeState = (DodgeStateType)next;
+				m_nextDodgeStateTimestamp = gpGlobals->time + RANDOM_FLOAT(0.3f, 1.0f);
+				m_firstDodge = false;
+			}
 
-		switch (m_dodgeState)
-		{
-		case STEADY_ON:
-		{
-			break;
-		}
-		case SLIDE_LEFT:
-		{
-			me->StrafeLeft();
-			break;
-		}
-		case SLIDE_RIGHT:
-		{
-			me->StrafeRight();
-			break;
-		}
-		case JUMP:
-		{
-			if (me->m_isEnemyVisible)
+			switch (m_dodgeState)
+			{
+			case STEADY_ON:
 			{
-				me->Jump();
+				break;
+			}
+			case SLIDE_LEFT:
+			{
+				me->StrafeLeft();
+				break;
+			}
+			case SLIDE_RIGHT:
+			{
+				me->StrafeRight();
+				break;
+			}
+			case JUMP:
+			{
+				if (me->m_isEnemyVisible)
+				{
+					me->Jump();
+				}
+				break;
+			}
 			}
-			break;
-		}
 		}
+		
 	}
 }
 

dlls/bot/states/cs_bot_attack.cpp

@@ -15,7 +15,8 @@ class CBasePlayer; // player.h
 class IBaseMod : public CHalfLifeMultiplay
 {
 public:
-	virtual bool IsZBMode() = 0;
+	virtual bool IsZBMode() { return false; };
+	virtual bool FIgnoreBuyZone(CBasePlayer *player) { return false; }
 	virtual bool CanPlayerBuy(CBasePlayer *player, bool display) = 0;
 };
 

dlls/gamemode/mod_base.h

@@ -282,8 +282,6 @@ void CMod_DeathMatch::PlayerSpawn(CBasePlayer *pPlayer)
 	// Give Armor
 	pPlayer->m_iKevlar = ARMOR_TYPE_HELMET;
 	pPlayer->pev->armorvalue = 100;
-
-	pPlayer->m_signals.Signal(SIGNAL_BUY);
 }
 
 bool CMod_DeathMatch::CheckWinLimitDM()

dlls/gamemode/mod_dm.cpp

@@ -30,7 +30,8 @@ class CMod_DeathMatch : public IBaseMod_RemoveObjects, public IBaseMod_RandomSpa
 	void PlayerSpawn(CBasePlayer *pPlayer) override;
 	bool CanPlayerBuy(CBasePlayer *player, bool display) override { return true; }
 public:
-	bool IsZBMode() override { return false; }
+	bool IsZBMode() override { return true; }
+	bool FIgnoreBuyZone(CBasePlayer *player) override { return true; }
 
 public:
 	int CalcLeaderFrags();

dlls/gamemode/mod_dm.h

@@ -291,7 +291,7 @@ void CMod_Zombi::HumanInfectionByZombie(CBasePlayer *player, CBasePlayer *attack
 	EMIT_SOUND(ENT(player->pev), CHAN_BODY, RANDOM_LONG(0, 1) ? "zombi/human_death_01.wav" : "zombi/human_death_02.wav", VOL_NORM, ATTN_NORM);
 
 
-	DeathNotice(player, attacker->pev, attacker->m_pActiveItem->pev);
+	DeathNotice(player, attacker->pev, attacker->pev);
 	SetScoreAttrib(player, player);
 	TeamCheck();
 	CheckWinConditions();
@@ -362,8 +362,6 @@ void CMod_Zombi::PlayerSpawn(CBasePlayer *pPlayer)
 	pPlayer->m_iKevlar = ARMOR_TYPE_HELMET;
 	pPlayer->pev->armorvalue = 100;
 	pPlayer->m_bIsZombie = false;
-
-	pPlayer->m_signals.Signal(SIGNAL_BUY);
 }
 
 BOOL CMod_Zombi::FPlayerCanTakeDamage(CBasePlayer *pPlayer, CBaseEntity *pAttacker)