Players can now spawn from factories by c86ec23b-fef1-4979-b2fa-b9adc351b8cc · Pull Request #185 · abcxff/diepcustom

c86ec23b-fef1-4979-b2fa-b9adc351b8cc · 2025-12-28T10:25:40Z

No description provided.

abcxff · 2026-01-16T15:56:28Z

Copilot · 2026-01-16T15:56:38Z

@abcxff I've opened a new pull request, #186, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot

Pull request overview

This PR implements a new feature allowing players to spawn from allied factory tanks with a 5% chance, adding strategic gameplay depth to team-based modes. The PR also includes several bug fixes and code improvements.

Changes:

Added factory spawning mechanic with configurable chance (5% by default)
Fixed critical logic bug in spawn location collision detection
Refactored team assignment logic across multiple game modes for consistency
Various code cleanups including quote style standardization and improved helper functions

Reviewed changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
src/util.ts	Added `getRandomPosition` utility function and updated comment formatting
src/config.ts	Added `factorySpawnChance` configuration and renamed `countdownTicks` to `countdownDuration`
src/Native/Camera.ts	Moved `relationsData` field from ClientCamera to base CameraEntity class
src/Native/Arena.ts	Implemented `attemptFactorySpawn` method and fixed spawn location collision detection logic
src/Misc/MazeGenerator.ts	Updated MazeWall constructor call to pass arena instead of game
src/Gamemodes/Team4.ts	Refactored team assignment with `decideTeam` helper and integrated factory spawning
src/Gamemodes/Team2.ts	Refactored team assignment with `decideTeam` helper and integrated factory spawning
src/Gamemodes/Tag.ts	Refactored team assignment, integrated factory spawning, and improved team scoring
src/Gamemodes/Survival.ts	Updated config variable name from `countdownTicks` to `countdownDuration`
src/Gamemodes/Mothership.ts	Refactored team assignment and integrated factory spawning
src/Gamemodes/Domination.ts	Refactored team assignment with `decideTeam` helper
src/Game.ts	Added `broadcastMessage` helper method for notifications
src/Entity/Tank/Projectile/Bullet.ts	Removed automatic wall-phasing for arena team bullets
src/Entity/Tank/Barrel.ts	Standardized string quotes from single to double quotes
src/Entity/Object.ts	Changed `arenaMobID` type to `string \| null` and added defensive check in delete method
src/Entity/Misc/TeamEntity.ts	Added `base` property and static `setTeam` helper method
src/Entity/Misc/TeamBase.ts	Set team's base property when creating TeamBase
src/Entity/Misc/Mothership.ts	Added fallback for missing team name
src/Entity/Misc/MazeWall.ts	Changed constructor to accept ArenaEntity instead of GameServer
src/Entity/Boss/AbstractBoss.ts	Added null-safe fallback for killer name
src/Entity/AI.ts	Improved type safety by using ObjectEntity type for AI targets
src/Const/Commands.ts	Added `game_neutral` command and improved teleport command validation
src/Client.ts	Fixed order of `onDeath` and `onKill` calls in suicide handler

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-16T16:06:01Z

src/Native/Arena.ts

+        if (factories.length === 0) return false; // No available factories on this team, spawn as usual
+
+        const factory = randomFrom(factories);
+


The attemptFactorySpawn method accesses factory.barrels[0] without checking if the factory has any barrels. While factories should have at least one barrel by design, it's safer to add a check here to prevent potential crashes if a factory somehow has no barrels (e.g., during edge cases or if the tank definition is modified).

Suggested change

// Ensure the selected factory has at least one barrel before using it

if (!factory.barrels || factory.barrels.length === 0) {

return false;

}

Copilot · 2026-01-16T16:06:02Z

src/Gamemodes/Domination.ts

