quake2ts 0.0.489 → 0.0.491

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

@@ -10370,6 +10370,49 @@ function setFlagState(flag, newState, context) {
   flag.flagState = newState;
 }
 
+// src/modes/ctf/capture.ts
+function checkCapture(flag, player, game, context) {
+  if (!player.client) return false;
+  const playerTeam = player.client.team || "red";
+  if (flag.flagTeam !== playerTeam) {
+    return false;
+  }
+  if (flag.flagState !== 0 /* AT_BASE */) {
+    return false;
+  }
+  const enemyFlagKey = playerTeam === "red" ? "key_blue_flag" /* BlueFlag */ : "key_red_flag" /* RedFlag */;
+  if (hasKey(player.client.inventory, enemyFlagKey)) {
+    return captureFlag(flag, player, game, context);
+  }
+  return false;
+}
+function captureFlag(ownFlag, player, game, context) {
+  if (!player.client) return false;
+  const playerTeam = player.client.team || "red";
+  const enemyTeam = playerTeam === "red" ? "blue" : "red";
+  if (player.client.score !== void 0) {
+    player.client.score += 5;
+  } else {
+    player.client.score = 5;
+  }
+  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 */;
+  player.client.inventory.keys.delete(enemyFlagKey);
+  context.forEachEntity((ent) => {
+    const flag = ent;
+    if ((flag.classname === "item_flag_team1" || flag.classname === "item_flag_team2") && flag.flagTeam === enemyTeam) {
+      setFlagState(flag, 0 /* AT_BASE */, context);
+      flag.origin = { ...flag.baseOrigin };
+      flag.solid = 1 /* Trigger */;
+      flag.owner = null;
+      flag.model = flag.flagTeam === "red" ? "players/male/flag1.md2" : "players/male/flag2.md2";
+      flag.svflags &= ~1;
+    }
+  });
+  return true;
+}
+
 // src/modes/ctf/flag.ts
 function createFlagPickupEntity(game, flagItem) {
   const isRed = flagItem.team === "red";
@@ -10404,6 +10447,9 @@ function createFlagPickupEntity(game, flagItem) {
       const sameTeam = self.flagTeam === playerTeam;
       if (sameTeam) {
         if (self.flagState === 0 /* AT_BASE */) {
+          if (checkCapture(self, other, game, game.entities)) {
+            return;
+          }
           return;
         }
         if (self.flagState === 2 /* DROPPED */) {