quake2ts 0.0.295 → 0.0.297

package/packages/game/dist/esm/index.js

@@ -6305,7 +6305,7 @@ var FRAME_MACHINEGUN_ACTIVATE_LAST = 3;
 var FRAME_MACHINEGUN_FIRE_LAST = 23;
 var FRAME_MACHINEGUN_IDLE_LAST = 52;
 var FRAME_MACHINEGUN_DEACTIVATE_LAST = 61;
-var FRAME_CHAINGUN_FIRE_FRAME = 5;
+var FRAME_CHAINGUN_ACTIVATE_LAST = 4;
 var FRAME_CHAINGUN_FIRE_LAST = 21;
 var FRAME_CHAINGUN_IDLE_LAST = 52;
 var FRAME_CHAINGUN_DEACTIVATE_LAST = 61;
@@ -6317,7 +6317,7 @@ var FRAME_ROCKET_ACTIVATE_LAST = 3;
 var FRAME_ROCKET_FIRE_LAST = 12;
 var FRAME_ROCKET_IDLE_LAST = 34;
 var FRAME_ROCKET_DEACTIVATE_LAST = 38;
-var FRAME_HYPERBLASTER_FIRE_FRAME = 6;
+var FRAME_HYPERBLASTER_ACTIVATE_LAST = 5;
 var FRAME_HYPERBLASTER_FIRE_LAST = 9;
 var FRAME_HYPERBLASTER_IDLE_LAST = 28;
 var FRAME_HYPERBLASTER_DEACTIVATE_LAST = 32;
