quake2ts 0.0.496 → 0.0.497

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

@@ -811,36 +811,36 @@ var MAX_ITEMS = 256;
 var MAX_GENERAL = MAX_CLIENTS * 2;
 var MAX_SHADOW_LIGHTS = 256;
 var MAX_WHEEL_ITEMS = 32;
-var ConfigStringIndex = ((ConfigStringIndex2) => {
-  ConfigStringIndex2[ConfigStringIndex2["Name"] = 0] = "Name";
-  ConfigStringIndex2[ConfigStringIndex2["CdTrack"] = 1] = "CdTrack";
-  ConfigStringIndex2[ConfigStringIndex2["Sky"] = 2] = "Sky";
-  ConfigStringIndex2[ConfigStringIndex2["SkyAxis"] = 3] = "SkyAxis";
-  ConfigStringIndex2[ConfigStringIndex2["SkyRotate"] = 4] = "SkyRotate";
-  ConfigStringIndex2[ConfigStringIndex2["StatusBar"] = 5] = "StatusBar";
-  ConfigStringIndex2[ConfigStringIndex2["HealthBarName"] = 55] = "HealthBarName";
-  ConfigStringIndex2[ConfigStringIndex2["CONFIG_N64_PHYSICS"] = 56] = "CONFIG_N64_PHYSICS";
-  ConfigStringIndex2[ConfigStringIndex2["CONFIG_CTF_TEAMS"] = 57] = "CONFIG_CTF_TEAMS";
-  ConfigStringIndex2[ConfigStringIndex2["CONFIG_COOP_RESPAWN_STRING"] = 58] = "CONFIG_COOP_RESPAWN_STRING";
-  ConfigStringIndex2[ConfigStringIndex2["Story"] = 54] = "Story";
-  ConfigStringIndex2[ConfigStringIndex2["AirAccel"] = 59] = "AirAccel";
-  ConfigStringIndex2[ConfigStringIndex2["MaxClients"] = 60] = "MaxClients";
-  ConfigStringIndex2[ConfigStringIndex2["MapChecksum"] = 61] = "MapChecksum";
-  ConfigStringIndex2[ConfigStringIndex2["Models"] = 62] = "Models";
-  ConfigStringIndex2[ConfigStringIndex2["Sounds"] = 62 + MAX_MODELS] = "Sounds";
-  ConfigStringIndex2[ConfigStringIndex2["Images"] = ConfigStringIndex2.Sounds + MAX_SOUNDS] = "Images";
-  ConfigStringIndex2[ConfigStringIndex2["Lights"] = ConfigStringIndex2.Images + MAX_IMAGES] = "Lights";
-  ConfigStringIndex2[ConfigStringIndex2["ShadowLights"] = ConfigStringIndex2.Lights + MAX_LIGHTSTYLES] = "ShadowLights";
-  ConfigStringIndex2[ConfigStringIndex2["Items"] = ConfigStringIndex2.ShadowLights + MAX_SHADOW_LIGHTS] = "Items";
-  ConfigStringIndex2[ConfigStringIndex2["PlayerSkins"] = ConfigStringIndex2.Items + MAX_ITEMS] = "PlayerSkins";
-  ConfigStringIndex2[ConfigStringIndex2["General"] = ConfigStringIndex2.PlayerSkins + MAX_CLIENTS] = "General";
-  ConfigStringIndex2[ConfigStringIndex2["WheelWeapons"] = ConfigStringIndex2.General + MAX_GENERAL] = "WheelWeapons";
-  ConfigStringIndex2[ConfigStringIndex2["WheelAmmo"] = ConfigStringIndex2.WheelWeapons + MAX_WHEEL_ITEMS] = "WheelAmmo";
-  ConfigStringIndex2[ConfigStringIndex2["WheelPowerups"] = ConfigStringIndex2.WheelAmmo + MAX_WHEEL_ITEMS] = "WheelPowerups";
-  ConfigStringIndex2[ConfigStringIndex2["CdLoopCount"] = ConfigStringIndex2.WheelPowerups + MAX_WHEEL_ITEMS] = "CdLoopCount";
-  ConfigStringIndex2[ConfigStringIndex2["GameStyle"] = ConfigStringIndex2.CdLoopCount + 1] = "GameStyle";
-  ConfigStringIndex2[ConfigStringIndex2["MaxConfigStrings"] = ConfigStringIndex2.GameStyle + 1] = "MaxConfigStrings";
-  return ConfigStringIndex2;
+var ConfigStringIndex = ((ConfigStringIndex22) => {
+  ConfigStringIndex22[ConfigStringIndex22["Name"] = 0] = "Name";
+  ConfigStringIndex22[ConfigStringIndex22["CdTrack"] = 1] = "CdTrack";
+  ConfigStringIndex22[ConfigStringIndex22["Sky"] = 2] = "Sky";
+  ConfigStringIndex22[ConfigStringIndex22["SkyAxis"] = 3] = "SkyAxis";
+  ConfigStringIndex22[ConfigStringIndex22["SkyRotate"] = 4] = "SkyRotate";
+  ConfigStringIndex22[ConfigStringIndex22["StatusBar"] = 5] = "StatusBar";
+  ConfigStringIndex22[ConfigStringIndex22["HealthBarName"] = 55] = "HealthBarName";
+  ConfigStringIndex22[ConfigStringIndex22["CONFIG_N64_PHYSICS"] = 56] = "CONFIG_N64_PHYSICS";
+  ConfigStringIndex22[ConfigStringIndex22["CONFIG_CTF_TEAMS"] = 57] = "CONFIG_CTF_TEAMS";
+  ConfigStringIndex22[ConfigStringIndex22["CONFIG_COOP_RESPAWN_STRING"] = 58] = "CONFIG_COOP_RESPAWN_STRING";
+  ConfigStringIndex22[ConfigStringIndex22["Story"] = 54] = "Story";
+  ConfigStringIndex22[ConfigStringIndex22["AirAccel"] = 59] = "AirAccel";
+  ConfigStringIndex22[ConfigStringIndex22["MaxClients"] = 60] = "MaxClients";
+  ConfigStringIndex22[ConfigStringIndex22["MapChecksum"] = 61] = "MapChecksum";
+  ConfigStringIndex22[ConfigStringIndex22["Models"] = 62] = "Models";
+  ConfigStringIndex22[ConfigStringIndex22["Sounds"] = 62 + MAX_MODELS] = "Sounds";
+  ConfigStringIndex22[ConfigStringIndex22["Images"] = ConfigStringIndex22.Sounds + MAX_SOUNDS] = "Images";
+  ConfigStringIndex22[ConfigStringIndex22["Lights"] = ConfigStringIndex22.Images + MAX_IMAGES] = "Lights";
+  ConfigStringIndex22[ConfigStringIndex22["ShadowLights"] = ConfigStringIndex22.Lights + MAX_LIGHTSTYLES] = "ShadowLights";
+  ConfigStringIndex22[ConfigStringIndex22["Items"] = ConfigStringIndex22.ShadowLights + MAX_SHADOW_LIGHTS] = "Items";
+  ConfigStringIndex22[ConfigStringIndex22["PlayerSkins"] = ConfigStringIndex22.Items + MAX_ITEMS] = "PlayerSkins";
+  ConfigStringIndex22[ConfigStringIndex22["General"] = ConfigStringIndex22.PlayerSkins + MAX_CLIENTS] = "General";
+  ConfigStringIndex22[ConfigStringIndex22["WheelWeapons"] = ConfigStringIndex22.General + MAX_GENERAL] = "WheelWeapons";
+  ConfigStringIndex22[ConfigStringIndex22["WheelAmmo"] = ConfigStringIndex22.WheelWeapons + MAX_WHEEL_ITEMS] = "WheelAmmo";
+  ConfigStringIndex22[ConfigStringIndex22["WheelPowerups"] = ConfigStringIndex22.WheelAmmo + MAX_WHEEL_ITEMS] = "WheelPowerups";
+  ConfigStringIndex22[ConfigStringIndex22["CdLoopCount"] = ConfigStringIndex22.WheelPowerups + MAX_WHEEL_ITEMS] = "CdLoopCount";
+  ConfigStringIndex22[ConfigStringIndex22["GameStyle"] = ConfigStringIndex22.CdLoopCount + 1] = "GameStyle";
+  ConfigStringIndex22[ConfigStringIndex22["MaxConfigStrings"] = ConfigStringIndex22.GameStyle + 1] = "MaxConfigStrings";
+  return ConfigStringIndex22;
 })(ConfigStringIndex || {});
 var MAX_CONFIGSTRINGS = ConfigStringIndex.MaxConfigStrings;
 var replay_exports = {};
@@ -5327,6 +5327,9 @@ var EntitySystem = class {
   soundIndex(sound) {
     return this.engine.soundIndex?.(sound) || 0;
   }
+  configStringIndex(str) {
+    return this.engine.configStringIndex?.(str) || 0;
+  }
   modelIndex(model) {
     return this.engine.modelIndex?.(model) || 0;
   }
@@ -5339,8 +5342,8 @@ var EntitySystem = class {
   unlink(ent) {
     this.spatialGrid.remove(ent);
   }
-  multicast(origin, type, ServerCommand6, ...args) {
-    this.imports.multicast(origin, type, ServerCommand6, ...args);
+  multicast(origin, type, ServerCommand7, ...args) {
+    this.imports.multicast(origin, type, ServerCommand7, ...args);
   }
   unicast(ent, reliable, event, ...args) {
     this.imports.unicast(ent, reliable, event, ...args);
@@ -6081,6 +6084,19 @@ function createTrap(context, owner, start, dir, speed) {
 // src/entities/projectiles.ts
 var BFG_LASER_RADIUS = 256;
 var BFG_LASER_RANGE = 2048;
+function createProjectile(sys, start, dir, speed, mod, damage, radiusDamage) {
+  const proj = sys.spawn();
+  proj.movetype = 8 /* FlyMissile */;
+  proj.solid = 2 /* BoundingBox */;
+  proj.origin = { ...start };
+  proj.velocity = { x: dir.x * speed, y: dir.y * speed, z: dir.z * speed };
+  proj.mins = { x: -4, y: -4, z: -4 };
+  proj.maxs = { x: 4, y: 4, z: 4 };
+  proj.angles = vectorToAngles(dir);
+  proj.takedamage = false;
+  sys.finalizeSpawn(proj);
+  return proj;
+}
 function createRocket(sys, owner, start, dir, damage, radiusDamage, speed, flashtype = 0) {
   const rocket = sys.spawn();
   rocket.classname = "rocket";
@@ -10120,6 +10136,95 @@ function Trap_Think(player, sys) {
   );
 }
 
+// src/modes/ctf/grapple.ts
+var GRAPPLE_SPEED = 1200;
+var GRAPPLE_PULL_SPEED = 800;
+var GRAPPLE_DAMAGE = 20;
+function Grapple_Think(player, sys) {
+  if (player.client?.inventory.currentWeapon !== WeaponId.Grapple) {
+    ResetGrapple(player, sys);
+  }
+  Weapon_Generic(
+    player,
+    0,
+    10,
+    // ready
+    11,
+    20,
+    // fire
+    [],
+    // pause frames
+    [11],
+    // fire frames
+    (ent) => fire_grapple(ent, sys),
+    sys
+  );
+  if (player.client && !(player.client.buttons & 1)) {
+    ResetGrapple(player, sys);
+  }
+  if (player.grapple && player.grapple.grappleState === "attached") {
+    Grapple_Pull(player, player.grapple, sys);
+  }
+}
+function fire_grapple(player, sys) {
+  if (player.grapple) return;
+  const angles = player.client.v_angle || player.angles;
+  const vectors = angleVectors(angles);
+  const forward = vectors.forward;
+  const right = vectors.right;
+  const up = vectors.up;
+  const game = sys.game;
+  const start = P_ProjectSource(game, player, { x: 8, y: 8, z: 8 }, forward, right, up);
+  const dir = { ...forward };
+  const grapple = createProjectile(sys, start, dir, GRAPPLE_SPEED, 57 /* GRAPPLE */, 0);
+  grapple.classname = "grapple";
+  grapple.owner = player;
+  grapple.movetype = 8 /* FlyMissile */;
+  grapple.solid = 2 /* BoundingBox */;
+  grapple.mins = { x: -4, y: -4, z: -4 };
+  grapple.maxs = { x: 4, y: 4, z: 4 };
+  grapple.model = "models/weapons/grapple/hook/tris.md2";
+  grapple.grappleState = "fly";
+  grapple.touch = (self, other, plane, surface) => {
+    if (!other) return;
+    Grapple_Touch(self, other, plane, surface, sys);
+  };
+  player.grapple = grapple;
+  sys.sound(player, 0, "weapons/grapple/throw.wav", 1, 1, 0);
+}
+function Grapple_Touch(self, other, plane, surface, sys) {
+  if (other === self.owner) return;
+  if (self.grappleState === "attached") return;
+  if (other.takedamage) {
+    T_Damage(other, self, self.owner, self.velocity, self.origin, ZERO_VEC3, GRAPPLE_DAMAGE, 0, 0, 57 /* GRAPPLE */, sys.timeSeconds, sys.multicast.bind(sys));
+    sys.free(self);
+    if (self.owner) self.owner.grapple = void 0;
+    return;
+  }
+  if (other.solid === 3 /* Bsp */ || other.solid === 2 /* BoundingBox */) {
+    self.velocity = { x: 0, y: 0, z: 0 };
+    self.movetype = 0 /* None */;
+    self.grappleState = "attached";
+    sys.sound(self, 0, "weapons/grapple/hit.wav", 1, 1, 0);
+    if (plane) {
+    }
+  }
+}
+function Grapple_Pull(player, grapple, sys) {
+  const dir = subtractVec3(grapple.origin, player.origin);
+  const dist = lengthVec3(dir);
+  if (dist < 32) return;
+  const normalizedDir = normalizeVec3(dir);
+  const pull = scaleVec3(normalizedDir, GRAPPLE_PULL_SPEED);
+  player.velocity = pull;
+}
+function ResetGrapple(player, sys) {
+  if (player.grapple) {
+    sys.free(player.grapple);
+    player.grapple = void 0;
+  }
+}
+
 // src/inventory/items.ts
 var WEAPON_ITEMS = {
   "weapon_blaster": {
@@ -10317,6 +10422,18 @@ var WEAPON_ITEMS = {
     pickupAmmo: 5,
     fireRate: 1,
     think: Trap_Think
+  },
+  "weapon_grapple": {
+    type: "weapon",
+    id: "weapon_grapple",
+    name: "Grapple",
+    weaponId: WeaponId.Grapple,
+    ammoType: null,
+    // Grapple uses no ammo in standard Q2 CTF? Or maybe just internal timer.
+    initialAmmo: 0,
+    pickupAmmo: 0,
+    fireRate: 0.5,
+    think: Grapple_Think
   }
 };
 var HEALTH_ITEMS = {
@@ -10718,6 +10835,34 @@ function setFlagState(flag, newState, context) {
   flag.flagState = newState;
 }
 
+// src/modes/ctf/scoreboard.ts
+var teamScores = {
+  [1 /* RED */]: 0,
+  [2 /* BLUE */]: 0
+};
+function addTeamScore(team, points) {
+  if (team === 1 /* RED */ || team === 2 /* BLUE */) {
+    teamScores[team] += points;
+  }
+}
+function updateCtfScoreboard(ent, sys) {
+  if (!ent.client || !ent.client.stats) return;
+  const stats = ent.client.stats;
+  stats[PlayerStat.STAT_CTF_TEAM1_PIC] = sys.configStringIndex ? sys.configStringIndex("pics/ctf_r.pcx") : 0;
+  stats[PlayerStat.STAT_CTF_TEAM1_CAPS] = teamScores[1 /* RED */];
+  stats[PlayerStat.STAT_CTF_TEAM2_PIC] = sys.configStringIndex ? sys.configStringIndex("pics/ctf_b.pcx") : 0;
+  stats[PlayerStat.STAT_CTF_TEAM2_CAPS] = teamScores[2 /* BLUE */];
+  const clientTeam = ent.client.ctfTeam;
+  stats[PlayerStat.STAT_CTF_JOINED_TEAM1_PIC] = 0;
+  stats[PlayerStat.STAT_CTF_JOINED_TEAM2_PIC] = 0;
+  if (clientTeam === 1 /* RED */) {
+    stats[PlayerStat.STAT_CTF_JOINED_TEAM1_PIC] = sys.configStringIndex ? sys.configStringIndex("pics/ctf_r.pcx") : 0;
+  } else if (clientTeam === 2 /* BLUE */) {
+    stats[PlayerStat.STAT_CTF_JOINED_TEAM2_PIC] = sys.configStringIndex ? sys.configStringIndex("pics/ctf_b.pcx") : 0;
+  }
+  stats[PlayerStat.STAT_CTF_TEAMINFO] = 1;
+}
+
 // src/modes/ctf/capture.ts
 function checkCapture(flag, player, game, context) {
   if (!player.client) return false;
@@ -10738,11 +10883,17 @@ function captureFlag(ownFlag, player, game, context) {
   if (!player.client) return false;
   const playerTeam = player.client.team || "red";
   const enemyTeam = playerTeam === "red" ? "blue" : "red";
+  const ctfStats = player.client.ctfStats;
+  if (ctfStats) {
+    ctfStats.captures++;
+  }
   if (player.client.score !== void 0) {
     player.client.score += 5;
   } else {
     player.client.score = 5;
   }
+  const teamEnum = playerTeam === "red" ? 1 /* RED */ : 2 /* BLUE */;
+  addTeamScore(teamEnum, 1);
   game.sound?.(player, 0, "ctf/flagcap.wav", 1, 1, 0);
   game.centerprintf?.(player, "You captured the flag!");
   const enemyFlagKey = playerTeam === "red" ? "key_blue_flag" /* BlueFlag */ : "key_red_flag" /* RedFlag */;
@@ -26372,6 +26523,9 @@ function player_think(self, sys) {
     }
   }
   P_PlayerThink(self, sys);
+  if (sys.deathmatch && (sys.configStringIndex ? sys.configStringIndex("pics/ctf_r.pcx") > 0 : true)) {
+    updateCtfScoreboard(self, sys);
+  }
   self.nextthink = sys.timeSeconds + 0.1;
   sys.scheduleThink(self, self.nextthink);
 }
@@ -26439,6 +26593,16 @@ function populatePlayerStats(player, timeSeconds) {
     const remainingSeconds = Math.ceil((bestTime - nowMs) / 1e3);
     statArray[PlayerStat.STAT_TIMER] = remainingSeconds;
   }
+  if (player.client.score !== void 0) {
+    statArray[PlayerStat.STAT_FRAGS] = player.client.score;
+  }
+  if (player.client.stats) {
+    for (let i = 0; i < player.client.stats.length; i++) {
+      if (player.client.stats[i] !== 0) {
+        statArray[i] = player.client.stats[i];
+      }
+    }
+  }
   return statArray;
 }