quake2ts 0.0.598 → 0.0.600

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quake2ts",
-  "version": "0.0.598",
+  "version": "0.0.600",
   "description": "Quake II re-release port to TypeScript with WebGL renderer - A complete game engine with physics, networking, and BSP rendering",
   "type": "module",
   "keywords": [
@@ -110,8 +110,8 @@
     "tsx": "^4.20.6",
     "typescript": "^5.4.5",
     "vitest": "^1.5.3",
-    "@quake2ts/tests": "^0.0.1",
-    "@quake2ts/test-utils": "^0.0.1"
+    "@quake2ts/test-utils": "^0.0.1",
+    "@quake2ts/tests": "^0.0.1"
   },
   "dependencies": {
     "@wasm-audio-decoders/ogg-vorbis": "^0.1.20",

package/packages/test-utils/dist/index.cjs

@@ -121,6 +121,7 @@ __export(index_exports, {
   createNetChanMock: () => createNetChanMock,
   createPacketMock: () => createPacketMock,
   createPhysicsTestContext: () => createPhysicsTestContext,
+  createPhysicsTestScenario: () => createPhysicsTestScenario,
   createPlayerEntityFactory: () => createPlayerEntityFactory,
   createPlayerStateFactory: () => createPlayerStateFactory,
   createPlaywrightTestClient: () => createPlaywrightTestClient,
@@ -156,7 +157,10 @@ __export(index_exports, {
   simulateBandwidthLimit: () => simulateBandwidthLimit,
   simulateCameraMovement: () => simulateCameraMovement,
   simulateFrames: () => simulateFrames,
+  simulateGravity: () => simulateGravity,
   simulateHandshake: () => simulateHandshake,
+  simulateJump: () => simulateJump,
+  simulateMovement: () => simulateMovement,
   simulateNetworkCondition: () => simulateNetworkCondition,
   simulatePlayerInput: () => simulatePlayerInput,
   simulatePlayerJoin: () => simulatePlayerJoin,
@@ -699,6 +703,8 @@ function createTestContext(options) {
       sightEntity: null,
       soundEntity: null
     },
+    warn: import_vitest2.vi.fn(),
+    // Added warn to entities as it is sometimes used there too, though typically on SpawnContext
     // Adding missing properties to satisfy EntitySystem interface partially or fully
     // We cast to unknown first anyway, but filling these in makes it safer for consumers
     skill: 1,
@@ -739,6 +745,112 @@ function createEntity() {
   return new import_game2.Entity(1);
 }
 
+// src/game/helpers/physics.ts
+var import_game3 = require("@quake2ts/game");
+var import_shared5 = require("@quake2ts/shared");
+function createPhysicsTestScenario(scenarioType, context) {
+  const walls = [];
+  const ground = context.entities.spawn();
+  ground.classname = "func_wall";
+  ground.solid = import_game3.Solid.Bsp;
+  ground.movetype = import_game3.MoveType.Push;
+  ground.origin = { x: 0, y: 0, z: -10 };
+  ground.mins = { x: -1e3, y: -1e3, z: -10 };
+  ground.maxs = { x: 1e3, y: 1e3, z: 0 };
+  context.entities.linkentity(ground);
+  const setupStairs = () => {
+    for (let i = 0; i < 5; i++) {
+      const step = context.entities.spawn();
+      step.classname = "func_wall";
+      step.solid = import_game3.Solid.Bsp;
+      step.origin = { x: 100 + i * 32, y: 0, z: i * 16 };
+      step.mins = { x: 0, y: -64, z: 0 };
+      step.maxs = { x: 32, y: 64, z: 16 };
+      context.entities.linkentity(step);
+      walls.push(step);
+    }
+  };
+  const setupLadder = () => {
+    const ladder = context.entities.spawn();
+    ladder.classname = "func_wall";
+    ladder.solid = import_game3.Solid.Bsp;
+    ladder.origin = { x: 100, y: 0, z: 0 };
+    ladder.mins = { x: 0, y: -32, z: 0 };
+    ladder.maxs = { x: 10, y: 32, z: 200 };
+    ladder.surfaceFlags = 1;
+    context.entities.linkentity(ladder);
+    walls.push(ladder);
+  };
+  const setupPlatform = () => {
+    const plat = context.entities.spawn();
+    plat.classname = "func_plat";
+    plat.solid = import_game3.Solid.Bsp;
+    plat.movetype = import_game3.MoveType.Push;
+    plat.origin = { x: 0, y: 0, z: 0 };
+    plat.mins = { x: -64, y: -64, z: 0 };
+    plat.maxs = { x: 64, y: 64, z: 10 };
+    context.entities.linkentity(plat);
+    walls.push(plat);
+  };
+  if (scenarioType === "stairs") setupStairs();
+  else if (scenarioType === "ladder") setupLadder();
+  else if (scenarioType === "platform") setupPlatform();
+  return {
+    ground,
+    walls,
+    setup: (ctx) => {
+    }
+  };
+}
+function simulateMovement(entity, destination, context) {
+  const dt = 0.1;
+  const delta = (0, import_shared5.subtractVec3)(destination, entity.origin);
+  const dist2 = (0, import_shared5.lengthVec3)(delta);
+  if (dist2 < 1e-3) {
+    return createTraceMock({ fraction: 1, endpos: destination });
+  }
+  const dir = (0, import_shared5.normalizeVec3)(delta);
+  entity.velocity = (0, import_shared5.scaleVec3)(dir, dist2 / dt);
+  const start = { ...entity.origin };
+  const end = destination;
+  const tr = context.entities.trace(start, entity.mins, entity.maxs, end, entity, entity.clipmask || 0);
+  if (!tr.startsolid && !tr.allsolid) {
+    if (tr.endpos) {
+      entity.origin = { ...tr.endpos };
+    } else {
+      entity.origin = { ...end };
+    }
+    context.entities.linkentity(entity);
+  }
+  return tr;
+}
+function simulateGravity(entity, deltaTime, context) {
+  const gravity = context.game.cvars?.gravity?.value ?? 800;
+  if (entity.groundentity || !entity.movetype) return;
+  entity.velocity = {
+    x: entity.velocity.x,
+    y: entity.velocity.y,
+    z: entity.velocity.z - gravity * deltaTime
+  };
+  const start = { ...entity.origin };
+  const end = { x: start.x, y: start.y, z: start.z - 0.25 };
+  const tr = context.entities.trace(start, entity.mins, entity.maxs, end, entity, entity.clipmask || 0);
+  if (tr.fraction < 1) {
+    entity.groundentity = tr.ent || context.entities.world;
+    entity.velocity = { ...entity.velocity, z: 0 };
+    if (tr.endpos) {
+      entity.origin = { ...entity.origin, z: tr.endpos.z };
+    }
+  } else {
+    entity.groundentity = null;
+  }
+}
+function simulateJump(entity, context) {
+  if (!entity.groundentity) return;
+  entity.groundentity = null;
+  entity.velocity = { ...entity.velocity, z: 270 };
+}
+
 // src/game/mocks/ai.ts
 var import_vitest3 = require("vitest");
 function createMockAI(overrides = {}) {
@@ -782,11 +894,11 @@ function createMockMonsterMove(first, last, think, action) {
 
 // src/game/mocks/combat.ts
 var import_vitest4 = require("vitest");
-var import_game3 = require("@quake2ts/game");
+var import_game4 = require("@quake2ts/game");
 function createMockDamageInfo(overrides = {}) {
   return {
     damage: 10,
-    mod: import_game3.DamageMod.UNKNOWN,
+    mod: import_game4.DamageMod.UNKNOWN,
     knockback: 0,
     attacker: null,
     inflictor: null,
@@ -830,10 +942,10 @@ var mockMonsterAttacks = {
 };
 
 // src/game/mocks/items.ts
-var import_game4 = require("@quake2ts/game");
 var import_game5 = require("@quake2ts/game");
+var import_game6 = require("@quake2ts/game");
 function createMockInventory(overrides = {}) {
-  const defaultInventory = (0, import_game4.createPlayerInventory)();
+  const defaultInventory = (0, import_game5.createPlayerInventory)();
   const inventory = {
     ...defaultInventory,
     ...overrides
@@ -842,7 +954,7 @@ function createMockInventory(overrides = {}) {
 }
 function createMockItem(id, overrides = {}) {
   let base;
-  base = import_game5.WEAPON_ITEMS[id] || import_game5.HEALTH_ITEMS[id] || import_game5.ARMOR_ITEMS[id] || import_game5.POWERUP_ITEMS[id] || import_game5.POWER_ARMOR_ITEMS[id] || import_game5.KEY_ITEMS[id] || import_game5.FLAG_ITEMS[id];
+  base = import_game6.WEAPON_ITEMS[id] || import_game6.HEALTH_ITEMS[id] || import_game6.ARMOR_ITEMS[id] || import_game6.POWERUP_ITEMS[id] || import_game6.POWER_ARMOR_ITEMS[id] || import_game6.KEY_ITEMS[id] || import_game6.FLAG_ITEMS[id];
   if (!base) {
     base = {
       id,
@@ -855,7 +967,7 @@ function createMockItem(id, overrides = {}) {
   };
 }
 function createMockWeaponItem(weaponId, overrides = {}) {
-  const found = Object.values(import_game5.WEAPON_ITEMS).find((w) => w.weaponId === weaponId);
+  const found = Object.values(import_game6.WEAPON_ITEMS).find((w) => w.weaponId === weaponId);
   const base = found ? { ...found } : {
     type: "weapon",
     id: `weapon_${weaponId}`,
@@ -888,7 +1000,7 @@ function createMockArmorItem(amount, overrides = {}) {
   };
 }
 function createMockAmmoItem(ammoItemId, overrides = {}) {
-  const def = (0, import_game5.getAmmoItemDefinition)(ammoItemId);
+  const def = (0, import_game6.getAmmoItemDefinition)(ammoItemId);
   if (!def) {
     throw new Error(`Unknown ammo item id: ${ammoItemId}`);
   }
@@ -902,7 +1014,7 @@ function createMockAmmoItem(ammoItemId, overrides = {}) {
   };
 }
 function createMockPowerupItem(id, duration, overrides = {}) {
-  const found = import_game5.POWERUP_ITEMS[id];
+  const found = import_game6.POWERUP_ITEMS[id];
   const base = found ? { ...found } : {
     type: "powerup",
     id,
@@ -1103,12 +1215,12 @@ function createMockNetDriver(overrides) {
 }
 
 // src/server/mockTransport.ts
-var import_shared5 = require("@quake2ts/shared");
+var import_shared6 = require("@quake2ts/shared");
 var MockNetworkTransport = class {
   constructor() {
     this.recordedPackets = [];
     this.sentPackets = [];
-    this.netchan = new import_shared5.NetChan();
+    this.netchan = new import_shared6.NetChan();
     this.netchan.setup(1234, { type: "loopback", port: 0 });
   }
   reset() {
@@ -1143,7 +1255,7 @@ var MockNetworkTransport = class {
 
 // src/server/mocks/state.ts
 var import_server = require("@quake2ts/server");
-var import_shared6 = require("@quake2ts/shared");
+var import_shared7 = require("@quake2ts/shared");
 var import_vitest7 = require("vitest");
 function createMockServerState(overrides) {
   return {
@@ -1155,8 +1267,8 @@ function createMockServerState(overrides) {
     frame: 0,
     name: "test_map",
     collisionModel: null,
-    configStrings: new Array(import_shared6.MAX_CONFIGSTRINGS).fill(""),
-    baselines: new Array(import_shared6.MAX_EDICTS).fill(null),
+    configStrings: new Array(import_shared7.MAX_CONFIGSTRINGS).fill(""),
+    baselines: new Array(import_shared7.MAX_EDICTS).fill(null),
     multicastBuf: new Uint8Array(0),
     ...overrides
   };
@@ -3429,6 +3541,7 @@ function createVisualTestScenario(sceneName) {
   createNetChanMock,
   createPacketMock,
   createPhysicsTestContext,
+  createPhysicsTestScenario,
   createPlayerEntityFactory,
   createPlayerStateFactory,
   createPlaywrightTestClient,
@@ -3464,7 +3577,10 @@ function createVisualTestScenario(sceneName) {
   simulateBandwidthLimit,
   simulateCameraMovement,
   simulateFrames,
+  simulateGravity,
   simulateHandshake,
+  simulateJump,
+  simulateMovement,
   simulateNetworkCondition,
   simulatePlayerInput,
   simulatePlayerJoin,