+    public spawnPlayer(tank: TankBody, client: Client) {
+        const team = this.decideTeam(client);
+        TeamEntity.setTeam(team, tank);
+
+        const teamBase = team.base;
+        if (!teamBase) return super.spawnPlayer(tank, client);
+
+        const pos = getRandomPosition(teamBase);
+        tank.positionData.values.x = pos.x;
+        tank.positionData.values.y = pos.y;
    }


The Domination gamemode's spawnPlayer method does not call attemptFactorySpawn, unlike the other team-based gamemodes (Team2, Team4, Tag, Mothership). This means players in Domination mode will not be able to spawn from factories, which is inconsistent with the feature being added in this PR.

src/util.ts

Copilot · 2026-01-16T16:06:02Z

src/Entity/Tank/Barrel.ts

    public droneCount = 0;

-    /** The barrel's addons */
+    /** The barrel"s addons */


The comment uses double-quote character instead of an apostrophe. Consider changing barrel"s to barrel's for proper grammar and readability.

Suggested change

/** The barrel"s addons */

/** The barrel's addons */

Copilot · 2026-01-16T16:06:03Z

src/Entity/Object.ts

 import * as util from "../util";
 import GameServer from "../Game";
-import Vector from "../Physics/Vector";
+import Vector, { VectorAbstract } from "../Physics/Vector";


Unused import VectorAbstract.

Suggested change

import Vector, { VectorAbstract } from "../Physics/Vector";

import Vector from "../Physics/Vector";

Copilot · 2026-01-16T16:06:04Z

src/Gamemodes/Team2.ts

 import ArenaEntity from "../Native/Arena";
 import Client from "../Client";

+import ObjectEntity from "../Entity/Object";


Unused import ObjectEntity.

Suggested change

import ObjectEntity from "../Entity/Object";

Copilot · 2026-01-16T16:06:04Z

src/Gamemodes/Team4.ts

 import ArenaEntity from "../Native/Arena";
 import Client from "../Client";

+import ObjectEntity from "../Entity/Object";


Unused import ObjectEntity.

Suggested change

import ObjectEntity from "../Entity/Object";

Copilot · 2026-01-16T16:06:04Z

src/Native/Arena.ts

 import Client from "../Client";

-import { countdownTicks, bossSpawningInterval, scoreboardUpdateInterval } from "../config";
+import { countdownDuration, bossSpawningInterval, factorySpawnChance, scoreboardUpdateInterval } from "../config";


Unused import bossSpawningInterval.

Suggested change

import { countdownDuration, bossSpawningInterval, factorySpawnChance, scoreboardUpdateInterval } from "../config";

import { countdownDuration, factorySpawnChance, scoreboardUpdateInterval } from "../config";

Copilot · 2026-01-16T16:06:04Z

src/Entity/Tank/Projectile/Bullet.ts

        this.physicsData.values.sides = 1;
        this.physicsData.values.flags |= PhysicsFlags.noOwnTeamCollision | PhysicsFlags.canEscapeArena;
-        if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls || this.relationsData.values.team === this.game.arena) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls
+        if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls


Avoid automated semicolon insertion (97% of all statements in the enclosing function have an explicit semicolon).

Suggested change

if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls

if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls;

Copilot · 2026-01-16T16:06:05Z

src/Gamemodes/Tag.ts

+                        `${leaderTeam.teamName} HAS WON THE GAME!`,
+                        ColorsHexCode[leaderTeam.teamData.values.teamColor],
+                        -1
+                    )


Avoid automated semicolon insertion (91% of all statements in the enclosing function have an explicit semicolon).

Suggested change

)

);

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

abcxff · 2026-01-16T16:37:23Z

@copilot for the following prompt keep in mind:

we add semicolons in line with other C-like standards, and do not abide by implict semicolons in Javascript
we add comments to describe only complex, perhaps unreadable, chunks of code and otherwise they should not be used at all

FIX THE FOLLOWING IN THIS PR:

" in the comment barrel"s
unused imports should be removed
make getRandomPosition use uniform within circles via trig & sqrt
add missing factory spawning to domination gamemode (as already exists in other gamemodes)
use isFinite rather than isNaN in commands.ts

