Skip to content

Commit a97ad1d

Browse files
Cleanup arena scaling
1 parent 3745219 commit a97ad1d

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/Gamemodes/Sandbox.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,19 @@ export default class SandboxArena extends ArenaEntity {
4747
public constructor(game: GameServer) {
4848
super(game);
4949

50-
this.updateBounds(2500, 2500);
5150
this.arenaData.values.flags |= ArenaFlags.canUseCheats;
5251
this.state = ArenaState.OPEN; // Sandbox should start instantly, no countdown
53-
// const w1 = new MazeWall(this.game, 0, 0, 500, 500);
52+
53+
this.setSandboxArenaSize(0);
54+
}
55+
56+
public setSandboxArenaSize(playerCount: number) {
57+
const arenaSize = Math.floor(25 * Math.sqrt(Math.max(playerCount, 1))) * 100;
58+
this.updateBounds(arenaSize, arenaSize);
5459
}
5560

5661
public tick(tick: number) {
57-
const arenaSize = Math.floor(25 * Math.sqrt(Math.max(this.game.clients.size, 1))) * 100;
58-
if (this.width !== arenaSize || this.height !== arenaSize) this.updateBounds(arenaSize, arenaSize);
62+
this.setSandboxArenaSize(this.game.clients.size);
5963

6064
super.tick(tick);
6165
}

src/Gamemodes/Survival.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ export default class SurvivalArena extends ArenaEntity {
5151
super(game);
5252
this.shapeScoreRewardMultiplier = 3.0;
5353

54-
this.updateBounds(2500, 2500);
5554
this.arenaData.values.flags &= ~ArenaFlags.gameReadyStart;
5655
this.arenaData.values.playersNeeded = MIN_PLAYERS;
56+
57+
this.setSurvivalArenaSize(0);
5758
}
5859

5960
public updateArenaState() {

0 commit comments

Comments
 (0)