diff --git a/server/src/Core/PlaneBuilder.php b/server/src/Core/PlaneBuilder.php index f3f87ae..58452b2 100644 --- a/server/src/Core/PlaneBuilder.php +++ b/server/src/Core/PlaneBuilder.php @@ -193,8 +193,8 @@ private function ramp(Point $start, Point $end, int $width, float $jaggedness): GameException::invalid(); // @codeCoverageIgnore } assert($angleV !== 0.0); - $normalH = $angleH + 90; // fixme: embrace jaggedness - $normalV = $angleV + 90; // fixme: embrace jaggedness + $normalH = $angleH; // fixme: embrace jaggedness + $normalV = $angleV - 90; // fixme: embrace jaggedness $planes = []; $previous = $start->clone(); diff --git a/server/src/Equipment/Molotov.php b/server/src/Equipment/Molotov.php index e7274e0..cb27455 100644 --- a/server/src/Equipment/Molotov.php +++ b/server/src/Equipment/Molotov.php @@ -28,7 +28,7 @@ public function getSpawnAreaMetersSquared(): int public function getMaxAreaMetersSquared(): int { - return 200_000; + return 450_000; } public function calculateDamage(bool $hasKevlar): int diff --git a/server/src/Equipment/Smoke.php b/server/src/Equipment/Smoke.php index 0ac1e5d..823b46e 100644 --- a/server/src/Equipment/Smoke.php +++ b/server/src/Equipment/Smoke.php @@ -29,6 +29,6 @@ public function getMaxTimeMs(): int public function getMaxAreaMetersSquared(): int { - return 210_000; + return 550_000; } } diff --git a/server/src/HitGeometry/BallCollider.php b/server/src/HitGeometry/BallCollider.php index ac15a2e..0148a75 100644 --- a/server/src/HitGeometry/BallCollider.php +++ b/server/src/HitGeometry/BallCollider.php @@ -59,7 +59,6 @@ public function hasCollision(Point $point): ?bool $normalVec = $planeCollision->getNormalizedNormal($this->angleHorizontal, $this->angleVertical, $precision); $directionVec = Util::movementXYZ($this->angleHorizontal, $this->angleVertical, $precision); $doubleDotProduct = 2 * ($directionVec[0] * $normalVec[0] + $directionVec[1] * $normalVec[1] + $directionVec[2] * $normalVec[2]); - assert($doubleDotProduct <= 0); if ($doubleDotProduct == 0) { return null; } diff --git a/test/og/Shooting/MolotovGrenadeTest.php b/test/og/Shooting/MolotovGrenadeTest.php index d893c74..bbf0bc3 100644 --- a/test/og/Shooting/MolotovGrenadeTest.php +++ b/test/og/Shooting/MolotovGrenadeTest.php @@ -228,7 +228,7 @@ function (Player $p) use (&$health) { $this->endGame(), ]); - $this->assertFalse($game->getWorld()->activeMolotovExists()); + $this->assertSame(1, $game->getRoundNumber()); } public function testTunnelExpand(): void