Admin/airship-phaser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable pirate friendly fire

Browse Source
This commit is contained in:
Admin 2026-09-20 07:54:25 +00:00
parent b0b88f432c
commit aff9f3f276
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game-v4.js
View File

@ -120,6 +120,7 @@ class GameScene extends Phaser.Scene {
this.createEnvironmentPhysics();
this.physics.add.overlap(this.playerShots, this.pirates, this.hitPirate, null, this);
this.physics.add.overlap(this.pirateShots, this.pirates, this.hitPirate, null, this);
this.physics.add.overlap(this.pirateShots, this.player, this.hitPlayer, null, this);
registerDebugSnapshot(() => ({
@ -798,6 +799,7 @@ class GameScene extends Phaser.Scene {
shot.setData('bornAt', this.time.now);
shot.setData('damage', projectileDamage);
shot.setData('projectileOwner', actor);
shot.setData('sourceShip', ship);
if (actor === 'pirate') shot.setData('playerHitQueued', false);
const shotWind = environmentWindAt({
x,
@ -817,10 +819,16 @@ class GameScene extends Phaser.Scene {
hitPirate(first, second) {
if (this.gameState !== 'playing') return;
const shot = resolveTaggedProjectile(first, second, 'player');
const playerShot = resolveTaggedProjectile(first, second, 'player');
const pirateShot = playerShot ? null : resolveTaggedProjectile(first, second, 'pirate');
const shot = playerShot || pirateShot;
const pirate = shot === first ? second : first;
if (!shot?.active || !pirate?.active || pirate === this.player) return;
const projectileOwner = shot.getData('projectileOwner');
const sourceShip = shot.getData('sourceShip');
if (projectileOwner === 'pirate' && sourceShip === pirate) return;
const damage = shot.getData('damage') || 10;
const { x, y } = shot;
shot.destroy();
@ -834,12 +842,14 @@ class GameScene extends Phaser.Scene {
damage,
hullBefore: previousHull,
hullAfter: hull,
projectileOwner,
friendlyFire: projectileOwner === 'pirate',
});
if (hull <= 0) {
this.spawnExplosion(pirate.x, pirate.y, 1.25);
pirate.destroy();
this.defeated += 1;
if (projectileOwner === 'player') this.defeated += 1;
if (this.pirates.countActive(true) === 0) {
this.wave += 1;
@ -852,7 +862,7 @@ class GameScene extends Phaser.Scene {
return;
}
this.flashShip(pirate, 0xffcccc);
this.flashShip(pirate, projectileOwner === 'pirate' ? 0xffd29a : 0xffcccc);
}
hitPlayer(first, second) {

11
tests/wiring.test.mjs
View File

@ -194,6 +194,17 @@ test('player and pirate broadsides use the cannonball image asset', async () =>
assert.doesNotMatch(source, /generateTexture\('pirate-shot'/);
});
test('pirate cannonballs damage other pirates but ignore their source ship', async () => {
const source = await read('src/game-v4.js');
assert.match(source, /this\.physics\.add\.overlap\(this\.pirateShots, this\.pirates, this\.hitPirate/);
assert.match(source, /shot\.setData\('sourceShip', ship\)/);
assert.match(source, /const pirateShot = playerShot \? null : resolveTaggedProjectile\(first, second, 'pirate'\)/);
assert.match(source, /if \(projectileOwner === 'pirate' && sourceShip === pirate\) return/);
assert.match(source, /friendlyFire: projectileOwner === 'pirate'/);
assert.match(source, /if \(projectileOwner === 'player'\) this\.defeated \+= 1/);
});
test('player uses the four-frame north-facing sheet as a forward propulsion animation', async () => {
const source = await read('src/game-v4.js');