quake2ts 0.0.214 → 0.0.216

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

@@ -5304,6 +5304,7 @@ function throwGibs(sys, origin, damage) {
 // src/entities/monsters/berserk.ts
 var MONSTER_TICK = 0.1;
 var MELEE_DISTANCE = 80;
+var SPAWNFLAG_BERSERK_NOJUMPING = 16;
 var random2 = createRandomGenerator();
 function frandom() {
   return random2.frandom();
@@ -5525,6 +5526,25 @@ berserk_move_attack_club = {
   frames: berserk_frames_attack_club,
   endfunc: berserk_run
 };
+function T_SlamRadiusDamage(inflictor, attacker, damage, radius, kick, context) {
+  const entities = context.findByRadius(inflictor.origin, radius);
+  for (const ent of entities) {
+    if (ent === inflictor) continue;
+    if (!ent.takedamage) continue;
+    const dist = Math.sqrt(
+      Math.pow(ent.origin.x - inflictor.origin.x, 2) + Math.pow(ent.origin.y - inflictor.origin.y, 2) + Math.pow(ent.origin.z - inflictor.origin.z, 2)
+    );
+    const amount = Math.max(0, 1 - dist / radius);
+    if (amount <= 0) continue;
+    const points = Math.max(1, damage * amount * amount);
+    const k = kick * amount * amount;
+    const dir = normalizeVec3(subtractVec3(ent.origin, inflictor.origin));
+    T_Damage(ent, inflictor, attacker, dir, ent.origin, dir, points, k, 1 /* RADIUS */, 0 /* UNKNOWN */, context.timeSeconds, context.multicast.bind(context));
+    if (ent.client) {
+      ent.velocity = { ...ent.velocity, z: Math.max(270, ent.velocity.z) };
+    }
+  }
+}
 function berserk_attack_slam(self, context) {
   context.sound(self, 1, SOUNDS.thud, 1, 1, 0);
   context.sound(self, 2, SOUNDS.explod, 0.75, 1, 0);
@@ -5539,34 +5559,17 @@ function berserk_attack_slam(self, context) {
   context.multicast(tr.endpos, 2 /* Phs */, ServerCommand.temp_entity, TempEntity.BERSERK_SLAM, tr.endpos);
   self.gravity = 1;
   self.velocity = { x: 0, y: 0, z: 0 };
-  const damage = 8;
-  const kick = 300;
-  const radius = 165;
-  const entities = context.findByRadius(tr.endpos, radius * 2);
-  for (const ent of entities) {
-    if (ent === self) continue;
-    if (!ent.takedamage) continue;
-    const dist = Math.sqrt(
-      Math.pow(ent.origin.x - tr.endpos.x, 2) + Math.pow(ent.origin.y - tr.endpos.y, 2) + Math.pow(ent.origin.z - tr.endpos.z, 2)
-    );
-    const amount = Math.max(0, 1 - dist / radius);
-    if (amount <= 0) continue;
-    const points = Math.max(1, damage * amount * amount);
-    const k = kick * amount * amount;
-    const dir = normalizeVec3(subtractVec3(ent.origin, tr.endpos));
-    T_Damage(ent, self, self, dir, ent.origin, dir, points, k, 1 /* RADIUS */, 0 /* UNKNOWN */, context.timeSeconds, context.multicast.bind(context));
-    if (ent.client) {
-      const currentVel = { ...ent.velocity };
-      currentVel.z = Math.max(270, currentVel.z);
-      ent.velocity = currentVel;
-    }
-  }
+  T_SlamRadiusDamage(self, self, 8, 165, 300, context);
 }
 function berserk_jump_touch(self, other, plane, surf, context) {
   if (self.health <= 0) {
     self.touch = void 0;
     return;
   }
+  if (other && other.takedamage) {
+    self.touch = void 0;
+    berserk_attack_slam(self, context);
+  }
 }
 function berserk_high_gravity(self, context) {
   const base = 800;
@@ -5666,6 +5669,7 @@ function berserk_attack(self, context) {
   if ((self.monsterinfo.melee_debounce_time || 0) <= context.timeSeconds && dist < MELEE_DISTANCE) {
     berserk_melee(self, context);
   } else if (self.timestamp < context.timeSeconds && brandom() && dist > 150) {
+    if (self.spawnflags & SPAWNFLAG_BERSERK_NOJUMPING) return;
     M_SetAnimation(self, berserk_move_attack_strike);
     context.sound(self, 1, SOUNDS.jump, 1, 1, 0);
     self.timestamp = context.timeSeconds + 5;