@@ -6716,7 +6716,7 @@ function Weapon_Generic(ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST, FRAME_IDLE_LA
       if (pause_frames) {
         for (const frame of pause_frames) {
           if (client.gun_frame === frame) {
-            if (random2.frandom() < 0.5) {
+            if (random2.frandom() < 0.9375) {
               return;
             }
           }
@@ -6748,12 +6748,13 @@ function Weapon_Generic(ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST, FRAME_IDLE_LA
     return;
   }
 }
-function Weapon_Repeating(ent, FRAME_FIRE_FRAME, FRAME_FIRE_LAST, FRAME_IDLE_LAST, FRAME_PAUSE, FRAME_NOOP, fire, sys) {
+function Weapon_Repeating(ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST, FRAME_IDLE_LAST, FRAME_DEACTIVATE_LAST, pause_frames, fire, sys) {
   if (!ent.client) return;
   const client = ent.client;
+  const FRAME_FIRE_FIRST = FRAME_ACTIVATE_LAST + 1;
   if (client.weaponstate === 3 /* WEAPON_FIRING */) {
     if (client.gun_frame === FRAME_FIRE_LAST || client.gun_frame === FRAME_IDLE_LAST) {
-      client.gun_frame = FRAME_FIRE_FRAME;
+      client.gun_frame = FRAME_FIRE_FIRST;
     } else {
       client.gun_frame++;
     }
@@ -6764,14 +6765,15 @@ function Weapon_Repeating(ent, FRAME_FIRE_FRAME, FRAME_FIRE_LAST, FRAME_IDLE_LAS
       client.gun_frame = FRAME_IDLE_LAST + 1;
       client.weaponstate = 0 /* WEAPON_READY */;
     }
+    client.weapon_think_time = sys.timeSeconds + Weapon_AnimationTime(ent);
   } else {
     Weapon_Generic(
       ent,
-      FRAME_FIRE_FRAME - 1,
+      FRAME_ACTIVATE_LAST,
       FRAME_FIRE_LAST,
       FRAME_IDLE_LAST,
-      FRAME_PAUSE,
-      null,
+      FRAME_DEACTIVATE_LAST,
+      pause_frames,
       null,
       fire,
       sys
@@ -6780,6 +6782,7 @@ function Weapon_Repeating(ent, FRAME_FIRE_FRAME, FRAME_FIRE_LAST, FRAME_IDLE_LAS
 }
 
 // src/combat/weapons/chaingun.ts
+var CHAINGUN_PAUSE_FRAMES = [38, 43, 51, 61];
 function chaingunThink(player, sys) {
   const weaponState = getWeaponState(player.client.weaponStates, WeaponId.Chaingun);
   if (!(player.client.buttons & BUTTON_ATTACK) && weaponState.spinupCount && weaponState.spinupCount > 0) {
@@ -6788,12 +6791,11 @@ function chaingunThink(player, sys) {
   }
   Weapon_Repeating(
     player,
-    FRAME_CHAINGUN_FIRE_FRAME,
+    FRAME_CHAINGUN_ACTIVATE_LAST,
     FRAME_CHAINGUN_FIRE_LAST,
     FRAME_CHAINGUN_IDLE_LAST,
     FRAME_CHAINGUN_DEACTIVATE_LAST,
-    0,
-    // FRAME_NOOP
+    CHAINGUN_PAUSE_FRAMES,
     (ent) => fireChaingun(sys.game, ent),
     sys
   );
@@ -6871,12 +6873,12 @@ function rocketLauncherThink(player, sys) {
 function hyperBlasterThink(player, sys) {
   Weapon_Repeating(
     player,
-    FRAME_HYPERBLASTER_FIRE_FRAME,
+    FRAME_HYPERBLASTER_ACTIVATE_LAST,
     FRAME_HYPERBLASTER_FIRE_LAST,
     FRAME_HYPERBLASTER_IDLE_LAST,
     FRAME_HYPERBLASTER_DEACTIVATE_LAST,
-    0,
-    // FRAME_NOOP
+    null,
+    // No pause frames
     (ent) => fireHyperBlaster(sys.game, ent),
     sys
   );
@@ -6950,6 +6952,178 @@ function blasterThink(player, sys) {
   );
 }
 
+// src/combat/weapons/chainfist.ts
+init_esm();
+
+// src/combat/weapons/common.ts
+function applyKick2(player, pitch, yaw = 0, kickOrigin = 0) {
+  if (player.client) {
+    player.client.kick_angles = { x: pitch, y: yaw, z: 0 };
+    player.client.kick_origin = { x: kickOrigin, y: 0, z: 0 };
+  }
+}
+
+// src/combat/weapons/chainfist.ts
+var CHAINFIST_REACH = 24;
+function firePlayerMeleeBoxFilter(check, data) {
+  if (!check.inUse || !check.takedamage || check === data.self) {
+    return false;
+  }
+  const closestPointToBox2 = (p, min, max) => {
+    return {
+      x: Math.max(min.x, Math.min(p.x, max.x)),
+      y: Math.max(min.y, Math.min(p.y, max.y)),
+      z: Math.max(min.z, Math.min(p.z, max.z))
+    };
+  };
+  const closestPointToCheck = closestPointToBox2(
+    data.start,
+    { x: check.origin.x + check.mins.x, y: check.origin.y + check.mins.y, z: check.origin.z + check.mins.z },
+    { x: check.origin.x + check.maxs.x, y: check.origin.y + check.maxs.y, z: check.origin.z + check.maxs.z }
+  );
+  const closestPointToSelf = closestPointToBox2(
+    closestPointToCheck,
+    { x: data.self.origin.x + data.self.mins.x, y: data.self.origin.y + data.self.mins.y, z: data.self.origin.z + data.self.mins.z },
+    { x: data.self.origin.x + data.self.maxs.x, y: data.self.origin.y + data.self.maxs.y, z: data.self.origin.z + data.self.maxs.z }
+  );
+  const dir = subtractVec3(closestPointToCheck, closestPointToSelf);
+  const len = lengthVec3(dir);
+  if (len > data.reach) {
+    return false;
+  }
+  const checkCenter = {
+    x: check.origin.x + (check.mins.x + check.maxs.x) * 0.5,
+    y: check.origin.y + (check.mins.y + check.maxs.y) * 0.5,
+    z: check.origin.z + (check.mins.z + check.maxs.z) * 0.5
+  };
+  const dirToTarget = normalizeVec3(subtractVec3(checkCenter, data.start));
+  if (dotVec3(dirToTarget, data.aim) < 0.7) {
+    if (len > 1) {
+      return false;
+    }
+  }
+  return true;
+}
+function firePlayerMelee(game, self, start, aim, reach, damage, kick, mod) {
+  const reachVec = { x: reach, y: reach, z: reach };
+  const absmin = {
+    x: self.origin.x + self.mins.x - reach,
+    y: self.origin.y + self.mins.y - reach,
+    z: self.origin.z + self.mins.z - reach
+  };
+  const absmax = {
+    x: self.origin.x + self.maxs.x + reach,
+    y: self.origin.y + self.maxs.y + reach,
+    z: self.origin.z + self.maxs.z + reach
+  };
+  const candidates = game.entities.findInBox(absmin, absmax);
+  const data = { self, start, aim, reach };
+  let wasHit = false;
+  const closestPointToBox2 = (p, min, max) => {
+    return {
+      x: Math.max(min.x, Math.min(p.x, max.x)),
+      y: Math.max(min.y, Math.min(p.y, max.y)),
+      z: Math.max(min.z, Math.min(p.z, max.z))
+    };
+  };
+  for (const hit of candidates) {
+    if (!firePlayerMeleeBoxFilter(hit, data)) continue;
+    const hitMins = { x: hit.origin.x + hit.mins.x, y: hit.origin.y + hit.mins.y, z: hit.origin.z + hit.mins.z };
+    const hitMaxs = { x: hit.origin.x + hit.maxs.x, y: hit.origin.y + hit.maxs.y, z: hit.origin.z + hit.maxs.z };
+    const closestPoint = closestPointToBox2(start, hitMins, hitMaxs);
+    T_Damage(
+      hit,
+      self,
+      self,
+      aim,
+      closestPoint,
+      scaleVec3(aim, -1),
+      damage,
+      kick / 2,
+      8 /* NO_KNOCKBACK */,
+      mod,
+      game.time,
+      game.multicast
+    );
+    wasHit = true;
+  }
+  return wasHit;
+}
+function chainfistSmoke(game, ent) {
+  const forward = { x: 0, y: 0, z: 0 };
+  const right = { x: 0, y: 0, z: 0 };
+  const up = { x: 0, y: 0, z: 0 };
+  const angles = ent.client ? ent.client.v_angle : ent.angles;
+  const vectors = angleVectors(angles || { x: 0, y: 0, z: 0 });
+  const offset = { x: 8, y: 8, z: -4 };
+  const start = {
+    x: ent.origin.x + ent.viewheight * 0 + vectors.forward.x * offset.x + vectors.right.x * offset.y + vectors.up.x * offset.z,
+    y: ent.origin.y + ent.viewheight * 0 + vectors.forward.y * offset.x + vectors.right.y * offset.y + vectors.up.y * offset.z,
+    z: ent.origin.z + ent.viewheight * 1 + vectors.forward.z * offset.x + vectors.right.z * offset.y + vectors.up.z * offset.z
+  };
+  game.multicast(start, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.CHAINFIST_SMOKE, start);
+}
+function fireChainfist(game, player, inventory, weaponState, start, forward) {
+  let damage = 7;
+  if (game.deathmatch) damage = 15;
+  if (player.client && player.client.quad_time && player.client.quad_time > game.time) {
+    damage *= 4;
+  }
+  const hit = firePlayerMelee(game, player, start, forward, CHAINFIST_REACH, damage, 100, 41 /* CHAINFIST */);
+  if (hit) {
+  }
+  applyKick2(player, -0.5, 0, 0);
+}
+function Weapon_ChainFist(player, sys) {
+  const game = sys.game;
+  const pause_frames = [];
+  const fireCallback = (ent) => {
+    const angles = ent.client ? ent.client.v_angle : ent.angles;
+    const vectors = angleVectors(angles || { x: 0, y: 0, z: 0 });
+    const forward = vectors.forward;
+    const start = {
+      x: ent.origin.x,
+      y: ent.origin.y,
+      z: ent.origin.z + (ent.viewheight || 0)
+    };
+    const inventory = ent.client ? ent.client.inventory : { ammo: { counts: [] } };
+    const weaponState = {};
+    fireChainfist(game, ent, inventory, weaponState, start, forward);
+    if (ent.client) {
+      const client = ent.client;
+      const BUTTON_ATTACK2 = 1;
+      const buttons = client.buttons;
+      if (buttons & BUTTON_ATTACK2) {
+        if (client.gun_frame === 12) client.gun_frame = 14;
+        else if (client.gun_frame === 22) client.gun_frame = 24;
+        else if (client.gun_frame >= 32) client.gun_frame = 7;
+      } else {
+        if (client.gun_frame === 13 || client.gun_frame === 23 || client.gun_frame >= 32) {
+          client.gun_frame = 33;
+        }
+      }
+    }
+  };
+  Weapon_Repeating(
+    player,
+    4,
+    32,
+    57,
+    60,
+    pause_frames,
+    fireCallback,
+    sys
+  );
+  if (player.client) {
+    const gunframe = player.client.gun_frame;
+    if ((gunframe === 42 || gunframe === 51) && Math.random() < 0.125) {
+      if (Math.random() < 0.4) {
+        chainfistSmoke(game, player);
+      }
+    }
+  }
+}
+
 // src/inventory/items.ts
 var WEAPON_ITEMS = {
   "weapon_blaster": {
@@ -7073,6 +7247,18 @@ var WEAPON_ITEMS = {
     think: bfgThink2
   },
   // Rogue Weapons
+  "weapon_chainfist": {
+    type: "weapon",
+    id: "weapon_chainfist",
+    name: "Chainfist",
+    weaponId: WeaponId.ChainFist,
+    ammoType: null,
+    initialAmmo: 0,
+    pickupAmmo: 0,
+    fireRate: 0.1,
+    // Depends on animation
+    think: Weapon_ChainFist
+  },
   "weapon_boomer": {
     type: "weapon",
     id: "weapon_boomer",
@@ -19290,7 +19476,7 @@ var WEAPONS = {
 };
 
 // src/index.ts
-var ZERO_VEC37 = { x: 0, y: 0, z: 0 };
+var ZERO_VEC38 = { x: 0, y: 0, z: 0 };
 function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
@@ -19369,8 +19555,8 @@ function createGame(imports, engine, options) {
     };
     entities.runFrame();
   });
-  let origin = { ...ZERO_VEC37 };
-  let velocity = { ...ZERO_VEC37 };
+  let origin = { ...ZERO_VEC38 };
+  let velocity = { ...ZERO_VEC38 };
   const calculateBlend = (player, time) => {
     const blend = [0, 0, 0, 0];
     if (!player || !player.client) return blend;
@@ -19452,10 +19638,10 @@ function createGame(imports, engine, options) {
         // TODO
         damageIndicators: [],
         stats: player ? populatePlayerStats(player, levelClock.current.timeSeconds) : [],
-        kick_angles: player?.client?.kick_angles ?? ZERO_VEC37,
-        kick_origin: player?.client?.kick_origin ?? ZERO_VEC37,
-        gunoffset: ZERO_VEC37,
-        gunangles: ZERO_VEC37,
+        kick_angles: player?.client?.kick_angles ?? ZERO_VEC38,
+        kick_origin: player?.client?.kick_origin ?? ZERO_VEC38,
+        gunoffset: ZERO_VEC38,
+        gunangles: ZERO_VEC38,
         gunindex: 0,
         gun_frame: player?.client?.gun_frame ?? 0,
         rdflags: player?.client?.rdflags ?? 0,
@@ -19469,8 +19655,8 @@ function createGame(imports, engine, options) {
   const resetState = (startTimeMs) => {
     frameLoop.reset(startTimeMs);
     levelClock.start(startTimeMs);
-    origin = { ...ZERO_VEC37 };
-    velocity = { ...ZERO_VEC37 };
+    origin = { ...ZERO_VEC38 };
+    velocity = { ...ZERO_VEC38 };
     entities.beginFrame(startTimeMs / 1e3);
     entities.runFrame();
   };
@@ -19498,10 +19684,10 @@ function createGame(imports, engine, options) {
       blend: [0, 0, 0, 0],
       // Stubs
       stats: populatePlayerStats(player, levelClock.current.timeSeconds),
-      kick_angles: ZERO_VEC37,
-      kick_origin: ZERO_VEC37,
-      gunoffset: ZERO_VEC37,
-      gunangles: ZERO_VEC37,
+      kick_angles: ZERO_VEC38,
+      kick_origin: ZERO_VEC38,
+      gunoffset: ZERO_VEC38,
+      gunangles: ZERO_VEC38,
       gunindex: 0,
       pm_type: 0,
       pm_time: 0,
@@ -19637,8 +19823,8 @@ function createGame(imports, engine, options) {
         rng,
         player: player?.client?.inventory
       });
-      origin = player ? { ...player.origin } : { ...ZERO_VEC37 };
-      velocity = player ? { ...player.velocity } : { ...ZERO_VEC37 };
+      origin = player ? { ...player.origin } : { ...ZERO_VEC38 };
+      velocity = player ? { ...player.velocity } : { ...ZERO_VEC38 };
       frameLoop.reset(save.level.timeSeconds * 1e3);
     }
   };