mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
fix mega marble not respecting mass
This commit is contained in:
parent
5cab872879
commit
80574d5dfc
1 changed files with 2 additions and 2 deletions
|
|
@ -2408,7 +2408,7 @@ class Marble extends GameObject {
|
||||||
this.netFlags |= MarbleNetFlags.DoBlast;
|
this.netFlags |= MarbleNetFlags.DoBlast;
|
||||||
var amount = this.blastTicks / (30000 >> 5);
|
var amount = this.blastTicks / (30000 >> 5);
|
||||||
this.blastPerc = amount;
|
this.blastPerc = amount;
|
||||||
var impulse = this.currentUp.multiply(amount * 8);
|
var impulse = this.currentUp.multiply(amount * 8).multiply(1 / this.getMass());
|
||||||
this.applyImpulse(impulse);
|
this.applyImpulse(impulse);
|
||||||
if (!this.isNetUpdate) {
|
if (!this.isNetUpdate) {
|
||||||
if (this.controllable)
|
if (this.controllable)
|
||||||
|
|
@ -2422,7 +2422,7 @@ class Marble extends GameObject {
|
||||||
} else {
|
} else {
|
||||||
if (this.blastAmount < 0.25)
|
if (this.blastAmount < 0.25)
|
||||||
return false;
|
return false;
|
||||||
var impulse = this.currentUp.multiply(this.blastAmount * 8);
|
var impulse = this.currentUp.multiply(this.blastAmount * 8).multiply(1 / this.getMass());
|
||||||
this.applyImpulse(impulse);
|
this.applyImpulse(impulse);
|
||||||
if (this.controllable)
|
if (this.controllable)
|
||||||
AudioManager.playSound(ResourceLoader.getResource('data/sound/use_blast.wav', ResourceLoader.getAudio, this.soundResources));
|
AudioManager.playSound(ResourceLoader.getResource('data/sound/use_blast.wav', ResourceLoader.getAudio, this.soundResources));
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue