quake2ts 0.0.484 → 0.0.485

package/packages/game/dist/cjs/index.cjs

@@ -9037,12 +9037,49 @@ function fireHyperBlaster(game, player) {
 }
 function fireBlaster(game, player) {
   if (!player.client) return;
-  game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_BLASTER);
-  applyKick(player, -0.5, 0, 0);
-  setPlayerAttackAnim(player);
-  const { forward, right, up } = angleVectors(player.angles);
-  const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
-  createBlasterBolt(game.entities, player, source, forward, 15, 1500, 1 /* BLASTER */);
+  if (player.client.buttons & 32) {
+    game.sound(player, 0, "weapons/swing.wav", 1, ATTN_NORM, 0);
+    applyKick(player, -2, 0, 0);
+    setPlayerAttackAnim(player);
+    const { forward, right, up } = angleVectors(player.angles);
+    const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
+    const range = 64;
+    const damage = 50;
+    const kick = 100;
+    const end = { x: source.x + forward.x * range, y: source.y + forward.y * range, z: source.z + forward.z * range };
+    const trace = game.trace(source, null, null, end, player, MASK_SHOT);
+    if (trace.fraction < 1) {
+      if (trace.ent && trace.ent.takedamage) {
+        T_Damage(
+          trace.ent,
+          player,
+          player,
+          forward,
+          trace.endpos,
+          trace.plane ? trace.plane.normal : ZERO_VEC3,
+          damage,
+          kick,
+          0,
+          1 /* BLASTER */,
+          game.time,
+          game.multicast
+        );
+        game.sound(player, 0, "weapons/tink1.wav", 1, ATTN_NORM, 0);
+      } else {
+        game.sound(player, 0, "weapons/hithard.wav", 1, ATTN_NORM, 0);
+        if (trace.plane) {
+          game.multicast(trace.endpos, 1 /* Pvs */, ServerCommand.temp_entity, TempEntity.GUNSHOT, trace.endpos, trace.plane.normal);
+        }
+      }
+    }
+  } else {
+    game.multicast(player.origin, 1 /* Pvs */, ServerCommand.muzzleflash, player.index, MZ_BLASTER);
+    applyKick(player, -0.5, 0, 0);
+    setPlayerAttackAnim(player);
+    const { forward, right, up } = angleVectors(player.angles);
+    const source = P_ProjectSource(game, player, { x: 8, y: 8, z: -8 }, forward, right, up);
+    createBlasterBolt(game.entities, player, source, forward, 15, 1500, 1 /* BLASTER */);
+  }
 }
 function fireRocket(game, player) {
   if (!player.client) return;
@@ -9265,7 +9302,7 @@ function Weapon_Generic(ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST, FRAME_IDLE_LA
     return;
   }
   if (client.weaponstate === 0 /* WEAPON_READY */) {
-    if (client.buttons & 1) {
+    if (client.buttons & 1 || client.buttons & 32) {
       client.weaponstate = 3 /* WEAPON_FIRING */;
       client.gun_frame = FRAME_ACTIVATE_LAST + 1;
       return;