Plan concisely and review package.json for typecheck commands

Copilot · 2026-01-16T16:37:31Z

@abcxff I've opened a new pull request, #187, to work on those changes. Once the pull request is ready, I'll request review from you.

…add missing factory spawn (#187) * Initial plan * Address review feedback: fix typos, remove unused imports, use isFinite, add factory spawning to Domination Co-authored-by: abcxff <79597906+abcxff@users.noreply.github.com> * Remove redundant MAX_SAFE_INTEGER checks with isFinite Co-authored-by: abcxff <79597906+abcxff@users.noreply.github.com> * Add back bounds checking for score and points in commands --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: abcxff <79597906+abcxff@users.noreply.github.com>

abcxff · 2026-01-16T16:05:52Z

src/Const/Commands.ts

        const x = xArg.match(RELATIVE_POS_REGEX) ? player.positionData.x + parseInt(xArg.slice(1) || "0", 10) : parseInt(xArg, 10);
        const y = yArg.match(RELATIVE_POS_REGEX) ? player.positionData.y + parseInt(yArg.slice(1) || "0", 10) : parseInt(yArg, 10);
+
        if (isNaN(x) || isNaN(y)) return;


Should be using isFinite rather than isNaN everywhere. isFinite(x) = isNaN(x) && x is not an infinity

c86ec23b-fef1-4979-b2fa-b9adc351b8cc added 19 commits December 13, 2025 19:06

factory test

e9d5391

Update Arena.ts

5376660

Fix boss death notif

9f91b92

broadcast msg function

838e2ac

whoops

8ebcf3a

typescript

a2f5668

safety

2a9eb0d

fix crash

c8cc8ed

update color properly

2984146

admin fun cmd

d190a07

tag cleanup

255230b

Crash fix

f3eb97e

speedup AI slightly

569eca5

move getRandomPosition to util

b547697

Fix maze wall team

e100155

factory spawn chance tweak

e4eb26f

Fix spawns

d12f298

Fix 4 teams base locations

2b08355

typo

1d86e23

abcxff self-requested a review January 16, 2026 15:56

Copilot AI mentioned this pull request Jan 16, 2026

Players can now spawn from factories #186

Closed

abcxff requested a review from Copilot January 16, 2026 16:00

Copilot started reviewing on behalf of abcxff January 16, 2026 16:00 View session

Copilot AI reviewed Jan 16, 2026

View reviewed changes

fix randompos for circles

1c269a1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI mentioned this pull request Jan 16, 2026

Address code review feedback: remove unused imports, fix validation, add missing factory spawn #187

Merged

abcxff approved these changes Jan 16, 2026

View reviewed changes

c86ec23b-fef1-4979-b2fa-b9adc351b8cc merged commit d4740bd into main Jan 16, 2026
2 checks passed

		if (factories.length === 0) return false; // No available factories on this team, spawn as usual

		const factory = randomFrom(factories);

+        // Ensure the selected factory has at least one barrel before using it
+        if (!factory.barrels || factory.barrels.length === 0) {
+            return false;
+        }

	import Vector, { VectorAbstract } from "../Physics/Vector";
	import Vector from "../Physics/Vector";

	import { countdownDuration, bossSpawningInterval, factorySpawnChance, scoreboardUpdateInterval } from "../config";
	import { countdownDuration, factorySpawnChance, scoreboardUpdateInterval } from "../config";

	if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags \|= PositionFlags.canMoveThroughWalls
	if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags \|= PositionFlags.canMoveThroughWalls;

Conversation

c86ec23b-fef1-4979-b2fa-b9adc351b8cc commented Dec 28, 2025

Uh oh!

abcxff commented Jan 16, 2026

Uh oh!

Copilot AI commented Jan 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

abcxff commented Jan 16, 2026

Uh oh!

Copilot AI commented Jan 16, 2026

Uh oh!

abcxff Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants