Skip to content

Commit

Permalink
Menus can go back with B
Browse files Browse the repository at this point in the history
  • Loading branch information
@UnsignedArduino
UnsignedArduino committed Sep 20, 2022
1 parent 01c9b7a commit 90f703f
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 36 deletions.
Binary file modified .github/makecode/blocks.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/makecode/blocksdiff.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions main.blocks
View file

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ function update_minimap () {
}
}
}
function make_title_menu (title: string, options: any[]) {
function make_title_menu (title: string, options: any[], can_exit: boolean) {
if (!(spriteutils.isDestroyed(menu_start))) {
title_pop_away_sprite_left(menu_start)
}
Expand All @@ -487,6 +487,12 @@ function make_title_menu (title: string, options: any[]) {
if (options.length > 6) {
menu_start.setMenuStyleProperty(miniMenu.MenuStyleProperty.ScrollIndicatorColor, images.colorBlock(15))
}
if (can_exit) {
menu_start.onButtonPressed(controller.B, function (selection, selectedIndex) {
music.playTone(262, music.beat(BeatFraction.Sixteenth))
option_selected = true
})
}
menu_start.setFlag(SpriteFlag.Ghost, true)
menu_start.setFlag(SpriteFlag.RelativeToCamera, true)
menu_start.top = sprite_title.bottom + 4
Expand Down Expand Up @@ -787,7 +793,7 @@ let show_minimap = false
let in_game = false
let car_accel = 0
stats.turnStats(true)
if (false) {
if (true) {
pause(1000)
LoadingAnimations.show_splash()
pause(5000)
Expand Down Expand Up @@ -837,14 +843,14 @@ timer.background(function () {
miniMenu.createMenuItem("Skins"),
miniMenu.createMenuItem("Settings"),
miniMenu.createMenuItem("Reset preferences")
]).onButtonPressed(controller.A, function (selection, selectedIndex) {
], false).onButtonPressed(controller.A, function (selection, selectedIndex) {
music.playTone(262, music.beat(BeatFraction.Sixteenth))
if (selectedIndex == 0) {
menu_options = [miniMenu.createMenuItem("Back")]
for (let names of maps_names) {
menu_options.push(miniMenu.createMenuItem(names))
}
make_title_menu("Select a map:", menu_options).onButtonPressed(controller.A, function (selection, selectedIndex) {
make_title_menu("Select a map:", menu_options, true).onButtonPressed(controller.A, function (selection, selectedIndex) {
music.playTone(262, music.beat(BeatFraction.Sixteenth))
option_selected = true
if (selectedIndex > 0) {
Expand All @@ -857,7 +863,7 @@ timer.background(function () {
for (let names of car_images_names) {
menu_options.push(miniMenu.createMenuItem(names))
}
menu_start = make_title_menu("Select a skin:", menu_options)
menu_start = make_title_menu("Select a skin:", menu_options, true)
for (let index = 0; index < blockSettings.readNumber("user_skin") + 1; index++) {
menu_start.moveSelection(miniMenu.MoveDirection.Down)
}
Expand All @@ -877,7 +883,7 @@ timer.background(function () {
wait_for_a_button_release()
game.showSystemMenu()
} else {
make_title_menu("Confirm reset", [miniMenu.createMenuItem("No, don't reset"), miniMenu.createMenuItem("Yes, reset")]).onButtonPressed(controller.A, function (selection, selectedIndex) {
make_title_menu("Confirm reset", [miniMenu.createMenuItem("No, don't reset"), miniMenu.createMenuItem("Yes, reset")], true).onButtonPressed(controller.A, function (selection, selectedIndex) {
music.playTone(262, music.beat(BeatFraction.Sixteenth))
option_selected = true
if (selectedIndex == 1) {
Expand Down
38 changes: 19 additions & 19 deletions tilemap.g.jres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,25 +986,6 @@
],
"displayName": "space_map_slow_tiles"
},
"level32": {
"id": "level32",
"mimeType": "application/mkcd-tilemap",
"data": "MTAwYTAwMDEwMDAxMDIwMzA0MDUwNjA3MDgwOTBhMDAwMDAwMDAwMA==",
"tileset": [
"myTiles.transparency16",
"myTiles.tile74",
"myTiles.tile73",
"myTiles.tile75",
"myTiles.tile76",
"myTiles.tile77",
"myTiles.tile78",
"myTiles.tile79",
"myTiles.tile80",
"myTiles.tile81",
"myTiles.tile82"
],
"displayName": "space_map_starting_tiles"
},
"level33": {
"id": "level33",
"mimeType": "application/mkcd-tilemap",
Expand Down Expand Up @@ -1278,6 +1259,25 @@
],
"displayName": "cannonball_cove_wall_tiles"
},
"level32": {
"id": "level32",
"mimeType": "application/mkcd-tilemap",
"data": "MTAwYTAwMDEwMDBhMDEwMjAzMDQwNTA2MDcwODA5MDAwMDAwMDAwMA==",
"tileset": [
"myTiles.transparency16",
"myTiles.tile73",
"myTiles.tile75",
"myTiles.tile76",
"myTiles.tile77",
"myTiles.tile78",
"myTiles.tile79",
"myTiles.tile80",
"myTiles.tile81",
"myTiles.tile82",
"myTiles.tile83"
],
"displayName": "space_map_starting_tiles"
},
"*": {
"mimeType": "image/x-mkcd-f4",
"dataEncoding": "base64",
Expand Down
8 changes: 4 additions & 4 deletions tilemap.g.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,10 +715,6 @@ namespace myTiles {
case "level31":return tiles.createTilemap(hex`0100010001`, img`
.
`, [myTiles.transparency16,sprites.builtin.forestTiles10], TileScale.Sixteen);
case "space_map_starting_tiles":
case "level32":return tiles.createTilemap(hex`0a0001000102030405060708090a`, img`
. . . . . . . . . .
`, [myTiles.transparency16,myTiles.tile74,myTiles.tile73,myTiles.tile75,myTiles.tile76,myTiles.tile77,myTiles.tile78,myTiles.tile79,myTiles.tile80,myTiles.tile81,myTiles.tile82], TileScale.Sixteen);
case "space_map_driving_tiles":
case "level33":return tiles.createTilemap(hex`020001000102`, img`
. .
Expand Down Expand Up @@ -947,6 +943,10 @@ namespace myTiles {
case "level43":return tiles.createTilemap(hex`0400010002030104`, img`
. . . .
`, [myTiles.transparency16,myTiles.tile84,myTiles.tile99,myTiles.tile100,myTiles.tile104], TileScale.Sixteen);
case "space_map_starting_tiles":
case "level32":return tiles.createTilemap(hex`0a0001000a010203040506070809`, img`
. . . . . . . . . .
`, [myTiles.transparency16,myTiles.tile73,myTiles.tile75,myTiles.tile76,myTiles.tile77,myTiles.tile78,myTiles.tile79,myTiles.tile80,myTiles.tile81,myTiles.tile82,myTiles.tile83], TileScale.Sixteen);
}
return null;
})
Expand Down

1 comment on commit 90f703f

@UnsignedArduino
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

![Difference between blocks](https://raw.githubusercontent.com/unsignedarduino/racers/90f703fd3232b33701b4d84028246cb733dbafb5/.github/makecode/blocksdiff.png

Please sign in to comment.