thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-26 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some fixes

Browse source
This commit is contained in:
RandomityGuy 2026-04-06 12:22:45 +01:00
parent 3a1c61134d
commit bdfa361d2d
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Mission.hx
View file

@ -204,6 +204,27 @@ class Mission {
} }
} }
public function getPreviewImageSync() {
if (!this.isClaMission) {
var basename = haxe.io.Path.withoutExtension(this.path);
if (ResourceLoader.fileSystem.exists(basename + ".png")) {
var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile();
return ret;
}
if (ResourceLoader.fileSystem.exists(basename + ".jpg")) {
var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile();
return ret;
}
var img = new BitmapData(1, 1);
img.setPixel(0, 0, 0);
return Tile.fromBitmap(img);
} else {
var img = new BitmapData(1, 1);
img.setPixel(0, 0, 0);
return Tile.fromBitmap(img);
}
}
public function getDifPath(rawElementPath:String) { public function getDifPath(rawElementPath:String) {
if (StringTools.contains(rawElementPath, "$usermods")) { if (StringTools.contains(rawElementPath, "$usermods")) {
rawElementPath = rawElementPath.split("@").slice(1).map(x -> { rawElementPath = rawElementPath.split("@").slice(1).map(x -> {

12
src/gui/HelpCreditsGui.hx
View file

@ -237,7 +237,7 @@ class HelpCreditsGui extends GuiImage {
gem1Ctrl.render(MarbleGame.canvas.scene2d); gem1Ctrl.render(MarbleGame.canvas.scene2d);
gem2Ctrl.render(MarbleGame.canvas.scene2d); gem2Ctrl.render(MarbleGame.canvas.scene2d);
gem3Ctrl.render(MarbleGame.canvas.scene2d); gem3Ctrl.render(MarbleGame.canvas.scene2d);
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d); superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d); superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d); shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@ -265,7 +265,7 @@ class HelpCreditsGui extends GuiImage {
gem1Ctrl.render(MarbleGame.canvas.scene2d); gem1Ctrl.render(MarbleGame.canvas.scene2d);
gem2Ctrl.render(MarbleGame.canvas.scene2d); gem2Ctrl.render(MarbleGame.canvas.scene2d);
gem3Ctrl.render(MarbleGame.canvas.scene2d); gem3Ctrl.render(MarbleGame.canvas.scene2d);
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d); superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d); superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d); shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@ -289,7 +289,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 35); hcText2.position = new Vector(110, 35);
hcText2.extent = new Vector(418, 274); hcText2.extent = new Vector(418, 274);
hcText2.text.text = "<br/><br/>Gyrocopter PowerUp - slows your fall in the air.<br/><br/>Time Travel - takes some time off the clock.<br/><br/>Gravity Modifier - Changes the direction of \"down\" - the new down is in the direction of the arrow."; hcText2.text.text = "<br/><br/>Gyrocopter PowerUp - slows your fall in the air.<br/><br/>Time Travel - takes some time off the clock.<br/><br/>Gravity Modifier - Changes the direction of \"down\" - the new down is in the direction of the arrow.";
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
superJumpCtrl.render(MarbleGame.canvas.scene2d); superJumpCtrl.render(MarbleGame.canvas.scene2d);
superSpeedCtrl.render(MarbleGame.canvas.scene2d); superSpeedCtrl.render(MarbleGame.canvas.scene2d);
shockAbsorberCtrl.render(MarbleGame.canvas.scene2d); shockAbsorberCtrl.render(MarbleGame.canvas.scene2d);
@ -315,7 +315,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 38); hcText2.position = new Vector(110, 38);
hcText2.extent = new Vector(418, 274); hcText2.extent = new Vector(418, 274);
hcText2.text.text = "<br/><br/>Duct Fan - be careful this doesn't blow you away!<br/><br/>Tornado - it'll pull you in and spit you out.<br/><br/>Trap Door - keep moving when you're rolling over one of these."; hcText2.text.text = "<br/><br/>Duct Fan - be careful this doesn't blow you away!<br/><br/>Tornado - it'll pull you in and spit you out.<br/><br/>Trap Door - keep moving when you're rolling over one of these.";
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
helicopterCtrl.render(MarbleGame.canvas.scene2d); helicopterCtrl.render(MarbleGame.canvas.scene2d);
timeTravelCtrl.render(MarbleGame.canvas.scene2d); timeTravelCtrl.render(MarbleGame.canvas.scene2d);
antiGravityCtrl.render(MarbleGame.canvas.scene2d); antiGravityCtrl.render(MarbleGame.canvas.scene2d);
@ -337,7 +337,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.position = new Vector(110, 30); hcText2.position = new Vector(110, 30);
hcText2.extent = new Vector(418, 274); hcText2.extent = new Vector(418, 274);
hcText2.text.text = "<br/><br/>Bumper - this'll bounce you if you touch it.<br/><br/>Land Mine - Warning! Explodes on contact!<br/><br/>Oil Slick - you won't have much traction on these surfaces"; hcText2.text.text = "<br/><br/>Bumper - this'll bounce you if you touch it.<br/><br/>Land Mine - Warning! Explodes on contact!<br/><br/>Oil Slick - you won't have much traction on these surfaces";
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
ductFanCtrl.render(MarbleGame.canvas.scene2d); ductFanCtrl.render(MarbleGame.canvas.scene2d);
tornadoCtrl.render(MarbleGame.canvas.scene2d); tornadoCtrl.render(MarbleGame.canvas.scene2d);
trapdoorCtrl.render(MarbleGame.canvas.scene2d); trapdoorCtrl.render(MarbleGame.canvas.scene2d);
@ -370,7 +370,7 @@ class HelpCreditsGui extends GuiImage {
hcText2.extent = new Vector(155, 274); hcText2.extent = new Vector(155, 274);
hcText2.text.text = '<font face="Arial14"><br/></font><font face="Expo50"><p align="center"> </p></font><br/>' hcText2.text.text = '<font face="Arial14"><br/></font><font face="Expo50"><p align="center"> </p></font><br/>'
+ "Mark Frohnmayer<br/>Brian Hahn<br/>Tim Gift<br/>Kevin Ryan<br/>Jay Moore<br/>John Quigley"; + "Mark Frohnmayer<br/>Brian Hahn<br/>Tim Gift<br/>Kevin Ryan<br/>Jay Moore<br/>John Quigley";
hcText2.render(MarbleGame.canvas.scene2d, @:privateAccess hcText2.parent._flow); hcText2.render(MarbleGame.canvas.scene2d);
} }
if (page == 11) { if (page == 11) {
hcText2.text.text = ""; hcText2.text.text = "";

1
src/gui/PlayMissionGui.hx
View file

@ -603,7 +603,6 @@ class PlayMissionGui extends GuiImage {
#end #end
} }
this.addChild(kofi); this.addChild(kofi);
#end
} }
public override function render(scene2d:Scene) { public override function render(scene2d:Scene) {

3
src/touch/CameraInput.hx
View file

@ -83,8 +83,7 @@ class CameraInput {
scaleFactor = js.Browser.window.devicePixelRatio / Settings.zoomRatio; scaleFactor = js.Browser.window.devicePixelRatio / Settings.zoomRatio;
#end #end
var jumpcam = MarbleGame.instance.touchInput.jumpButton.pressed var jumpcam = MarbleGame.instance.touchInput.jumpButton.pressed
|| MarbleGame.instance.touchInput.powerupButton.pressed || MarbleGame.instance.touchInput.powerupButton.pressed;
|| MarbleGame.instance.touchInput.blastbutton.pressed;
if (jumpcam) { if (jumpcam) {
scaleFactor /= Settings.touchSettings.buttonJoystickMultiplier; scaleFactor /= Settings.touchSettings.buttonJoystickMultiplier;
} }