Skip to content

Commit 90f703f

Browse files
Menus can go back with B
1 parent 01c9b7a commit 90f703f

File tree

6 files changed

+42
-36
lines changed

6 files changed

+42
-36
lines changed

.github/makecode/blocks.png

2.9 KB
Loading

.github/makecode/blocksdiff.png

-70.4 KB
Loading

main.blocks

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

main.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ function update_minimap () {
475475
}
476476
}
477477
}
478-
function make_title_menu (title: string, options: any[]) {
478+
function make_title_menu (title: string, options: any[], can_exit: boolean) {
479479
if (!(spriteutils.isDestroyed(menu_start))) {
480480
title_pop_away_sprite_left(menu_start)
481481
}
@@ -487,6 +487,12 @@ function make_title_menu (title: string, options: any[]) {
487487
if (options.length > 6) {
488488
menu_start.setMenuStyleProperty(miniMenu.MenuStyleProperty.ScrollIndicatorColor, images.colorBlock(15))
489489
}
490+
if (can_exit) {
491+
menu_start.onButtonPressed(controller.B, function (selection, selectedIndex) {
492+
music.playTone(262, music.beat(BeatFraction.Sixteenth))
493+
option_selected = true
494+
})
495+
}
490496
menu_start.setFlag(SpriteFlag.Ghost, true)
491497
menu_start.setFlag(SpriteFlag.RelativeToCamera, true)
492498
menu_start.top = sprite_title.bottom + 4
@@ -787,7 +793,7 @@ let show_minimap = false
787793
let in_game = false
788794
let car_accel = 0
789795
stats.turnStats(true)
790-
if (false) {
796+
if (true) {
791797
pause(1000)
792798
LoadingAnimations.show_splash()
793799
pause(5000)
@@ -837,14 +843,14 @@ timer.background(function () {
837843
miniMenu.createMenuItem("Skins"),
838844
miniMenu.createMenuItem("Settings"),
839845
miniMenu.createMenuItem("Reset preferences")
840-
]).onButtonPressed(controller.A, function (selection, selectedIndex) {
846+
], false).onButtonPressed(controller.A, function (selection, selectedIndex) {
841847
music.playTone(262, music.beat(BeatFraction.Sixteenth))
842848
if (selectedIndex == 0) {
843849
menu_options = [miniMenu.createMenuItem("Back")]
844850
for (let names of maps_names) {
845851
menu_options.push(miniMenu.createMenuItem(names))
846852
}
847-
make_title_menu("Select a map:", menu_options).onButtonPressed(controller.A, function (selection, selectedIndex) {
853+
make_title_menu("Select a map:", menu_options, true).onButtonPressed(controller.A, function (selection, selectedIndex) {
848854
music.playTone(262, music.beat(BeatFraction.Sixteenth))
849855
option_selected = true
850856
if (selectedIndex > 0) {
@@ -857,7 +863,7 @@ timer.background(function () {
857863
for (let names of car_images_names) {
858864
menu_options.push(miniMenu.createMenuItem(names))
859865
}
860-
menu_start = make_title_menu("Select a skin:", menu_options)
866+
menu_start = make_title_menu("Select a skin:", menu_options, true)
861867
for (let index = 0; index < blockSettings.readNumber("user_skin") + 1; index++) {
862868
menu_start.moveSelection(miniMenu.MoveDirection.Down)
863869
}
@@ -877,7 +883,7 @@ timer.background(function () {
877883
wait_for_a_button_release()
878884
game.showSystemMenu()
879885
} else {
880-
make_title_menu("Confirm reset", [miniMenu.createMenuItem("No, don't reset"), miniMenu.createMenuItem("Yes, reset")]).onButtonPressed(controller.A, function (selection, selectedIndex) {
886+
make_title_menu("Confirm reset", [miniMenu.createMenuItem("No, don't reset"), miniMenu.createMenuItem("Yes, reset")], true).onButtonPressed(controller.A, function (selection, selectedIndex) {
881887
music.playTone(262, music.beat(BeatFraction.Sixteenth))
882888
option_selected = true
883889
if (selectedIndex == 1) {

tilemap.g.jres

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -986,25 +986,6 @@
986986
],
987987
"displayName": "space_map_slow_tiles"
988988
},
989-
"level32": {
990-
"id": "level32",
991-
"mimeType": "application/mkcd-tilemap",
992-
"data": "MTAwYTAwMDEwMDAxMDIwMzA0MDUwNjA3MDgwOTBhMDAwMDAwMDAwMA==",
993-
"tileset": [
994-
"myTiles.transparency16",
995-
"myTiles.tile74",
996-
"myTiles.tile73",
997-
"myTiles.tile75",
998-
"myTiles.tile76",
999-
"myTiles.tile77",
1000-
"myTiles.tile78",
1001-
"myTiles.tile79",
1002-
"myTiles.tile80",
1003-
"myTiles.tile81",
1004-
"myTiles.tile82"
1005-
],
1006-
"displayName": "space_map_starting_tiles"
1007-
},
1008989
"level33": {
1009990
"id": "level33",
1010991
"mimeType": "application/mkcd-tilemap",
@@ -1278,6 +1259,25 @@
12781259
],
12791260
"displayName": "cannonball_cove_wall_tiles"
12801261
},
1262+
"level32": {
1263+
"id": "level32",
1264+
"mimeType": "application/mkcd-tilemap",
1265+
"data": "MTAwYTAwMDEwMDBhMDEwMjAzMDQwNTA2MDcwODA5MDAwMDAwMDAwMA==",
1266+
"tileset": [
1267+
"myTiles.transparency16",
1268+
"myTiles.tile73",
1269+
"myTiles.tile75",
1270+
"myTiles.tile76",
1271+
"myTiles.tile77",
1272+
"myTiles.tile78",
1273+
"myTiles.tile79",
1274+
"myTiles.tile80",
1275+
"myTiles.tile81",
1276+
"myTiles.tile82",
1277+
"myTiles.tile83"
1278+
],
1279+
"displayName": "space_map_starting_tiles"
1280+
},
12811281
"*": {
12821282
"mimeType": "image/x-mkcd-f4",
12831283
"dataEncoding": "base64",

tilemap.g.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,6 @@ namespace myTiles {
715715
case "level31":return tiles.createTilemap(hex`0100010001`, img`
716716
.
717717
`, [myTiles.transparency16,sprites.builtin.forestTiles10], TileScale.Sixteen);
718-
case "space_map_starting_tiles":
719-
case "level32":return tiles.createTilemap(hex`0a0001000102030405060708090a`, img`
720-
. . . . . . . . . .
721-
`, [myTiles.transparency16,myTiles.tile74,myTiles.tile73,myTiles.tile75,myTiles.tile76,myTiles.tile77,myTiles.tile78,myTiles.tile79,myTiles.tile80,myTiles.tile81,myTiles.tile82], TileScale.Sixteen);
722718
case "space_map_driving_tiles":
723719
case "level33":return tiles.createTilemap(hex`020001000102`, img`
724720
. .
@@ -947,6 +943,10 @@ namespace myTiles {
947943
case "level43":return tiles.createTilemap(hex`0400010002030104`, img`
948944
. . . .
949945
`, [myTiles.transparency16,myTiles.tile84,myTiles.tile99,myTiles.tile100,myTiles.tile104], TileScale.Sixteen);
946+
case "space_map_starting_tiles":
947+
case "level32":return tiles.createTilemap(hex`0a0001000a010203040506070809`, img`
948+
. . . . . . . . . .
949+
`, [myTiles.transparency16,myTiles.tile73,myTiles.tile75,myTiles.tile76,myTiles.tile77,myTiles.tile78,myTiles.tile79,myTiles.tile80,myTiles.tile81,myTiles.tile82,myTiles.tile83], TileScale.Sixteen);
950950
}
951951
return null;
952952
})

0 commit comments

Comments
 (0)