change bullet delay frames to feel more fluid

Author: onlypuppy7

server-client/src/client-static/src/shellshock.min.js

@@ -2288,7 +2288,19 @@ function BulletActor(bullet) {
     this.mesh.setEnabled(false)
 }
 BulletActor.prototype.fire = function () {
-    this.bullet.player.id == meId ? this.delayFrames = Math.ceil(ping / 17) + 5 : this.delayFrames = 5, this.mesh.position.x = this.bullet.x, this.mesh.position.y = this.bullet.y, this.mesh.position.z = this.bullet.z, this.mesh.lookAt(new BABYLON.Vector3(this.bullet.x + this.bullet.dx, this.bullet.y + this.bullet.dy, this.bullet.z + this.bullet.dz)), this.mesh.rotation.x += .015, this.mesh.rotation.y -= .015, this.mesh.scaling.z = .5
+    this.delayFrames = 2;
+
+    if (this.bullet.player.id == meId) {
+        this.delayFrames += Math.max(0, Math.ceil((ping - 75) / 17));
+    };
+
+    this.mesh.position.x = this.bullet.x;
+    this.mesh.position.y = this.bullet.y;
+    this.mesh.position.z = this.bullet.z;
+    this.mesh.lookAt(new BABYLON.Vector3(this.bullet.x + this.bullet.dx, this.bullet.y + this.bullet.dy, this.bullet.z + this.bullet.dz));
+    this.mesh.rotation.x += .015;
+    this.mesh.rotation.y -= .015;
+    this.mesh.scaling.z = .5;
 
     plugins.emit('bulletActorFired', { bulletActor: this });
 };
@@ -2313,7 +2325,14 @@ function RocketActor(rocket) {
     this.flySound = "rpegg.fly";
 }
 RocketActor.prototype.fire = function () {
-    this.armed = false, this.rocket.player.id == meId ? this.delayFrames = Math.ceil(ping / 17) + 3 : this.delayFrames = 3, this.mesh.position.x = this.rocket.x, this.mesh.position.y = this.rocket.y, this.mesh.position.z = this.rocket.z, this.mesh.lookAt(new BABYLON.Vector3(this.rocket.x + this.rocket.dx, this.rocket.y + this.rocket.dy, this.rocket.z + this.rocket.dz)), this.mesh.rotation.x += .015, this.mesh.rotation.y -= .015
+    this.armed = false;
+    this.rocket.player.id == meId ? this.delayFrames = Math.ceil(ping / 17) + 3 : this.delayFrames = 3;
+    this.mesh.position.x = this.rocket.x;
+    this.mesh.position.y = this.rocket.y;
+    this.mesh.position.z = this.rocket.z;
+    this.mesh.lookAt(new BABYLON.Vector3(this.rocket.x + this.rocket.dx, this.rocket.y + this.rocket.dy, this.rocket.z + this.rocket.dz));
+    this.mesh.rotation.x += .015;
+    this.mesh.rotation.y -= .015;
 };
 RocketActor.prototype.update = function () {
     if (--this.delayFrames <= 0 && this.mesh.setEnabled(true), !this.armed && this.rocket.ttArmed <= 0 && (this.armed = true,this.soundEmitter.play(this.flySound)), this.delayFrames % 4 == 0) {
@@ -2322,7 +2341,9 @@ RocketActor.prototype.update = function () {
             dz = .04 * Math.random() - .02;
         this.rocket.ttArmed <= 0 && (addExplosionSprite(explosionSmokeManager, 10, this.rocket.x, this.rocket.y, this.rocket.z, dx, dy, dz, .4), addExplosionSprite(explosionFireManager, 10, this.rocket.x, this.rocket.y, this.rocket.z, dx, dy, dz, .4))
     }
-    this.mesh.position.x = this.rocket.x, this.mesh.position.y = this.rocket.y, this.mesh.position.z = this.rocket.z
+    this.mesh.position.x = this.rocket.x;
+    this.mesh.position.y = this.rocket.y;
+    this.mesh.position.z = this.rocket.z;
 };
 RocketActor.prototype.remove = function () {
     this.mesh.setEnabled(false)