Invasion damage fix

Siile · Sep 14, 2024 · 5e641c7 · 5e641c7
1 parent 73afae5
commit 5e641c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
@@ -2222,7 +2222,7 @@ bool CCharacter::TakeDamage(int From, int Weapon, int Dmg, vec2 Force, vec2 Pos)
 	float Electro = WeaponElectroAmount(Weapon);
 
 	// damage reduction for invasion
-	if (Dmg > 0 && GameServer()->m_pController->IsCoop() && !GetPlayer()->m_pAI)
+	if (Dmg > 0 && GameServer()->m_pController->IsCoop() && !m_IsBot)
 		Dmg = max(1, Dmg/2);
 
 	if (From == m_pPlayer->GetCID())

diff --git a/src/game/server/mapgen.cpp b/src/game/server/mapgen.cpp
@@ -1151,7 +1151,7 @@ void CMapGen::GenerateLevel()
 	*/
 
 	{
-		for (int i = 0; i < 3; i++)
+		for (int i = 0; i < 3+Level/5; i++)
 			GenerateTurretStand(pTiles);
 	}