thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-27 13:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8 from thearst3rd/mbp-small-fixes

Browse source 
MBP - Small Fixes
This commit is contained in:
RandomityGuy 2023-02-08 18:26:42 +05:30 • committed by GitHub
commit ef3d698996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/MarbleWorld.hx
View file

@ -1480,7 +1480,7 @@ class MarbleWorld extends Scheduler {
// Show a notification (and play a sound) based on the gems remaining // Show a notification (and play a sound) based on the gems remaining
if (this.gemCount == this.totalGems) { if (this.gemCount == this.totalGems) {
string = "You have all the gems, head for the finish!"; string = "You have all the diamonds, head for the finish!";
// if (!this.rewinding) // if (!this.rewinding)
AudioManager.playSound(ResourceLoader.getResource('data/sound/gotallgems.wav', ResourceLoader.getAudio, this.soundResources)); AudioManager.playSound(ResourceLoader.getResource('data/sound/gotallgems.wav', ResourceLoader.getAudio, this.soundResources));
@ -1491,13 +1491,13 @@ class MarbleWorld extends Scheduler {
// this.touchFinish(completionOfImpact); // this.touchFinish(completionOfImpact);
// } // }
} else { } else {
string = "You picked up a gem. "; string = "You picked up a diamond. ";
var remaining = this.totalGems - this.gemCount; var remaining = this.totalGems - this.gemCount;
if (remaining == 1) { if (remaining == 1) {
string += "Only one gem to go!"; string += "Only one diamond to go!";
} else { } else {
string += '${remaining} gems to go!'; string += '${remaining} diamonds to go!';
} }
// if (!this.rewinding) // if (!this.rewinding)
@ -1634,7 +1634,7 @@ class MarbleWorld extends Scheduler {
if (this.gemCount < this.totalGems) { if (this.gemCount < this.totalGems) {
AudioManager.playSound(ResourceLoader.getResource('data/sound/missinggems.wav', ResourceLoader.getAudio, this.soundResources)); AudioManager.playSound(ResourceLoader.getResource('data/sound/missinggems.wav', ResourceLoader.getAudio, this.soundResources));
displayAlert("You can't finish without all the gems!!"); displayAlert("You can't finish without all the diamonds!!");
} else { } else {
this.endPad.spawnFirework(this.timeState); this.endPad.spawnFirework(this.timeState);
this.finishTime = this.timeState.clone(); this.finishTime = this.timeState.clone();

3
src/gui/OptionsDlg.hx
View file

@ -328,6 +328,9 @@ class OptionsDlg extends GuiImage {
remapDlg.remapCallback = (key) -> { remapDlg.remapCallback = (key) -> {
MarbleGame.canvas.popDialog(remapDlg); MarbleGame.canvas.popDialog(remapDlg);
if (key == Key.ESCAPE)
return;
var conflicting = getConflictingBinding(bindingName, key); var conflicting = getConflictingBinding(bindingName, key);
if (conflicting == null) { if (conflicting == null) {
ctrl.txtCtrl.text.text = Util.getKeyForButton2(key); ctrl.txtCtrl.text.text = Util.getKeyForButton2(key);

4
src/gui/RemapDlg.hx
View file

@ -43,9 +43,9 @@ class RemapDlg extends GuiControl {
public override function update(dt:Float, mouseState:MouseState) { public override function update(dt:Float, mouseState:MouseState) {
super.update(dt, mouseState); super.update(dt, mouseState);
for (i in 0...1024) { for (i in 0...1024) {
if (i == 5) if (i == Key.MOUSE_WHEEL_DOWN || i == Key.MOUSE_WHEEL_UP)
continue; continue;
if (Key.isDown(i)) { if (Key.isPressed(i)) {
remapCallback(i); remapCallback(i);
} }
} }