thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-25 20:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix marble sounds and attempt fix gyro

Browse source
This commit is contained in:
RandomityGuy 2024-05-28 01:52:42 +05:30
parent 967312cb4e
commit 059f8a2add
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Marble.hx
View file

@ -1012,6 +1012,7 @@ class Marble extends GameObject {
]; ];
var snd = ResourceLoader.getResource(sndList[bounceSoundNum], ResourceLoader.getAudio, this.soundResources); var snd = ResourceLoader.getResource(sndList[bounceSoundNum], ResourceLoader.getAudio, this.soundResources);
var gain = bounceMinGain; var gain = bounceMinGain;
gain = Util.clamp(Math.pow(contactVel / 12, 1.5), 0, 1); gain = Util.clamp(Math.pow(contactVel / 12, 1.5), 0, 1);
@ -1019,8 +1020,10 @@ class Marble extends GameObject {
// gain = 1.0; // gain = 1.0;
// else // else
// gain = (contactVel - minVelocityBounceSoft) / (hardBounceSpeed - minVelocityBounceSoft) * (1.0 - gain) + gain; // gain = (contactVel - minVelocityBounceSoft) / (hardBounceSpeed - minVelocityBounceSoft) * (1.0 - gain) + gain;
if (!this.controllable)
snd.play(false, Settings.optionsSettings.soundVolume * gain); AudioManager.playSound(snd, this.getAbsPos().getPosition());
else
snd.play(false, Settings.optionsSettings.soundVolume * gain);
} }
} }
@ -1699,7 +1702,7 @@ class Marble extends GameObject {
if (this.megaMarbleUseTick > 0) { if (this.megaMarbleUseTick > 0) {
if (Net.isHost) { if (Net.isHost) {
if ((timeState.ticks - this.megaMarbleUseTick) < 312) { if ((timeState.ticks - this.megaMarbleUseTick) < 312 && this.megaMarbleUseTick > 0) {
this._radius = 0.675; this._radius = 0.675;
this.collider.radius = 0.675; this.collider.radius = 0.675;
} else if ((timeState.ticks - this.megaMarbleUseTick) > 312) { } else if ((timeState.ticks - this.megaMarbleUseTick) > 312) {
@ -1712,7 +1715,7 @@ class Marble extends GameObject {
} }
} }
if (Net.isClient) { if (Net.isClient) {
if (this.serverTicks - this.megaMarbleUseTick < 312) { if (this.serverTicks - this.megaMarbleUseTick < 312 && this.megaMarbleUseTick > 0) {
this._radius = 0.675; this._radius = 0.675;
this.collider.radius = 0.675; this.collider.radius = 0.675;
} else { } else {
@ -2296,7 +2299,7 @@ class Marble extends GameObject {
public function enableHelicopter(timeState:TimeState) { public function enableHelicopter(timeState:TimeState) {
if (this.level.isMultiplayer) { if (this.level.isMultiplayer) {
this.helicopterUseTick = timeState.ticks; this.helicopterUseTick = Net.isHost ? timeState.ticks : serverTicks;
if (!this.isNetUpdate) if (!this.isNetUpdate)
this.netFlags |= MarbleNetFlags.DoHelicopter; this.netFlags |= MarbleNetFlags.DoHelicopter;
} else } else
@ -2333,7 +2336,7 @@ class Marble extends GameObject {
public function enableMegaMarble(timeState:TimeState) { public function enableMegaMarble(timeState:TimeState) {
if (this.level.isMultiplayer) { if (this.level.isMultiplayer) {
this.megaMarbleUseTick = timeState.ticks; this.megaMarbleUseTick = Net.isHost ? timeState.ticks : serverTicks;
if (!this.isNetUpdate) if (!this.isNetUpdate)
this.netFlags |= MarbleNetFlags.DoMega; this.netFlags |= MarbleNetFlags.DoMega;
} else } else