Drafted bullet explosion data structure.

frontend/assets/scripts/Bullet.js

@@ -0,0 +1,36 @@
+window.BULLET_STATE = {
+  Startup: 0,
+  Active: 1,
+  Exploding: 2,
+};
+
+cc.Class({
+  extends: cc.Component,
+
+  properties: {
+    animNode: {
+      type: cc.Node,
+      default: null
+    },
+  },
+
+  updateAnim(newAnimName, frameIdxInAnim, dirX, spontaneousLooping, rdf, newAnimIdx) {
+    this.animComp = this.effAnimNode.getComponent(cc.Animation);
+    // Update directions
+    if (this.animComp && this.animComp.node) {
+      if (0 > dirX) {
+        this.animNode.scaleX = (-1.0);
+      } else if (0 < dirX) {
+        this.animNode.scaleX = (1.0);
+      }
+    }
+
+    const currentClip = this.animComp.currentClip;
+    if (true == spontaneousLooping && (null != currentClip && currentClip.name == newAnimName)) {
+      return;
+    }
+    const targetClip = this.animComp.getClips()[newAnimIdx]; 
+    let fromTime = (frameIdxInAnim / targetClip.sample); // TODO: Anyway to avoid using division here?
+    this.animComp.play(newAnimName, fromTime);
+  },
+});

frontend/assets/scripts/Bullet.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "a4b909c4-56a8-4b70-b6ea-b7f928077747",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

frontend/assets/scripts/Fireball.js

@@ -1,12 +1,7 @@
-cc.Class({
-  extends: cc.Component,
+const Bullet = require("./Bullet");
 
-  properties: {
-    animNode: {
-      type: cc.Node,
-      default: null
-    },
-  },
+cc.Class({
+  extends: Bullet,
 
   ctor() {
     this.lastUsed = -1;
@@ -27,22 +22,8 @@ cc.Class({
     this.speciesName = speciesName;
     this.effAnimNode = this.animNode.getChildByName(this.speciesName);
     this.effAnimNode.active = true;
-    this.updateAnim(speciesName, fireballBullet, rdf);
   },
 
   onLoad() {},
 
-  updateAnim(speciesName, fireballBullet, rdf) {
-    this.animComp = this.effAnimNode.getComponent(cc.Animation);
-    // Update directions
-    if (this.animComp && this.animComp.node) {
-      if (0 > fireballBullet.DirX) {
-        this.animNode.scaleX = (-1.0);
-      } else if (0 < fireballBullet.DirX) {
-        this.animNode.scaleX = (1.0);
-      }
-    }
-
-    this.animComp.play(speciesName);
-  },
 });

frontend/assets/scripts/Map.js

@@ -613,13 +613,13 @@ cc.Class({
     const jsMeleeBulletsArr = new Array(pbRdf.meleeBullets.length).fill(null);
     for (let k = 0; k < pbRdf.meleeBullets.length; ++k) {
       const pbBullet = pbRdf.meleeBullets[k];
-      const jsMeleeBullet = gopkgs.NewMeleeBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId);
+      const jsMeleeBullet = gopkgs.NewMeleeBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.blState, pbBullet.framesInBlState, pbBullet.explosionFrames, pbBullet.speciesId);
       jsMeleeBulletsArr[k] = jsMeleeBullet;
     }
     const jsFireballBulletsArr = new Array(pbRdf.fireballBullets.length).fill(null);
     for (let k = 0; k < pbRdf.fireballBullets.length; ++k) {
       const pbBullet = pbRdf.fireballBullets[k];
-      const jsFireballBullet = gopkgs.NewFireballBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.virtualGridX, pbBullet.virtualGridY, pbBullet.dirX, pbBullet.dirY, pbBullet.velX, pbBullet.velY, pbBullet.speed, pbBullet.speciesId);
+      const jsFireballBullet = gopkgs.NewFireballBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.virtualGridX, pbBullet.virtualGridY, pbBullet.dirX, pbBullet.dirY, pbBullet.velX, pbBullet.velY, pbBullet.speed, pbBullet.blState, pbBullet.framesInBlState, pbBullet.explosionFrames, pbBullet.speciesId);
       jsFireballBulletsArr[k] = jsFireballBullet;
     }
 
@@ -763,7 +763,6 @@ cc.Class({
     if (lhs.VelX != rhs.VelX) return false;
     if (lhs.VelY != rhs.VelY) return false;
     if (lhs.Speed != rhs.Speed) return false;
-    if (lhs.SpeciesId != rhs.SpeciesId) return false;
 
     return true;
   },
@@ -1114,25 +1113,61 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
       const fireball = pqNode.value;
       fireball.node.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
     }
+    for (let k in rdf.MeleeBullets) {
+      const meleeBullet = rdf.MeleeBullets[k];
+      const isExploding = (window.BULLET_STATE.Exploding == meleeBullet.BlState);
+      if (isExploding) {
+        let pqNode = self.cachedFireballs.popAny(meleeBullet.BattleAttr.BulletLocalId);
+        let speciesName = `MeleeExplosion`;
+        let animName = `MeleeExplosion${meleeBullet.Bullet.SpeciesId}`;
+
+        const offender = rdf.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex - 1];
+        let xfac = 1; // By now, straight Punch offset doesn't respect "y-axis"
+        if (0 > offender.DirX) {
+          xfac = -1;
+        }
+        const [wx, wy] = gopkgs.VirtualGridToWorldPos(offender.VirtualGridX + xfac * meleeBullet.Bullet.HitboxOffsetX, offender.VirtualGridY);
+
+        if (null == pqNode) {
+          pqNode = self.cachedFireballs.pop();
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, using a new fireball node for rendering for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        } else {
+          //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, using a cached fireball node for rendering for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        }
+        const cachedFireball = pqNode.value;
+        cachedFireball.setSpecies(speciesName, meleeBullet, rdf);
+        const newAnimIdx = meleeBullet.Bullet.SpeciesId - 1;
+        cachedFireball.updateAnim(animName, meleeBullet.FramesInBlState, offender.DirX, false, rdf, newAnimIdx);
+        cachedFireball.lastUsed = self.renderFrameId;
+        cachedFireball.bulletLocalId = meleeBullet.BattleAttr.BulletLocalId;
+        cachedFireball.node.setPosition(cc.v2(wx, wy));
+
+        self.cachedFireballs.push(cachedFireball.lastUsed, cachedFireball, meleeBullet.BattleAttr.BulletLocalId);
+      } else {
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, activeFrames=${meleeBullet.Bullet.ActiveFrames}, not rendering melee node for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId}`);
+      }
+    }
     for (let k in rdf.FireballBullets) {
       const fireballBullet = rdf.FireballBullets[k];
-      if (
-        fireballBullet.BattleAttr.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames <= rdf.Id
-        &&
-        fireballBullet.BattleAttr.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames + fireballBullet.Bullet.ActiveFrames > rdf.Id
-      ) {
+      const isExploding = (window.BULLET_STATE.Exploding == fireballBullet.BlState);
+      if (gopkgs.IsFireballBulletActive(fireballBullet, rdf) || isExploding) {
         let pqNode = self.cachedFireballs.popAny(fireballBullet.BattleAttr.BulletLocalId);
-        const speciesName = `Fireball${fireballBullet.SpeciesId}`;
+        let speciesName = `Fireball${fireballBullet.Bullet.SpeciesId}`;
+        let animName = (BULLET_STATE.Exploding == fireballBullet.BlState ? `Fireball${fireballBullet.Bullet.SpeciesId}Explosion` : speciesName);
+
         const [wx, wy] = gopkgs.VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY);
 
         if (null == pqNode) {
           pqNode = self.cachedFireballs.pop();
-          //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, using a new fireball node for rendering for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, using a new fireball node for rendering for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
         } else {
           //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, using a cached fireball node for rendering for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
         }
         const cachedFireball = pqNode.value;
         cachedFireball.setSpecies(speciesName, fireballBullet, rdf);
+        const spontaneousLooping = !isExploding;
+        const newAnimIdx = (spontaneousLooping ? 0 : 1);
+        cachedFireball.updateAnim(animName, fireballBullet.FramesInBlState, fireballBullet.DirX, spontaneousLooping, rdf, newAnimIdx);
         cachedFireball.lastUsed = self.renderFrameId;
         cachedFireball.bulletLocalId = fireballBullet.BattleAttr.BulletLocalId;
         cachedFireball.node.setPosition(cc.v2(wx, wy));
@@ -1363,11 +1398,7 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
 
       for (let k in rdf.MeleeBullets) {
         const meleeBullet = rdf.MeleeBullets[k];
-        if (
-          meleeBullet.BattleAttr.OriginatedRenderFrameId + meleeBullet.Bullet.StartupFrames <= rdf.Id
-          &&
-          meleeBullet.BattleAttr.OriginatedRenderFrameId + meleeBullet.Bullet.StartupFrames + meleeBullet.Bullet.ActiveFrames > rdf.Id
-        ) {
+        if (gopkgs.IsMeleeBulletActive(meleeBullet, rdf)) {
           const offender = rdf.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex - 1];
           if (1 == offender.JoinIndex) {
             g2.strokeColor = cc.Color.BLUE;
@@ -1395,11 +1426,7 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
 
       for (let k in rdf.FireballBullets) {
         const fireballBullet = rdf.FireballBullets[k];
-        if (
-          fireballBullet.BattleAttr.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames <= rdf.Id
-          &&
-          fireballBullet.BattleAttr.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames + fireballBullet.Bullet.ActiveFrames > rdf.Id
-        ) {
+        if (gopkgs.IsFireballBulletActive(fireballBullet, rdf)) {
           const offender = rdf.PlayersArr[fireballBullet.BattleAttr.OffenderJoinIndex - 1];
           if (1 == offender.JoinIndex) {
             g2.strokeColor = cc.Color.BLUE;

frontend/assets/scripts/OfflineMap.js

@@ -13,7 +13,7 @@ cc.Class({
   onLoad() {
     const self = this;
     window.mapIns = self;
-    self.showCriticalCoordinateLabels = true;
+    self.showCriticalCoordinateLabels = false;
 
     const mapNode = self.node;
     const canvasNode = mapNode.parent;
@@ -94,7 +94,7 @@ cc.Class({
       const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
       const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);
 
-      const speciesIdList = [4096, 1];
+      const speciesIdList = [1, 4096];
       const chConfigsOrderedByJoinIndex = gopkgs.GetCharacterConfigsOrderedByJoinIndex(speciesIdList);
 
       const startRdf = window.pb.protos.RoomDownsyncFrame.create({

frontend/assets/scripts/modules/room_downsync_frame_proto_bundle.forcemsg.js

@@ -4187,6 +4187,10 @@ $root.protos = (function() {
          * @property {boolean|null} [blowUp] MeleeBullet blowUp
          * @property {number|null} [teamId] MeleeBullet teamId
          * @property {number|null} [bulletLocalId] MeleeBullet bulletLocalId
+         * @property {number|null} [speciesId] MeleeBullet speciesId
+         * @property {number|null} [explosionFrames] MeleeBullet explosionFrames
+         * @property {number|null} [blState] MeleeBullet blState
+         * @property {number|null} [framesInBlState] MeleeBullet framesInBlState
          */
 
         /**
@@ -4364,6 +4368,38 @@ $root.protos = (function() {
          */
         MeleeBullet.prototype.bulletLocalId = 0;
 
+        /**
+         * MeleeBullet speciesId.
+         * @member {number} speciesId
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.speciesId = 0;
+
+        /**
+         * MeleeBullet explosionFrames.
+         * @member {number} explosionFrames
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.explosionFrames = 0;
+
+        /**
+         * MeleeBullet blState.
+         * @member {number} blState
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.blState = 0;
+
+        /**
+         * MeleeBullet framesInBlState.
+         * @member {number} framesInBlState
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.framesInBlState = 0;
+
         /**
          * Creates a new MeleeBullet instance using the specified properties.
          * @function create
@@ -4428,6 +4464,14 @@ $root.protos = (function() {
                 writer.uint32(/* id 19, wireType 0 =*/152).int32(message.teamId);
             if (message.bulletLocalId != null && Object.hasOwnProperty.call(message, "bulletLocalId"))
                 writer.uint32(/* id 20, wireType 0 =*/160).int32(message.bulletLocalId);
+            if (message.speciesId != null && Object.hasOwnProperty.call(message, "speciesId"))
+                writer.uint32(/* id 21, wireType 0 =*/168).int32(message.speciesId);
+            if (message.explosionFrames != null && Object.hasOwnProperty.call(message, "explosionFrames"))
+                writer.uint32(/* id 22, wireType 0 =*/176).int32(message.explosionFrames);
+            if (message.blState != null && Object.hasOwnProperty.call(message, "blState"))
+                writer.uint32(/* id 23, wireType 0 =*/184).int32(message.blState);
+            if (message.framesInBlState != null && Object.hasOwnProperty.call(message, "framesInBlState"))
+                writer.uint32(/* id 24, wireType 0 =*/192).int32(message.framesInBlState);
             return writer;
         };
 
@@ -4542,6 +4586,22 @@ $root.protos = (function() {
                         message.bulletLocalId = reader.int32();
                         break;
                     }
+                case 21: {
+                        message.speciesId = reader.int32();
+                        break;
+                    }
+                case 22: {
+                        message.explosionFrames = reader.int32();
+                        break;
+                    }
+                case 23: {
+                        message.blState = reader.int32();
+                        break;
+                    }
+                case 24: {
+                        message.framesInBlState = reader.int32();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -4637,6 +4697,18 @@ $root.protos = (function() {
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 if (!$util.isInteger(message.bulletLocalId))
                     return "bulletLocalId: integer expected";
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                if (!$util.isInteger(message.speciesId))
+                    return "speciesId: integer expected";
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                if (!$util.isInteger(message.explosionFrames))
+                    return "explosionFrames: integer expected";
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                if (!$util.isInteger(message.blState))
+                    return "blState: integer expected";
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                if (!$util.isInteger(message.framesInBlState))
+                    return "framesInBlState: integer expected";
             return null;
         };
 
@@ -4692,6 +4764,14 @@ $root.protos = (function() {
                 message.teamId = object.teamId | 0;
             if (object.bulletLocalId != null)
                 message.bulletLocalId = object.bulletLocalId | 0;
+            if (object.speciesId != null)
+                message.speciesId = object.speciesId | 0;
+            if (object.explosionFrames != null)
+                message.explosionFrames = object.explosionFrames | 0;
+            if (object.blState != null)
+                message.blState = object.blState | 0;
+            if (object.framesInBlState != null)
+                message.framesInBlState = object.framesInBlState | 0;
             return message;
         };
 
@@ -4729,6 +4809,10 @@ $root.protos = (function() {
                 object.blowUp = false;
                 object.teamId = 0;
                 object.bulletLocalId = 0;
+                object.speciesId = 0;
+                object.explosionFrames = 0;
+                object.blState = 0;
+                object.framesInBlState = 0;
             }
             if (message.originatedRenderFrameId != null && message.hasOwnProperty("originatedRenderFrameId"))
                 object.originatedRenderFrameId = message.originatedRenderFrameId;
@@ -4770,6 +4854,14 @@ $root.protos = (function() {
                 object.teamId = message.teamId;
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 object.bulletLocalId = message.bulletLocalId;
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                object.speciesId = message.speciesId;
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                object.explosionFrames = message.explosionFrames;
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                object.blState = message.blState;
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                object.framesInBlState = message.framesInBlState;
             return object;
         };
 
@@ -4829,6 +4921,9 @@ $root.protos = (function() {
          * @property {number|null} [teamId] FireballBullet teamId
          * @property {number|null} [bulletLocalId] FireballBullet bulletLocalId
          * @property {number|null} [speciesId] FireballBullet speciesId
+         * @property {number|null} [explosionFrames] FireballBullet explosionFrames
+         * @property {number|null} [blState] FireballBullet blState
+         * @property {number|null} [framesInBlState] FireballBullet framesInBlState
          * @property {number|null} [virtualGridX] FireballBullet virtualGridX
          * @property {number|null} [virtualGridY] FireballBullet virtualGridY
          * @property {number|null} [dirX] FireballBullet dirX
@@ -5021,6 +5116,30 @@ $root.protos = (function() {
          */
         FireballBullet.prototype.speciesId = 0;
 
+        /**
+         * FireballBullet explosionFrames.
+         * @member {number} explosionFrames
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.explosionFrames = 0;
+
+        /**
+         * FireballBullet blState.
+         * @member {number} blState
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.blState = 0;
+
+        /**
+         * FireballBullet framesInBlState.
+         * @member {number} framesInBlState
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.framesInBlState = 0;
+
         /**
          * FireballBullet virtualGridX.
          * @member {number} virtualGridX
@@ -5143,6 +5262,12 @@ $root.protos = (function() {
                 writer.uint32(/* id 20, wireType 0 =*/160).int32(message.bulletLocalId);
             if (message.speciesId != null && Object.hasOwnProperty.call(message, "speciesId"))
                 writer.uint32(/* id 21, wireType 0 =*/168).int32(message.speciesId);
+            if (message.explosionFrames != null && Object.hasOwnProperty.call(message, "explosionFrames"))
+                writer.uint32(/* id 22, wireType 0 =*/176).int32(message.explosionFrames);
+            if (message.blState != null && Object.hasOwnProperty.call(message, "blState"))
+                writer.uint32(/* id 23, wireType 0 =*/184).int32(message.blState);
+            if (message.framesInBlState != null && Object.hasOwnProperty.call(message, "framesInBlState"))
+                writer.uint32(/* id 24, wireType 0 =*/192).int32(message.framesInBlState);
             if (message.virtualGridX != null && Object.hasOwnProperty.call(message, "virtualGridX"))
                 writer.uint32(/* id 999, wireType 0 =*/7992).int32(message.virtualGridX);
             if (message.virtualGridY != null && Object.hasOwnProperty.call(message, "virtualGridY"))
@@ -5275,6 +5400,18 @@ $root.protos = (function() {
                         message.speciesId = reader.int32();
                         break;
                     }
+                case 22: {
+                        message.explosionFrames = reader.int32();
+                        break;
+                    }
+                case 23: {
+                        message.blState = reader.int32();
+                        break;
+                    }
+                case 24: {
+                        message.framesInBlState = reader.int32();
+                        break;
+                    }
                 case 999: {
                         message.virtualGridX = reader.int32();
                         break;
@@ -5401,6 +5538,15 @@ $root.protos = (function() {
             if (message.speciesId != null && message.hasOwnProperty("speciesId"))
                 if (!$util.isInteger(message.speciesId))
                     return "speciesId: integer expected";
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                if (!$util.isInteger(message.explosionFrames))
+                    return "explosionFrames: integer expected";
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                if (!$util.isInteger(message.blState))
+                    return "blState: integer expected";
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                if (!$util.isInteger(message.framesInBlState))
+                    return "framesInBlState: integer expected";
             if (message.virtualGridX != null && message.hasOwnProperty("virtualGridX"))
                 if (!$util.isInteger(message.virtualGridX))
                     return "virtualGridX: integer expected";
@@ -5479,6 +5625,12 @@ $root.protos = (function() {
                 message.bulletLocalId = object.bulletLocalId | 0;
             if (object.speciesId != null)
                 message.speciesId = object.speciesId | 0;
+            if (object.explosionFrames != null)
+                message.explosionFrames = object.explosionFrames | 0;
+            if (object.blState != null)
+                message.blState = object.blState | 0;
+            if (object.framesInBlState != null)
+                message.framesInBlState = object.framesInBlState | 0;
             if (object.virtualGridX != null)
                 message.virtualGridX = object.virtualGridX | 0;
             if (object.virtualGridY != null)
@@ -5531,6 +5683,9 @@ $root.protos = (function() {
                 object.teamId = 0;
                 object.bulletLocalId = 0;
                 object.speciesId = 0;
+                object.explosionFrames = 0;
+                object.blState = 0;
+                object.framesInBlState = 0;
                 object.virtualGridX = 0;
                 object.virtualGridY = 0;
                 object.dirX = 0;
@@ -5581,6 +5736,12 @@ $root.protos = (function() {
                 object.bulletLocalId = message.bulletLocalId;
             if (message.speciesId != null && message.hasOwnProperty("speciesId"))
                 object.speciesId = message.speciesId;
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                object.explosionFrames = message.explosionFrames;
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                object.blState = message.blState;
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                object.framesInBlState = message.framesInBlState;
             if (message.virtualGridX != null && message.hasOwnProperty("virtualGridX"))
                 object.virtualGridX = message.virtualGridX;
             if (message.virtualGridY != null && message.hasOwnProperty("virtualGridY"))