Skip to content

Commit 2e903d1

Browse files
Call win when you make it to 100% instead of flag overlap
1 parent 294f358 commit 2e903d1

File tree

6 files changed

+48
-74
lines changed

6 files changed

+48
-74
lines changed

.github/makecode/blocks.png

-58.1 KB
Loading

.github/makecode/blocksdiff.png

611 KB
Loading

main.blocks

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

main.ts

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,6 @@ scene.onHitWall(SpriteKind.Player, function (sprite, location) {
1111
jumps = 0
1212
}
1313
})
14-
function display_text () {
15-
timer.background(function () {
16-
while (!(in_game)) {
17-
for (let text of [
18-
"Welcome to Dash!",
19-
"By Unsigned_Arduino.",
20-
"Use the joystick/d-pad/WASD/arrow keys to select a level.",
21-
"Press A to confirm level selection.",
22-
"Use A/up arrow/d-pad up/up arrow key/W to jump!",
23-
"Try to get to the end!",
24-
"Enjoy!",
25-
""
26-
]) {
27-
if (in_game) {
28-
break;
29-
}
30-
sprite_player.say(text, 4000)
31-
pause(5000)
32-
}
33-
}
34-
})
35-
}
3614
controller.A.onEvent(ControllerButtonEvent.Pressed, function () {
3715
if (in_game) {
3816
jump(sprite_player, constants_gravity, constants_tiles_high_jump)
@@ -52,11 +30,11 @@ function create_status_bar (sprite: Sprite, tilemap_length: number) {
5230
sprite_progress_bar = statusbars.create(127, 4, StatusBarKind.Progress)
5331
sprite_progress_bar.setFlag(SpriteFlag.RelativeToCamera, true)
5432
sprite_progress_bar.left = 4
55-
sprite_progress_bar.top = 4
33+
sprite_progress_bar.top = 2
5634
sprite_progress_bar.value = 0
5735
sprite_progress_bar.max = tilemap_length
58-
sprite_progress_bar.setColor(7, 12)
59-
sprite_progress_bar.setBarBorder(1, 12)
36+
sprite_progress_bar.setColor(7, 15)
37+
sprite_progress_bar.setBarBorder(1, 15)
6038
timer.background(function () {
6139
while (true) {
6240
sprite_progress_bar.value = sprite.x
@@ -68,13 +46,13 @@ function create_status_bar (sprite: Sprite, tilemap_length: number) {
6846
} else {
6947
sprite_progress_bar.setLabel("" + percent_traveled + "%", 15)
7048
}
49+
if (percent_traveled == 100) {
50+
win()
51+
}
7152
pause(100)
7253
}
7354
})
7455
}
75-
scene.onOverlapTile(SpriteKind.Player, assets.tile`flag_bottom`, function (sprite, location) {
76-
win()
77-
})
7856
scene.onOverlapTile(SpriteKind.Player, assets.tile`auto_jump`, function (sprite, location) {
7957
timer.throttle("auto_jump", 100, function () {
8058
jump(sprite_player, constants_gravity, constants_tiles_high_jump)
@@ -93,9 +71,6 @@ function prepare_level () {
9371
tiles.coverAllTiles(assets.tile`from`, assets.tile`blank`)
9472
tiles.coverAllTiles(assets.tile`to0`, assets.tile`blank`)
9573
}
96-
scene.onOverlapTile(SpriteKind.Player, assets.tile`flag_top`, function (sprite, location) {
97-
win()
98-
})
9974
scene.onOverlapTile(SpriteKind.Player, assets.tile`from`, function (sprite, location) {
10075
tiles.placeOnRandomTile(sprite_player, assets.tile`to0`)
10176
})
@@ -186,8 +161,8 @@ let selected = false
186161
let percent_traveled = 0
187162
let sprite_progress_bar: StatusBarSprite = null
188163
let sprite_player_cam: Sprite = null
189-
let sprite_player: Sprite = null
190164
let selected_level = 0
165+
let sprite_player: Sprite = null
191166
let in_game = false
192167
let won = false
193168
let jumps = 0
@@ -201,18 +176,16 @@ jumps = 0
201176
won = false
202177
in_game = false
203178
make_player()
204-
timer.after(2000, function () {
205-
display_text()
206-
})
179+
sprite_player.say("Dash!")
207180
if (true) {
208181
selected_level = select_level()
209182
pause(1000)
210-
if (selected_level == 1) {
211-
level_1()
212-
} else if (selected_level == 2) {
213-
level_2()
214-
}
215183
} else {
184+
selected_level = 2
185+
}
186+
if (selected_level == 1) {
187+
level_1()
188+
} else if (selected_level == 2) {
216189
level_2()
217190
}
218191
prepare_level()

tilemap.g.jres

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

0 commit comments

Comments
 (0)