Skip to content

Nades size #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solcloud merged 2 commits into from
Sep 9, 2025
Merged

Nades size #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a1bd33
Fix ramp normal
coopryan Sep 9, 2025
2614e36
Increase spread area for smoke and molotov
coopryan Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/Core/PlaneBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion server/src/Equipment/Molotov.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function getSpawnAreaMetersSquared(): int

public function getMaxAreaMetersSquared(): int
{
return 200_000;
return 450_000;
}

public function calculateDamage(bool $hasKevlar): int
Expand Down
2 changes: 1 addition & 1 deletion server/src/Equipment/Smoke.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public function getMaxTimeMs(): int

public function getMaxAreaMetersSquared(): int
{
return 210_000;
return 550_000;
}
}
1 change: 0 additions & 1 deletion server/src/HitGeometry/BallCollider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion test/og/Shooting/MolotovGrenadeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down