quake2ts 0.0.240 → 0.0.241

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

@@ -4929,37 +4929,53 @@ function move_calc(ent, dest, context, done) {
     context.scheduleThink(ent, context.timeSeconds + dt);
   }
 }
-function door_blocked(self, other) {
-  if (other && other.takedamage) {
-    const damage = self.dmg || 2;
-    other.health -= damage;
-  }
-  if (self.state === 1 /* Opening */) {
-    self.state = 3 /* Closing */;
-    self.think = door_go_down;
-  } else if (self.state === 3 /* Closing */) {
-    self.state = 1 /* Opening */;
-    self.think = door_go_up;
-  }
+var SPAWNFLAG_DOOR_START_OPEN = 1;
+var SPAWNFLAG_DOOR_CRUSHER = 4;
+var SPAWNFLAG_DOOR_NOMONSTER = 8;
+var SPAWNFLAG_DOOR_ANIMATED = 16;
+var SPAWNFLAG_DOOR_TOGGLE = 32;
+var SPAWNFLAG_DOOR_ANIMATED_FAST = 64;
+var EF_ANIM_ALL = 4;
+var EF_ANIM_ALLFAST = 8;
+function getMoveInfo(ent) {
+  return ent.moveinfo;
 }
 function door_hit_top(ent, context) {
+  const moveinfo = getMoveInfo(ent);
+  if (moveinfo && moveinfo.sound_end) {
+    context.sound(ent, 0, moveinfo.sound_end, 1, 1, 0);
+  }
   ent.state = 0 /* Open */;
-  if (ent.spawnflags & 32) {
+  if (ent.spawnflags & SPAWNFLAG_DOOR_TOGGLE) {
     return;
   }
   if (ent.wait === -1) {
     return;
   }
-  ent.think = door_go_down;
+  ent.think = (e) => door_go_down(e, context);
   context.scheduleThink(ent, context.timeSeconds + ent.wait);
 }
 function door_hit_bottom(ent, context) {
+  const moveinfo = getMoveInfo(ent);
+  if (moveinfo && moveinfo.sound_end) {
+    context.sound(ent, 0, moveinfo.sound_end, 1, 1, 0);
+  }
   ent.state = 2 /* Closed */;
 }
 function door_go_down(door, context) {
+  door.think = (e) => door_go_down(e, context);
+  const moveinfo = getMoveInfo(door);
+  if (moveinfo && moveinfo.sound_start) {
+    context.sound(door, 0, moveinfo.sound_start, 1, 1, 0);
+  }
   move_calc(door, door.pos1, context, door_hit_bottom);
 }
 function door_go_up(door, context) {
+  door.think = (e) => door_go_up(e, context);
+  const moveinfo = getMoveInfo(door);
+  if (moveinfo && moveinfo.sound_start) {
+    context.sound(door, 0, moveinfo.sound_start, 1, 1, 0);
+  }
   move_calc(door, door.pos2, context, door_hit_top);
 }
 var func_door = (entity, context) => {
@@ -4971,15 +4987,51 @@ var func_door = (entity, context) => {
   if (!entity.health) entity.health = 0;
   entity.solid = 3 /* Bsp */;
   entity.movetype = 2 /* Push */;
-  entity.blocked = door_blocked;
+  entity.blocked = (self, other) => {
+    if (other && other.takedamage) {
+      const damage = self.dmg || 2;
+      if (self.spawnflags & SPAWNFLAG_DOOR_CRUSHER) {
+        other.health -= damage;
+      } else {
+        other.health -= damage;
+      }
+    }
+    if (self.spawnflags & SPAWNFLAG_DOOR_CRUSHER) {
+      return;
+    }
+    if (self.state === 1 /* Opening */) {
+      self.state = 3 /* Closing */;
+      door_go_down(self, context.entities);
+    } else if (self.state === 3 /* Closing */) {
+      self.state = 1 /* Opening */;
+      door_go_up(self, context.entities);
+    }
+  };
   entity.state = 2 /* Closed */;
   entity.pos1 = { ...entity.origin };
   const move = entity.movedir.x * (Math.abs(entity.maxs.x - entity.mins.x) - entity.lip) + entity.movedir.y * (Math.abs(entity.maxs.y - entity.mins.y) - entity.lip) + entity.movedir.z * (Math.abs(entity.maxs.z - entity.mins.z) - entity.lip);
   entity.pos2 = addVec3(entity.pos1, scaleVec3(entity.movedir, move));
-  if (entity.spawnflags & 1) {
+  const moveinfo = {
+    sound_start: null,
+    sound_middle: null,
+    sound_end: null
+  };
+  if (entity.sounds !== 1) {
+    moveinfo.sound_start = "doors/dr1_strt.wav";
+    moveinfo.sound_middle = "doors/dr1_mid.wav";
+    moveinfo.sound_end = "doors/dr1_end.wav";
+  }
+  entity.moveinfo = moveinfo;
+  if (entity.spawnflags & SPAWNFLAG_DOOR_START_OPEN) {
     entity.origin = { ...entity.pos2 };
     entity.state = 0 /* Open */;
   }
+  if (entity.spawnflags & SPAWNFLAG_DOOR_ANIMATED) {
+    entity.effects |= EF_ANIM_ALL;
+  }
+  if (entity.spawnflags & SPAWNFLAG_DOOR_ANIMATED_FAST) {
+    entity.effects |= EF_ANIM_ALLFAST;
+  }
   if (entity.health > 0) {
     entity.takedamage = true;
     entity.max_health = entity.health;
@@ -4990,46 +5042,27 @@ var func_door = (entity, context) => {
     };
   }
   entity.use = (self, other, activator) => {
-    if (entity.spawnflags & 32) {
+    if (entity.spawnflags & SPAWNFLAG_DOOR_TOGGLE) {
       if (self.state === 2 /* Closed */) {
         self.state = 1 /* Opening */;
-        self.think = door_go_up;
-        context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
+        door_go_up(self, context.entities);
       } else if (self.state === 0 /* Open */) {
         self.state = 3 /* Closing */;
-        self.think = door_go_down;
-        context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
+        door_go_down(self, context.entities);
       }
       return;
     }
     if (self.state !== 2 /* Closed */) return;
     self.state = 1 /* Opening */;
-    self.think = door_go_up;
-    context.entities.scheduleThink(self, context.entities.timeSeconds + 0.1);
-    let soundName = "doors/dr1_strt.wav";
-    if (entity.sounds) {
-      switch (entity.sounds) {
-        case 1:
-          soundName = "doors/dr1_strt.wav";
-          break;
-        case 2:
-          soundName = "doors/dr2_strt.wav";
-          break;
-        case 3:
-          soundName = "doors/dr3_strt.wav";
-          break;
-        case 4:
-          soundName = "doors/dr4_strt.wav";
-          break;
-        default:
-          soundName = "doors/dr1_strt.wav";
-      }
-    }
-    context.entities.sound(self, 0, soundName, 1, 1, 0);
+    door_go_up(self, context.entities);
   };
   if (entity.health <= 0 && !entity.targetname) {
     entity.touch = (self, other) => {
-      if (!other || other.classname !== "player") return;
+      if (!other) return;
+      if (self.spawnflags & SPAWNFLAG_DOOR_NOMONSTER) {
+        if (other.svflags & 4 /* Monster */) return;
+      }
+      if (other.classname !== "player" && !(other.svflags & 4 /* Monster */)) return;
       self.use?.(self, other, other);
     };
   }